Refactoring phase 2

Normand Briere

2019-04-22 c60a1ad4f6aa4904e80280586b440a584b5ff061

 GrafreeD.java
..
..
@@ -50,7 +50,7 @@
50
50
         universe.material = new cMaterial();
51
51
         //god.addChild(universe);
52
52
         universe.name = "Applet";
53
-        theApplet3D = this;
53
+        grafreeD = this;
54
54
     }
55
55
 
56
56
     /**/
..
..
@@ -595,7 +595,7 @@
595
595
     
596
596
     public static void main(String argv[])
597
597
     {
598
-        if (argv.length == 0)
598
+        if (false) // argv.length == 0)
599
599
         {
600
600
             String javaPath = System.getProperty("java.home") + "/bin/java";
601
601
             java.net.URL u = new GrafreeD().getClass().getResource("default.png");
..
..
@@ -742,24 +742,28 @@
742
742
         try
743
743
         {
744
744
             MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
745
-            //MetalLookAndFeel.setCurrentTheme(new Theme(Constants.beigeTheme));
745
+            MetalLookAndFeel.setCurrentTheme(new Theme(Constants.yellowTheme));
746
746
             UIManager.setLookAndFeel(new MetalLookAndFeel());
747
+            //UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
748
+            //UIManager.setLookAndFeel("com.apple.laf.AquaLookAndFeel");
749
+            //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
747
750
         } catch (Exception e)
748
751
         {
749
752
         }
750
753
 
751
754
         //Monitor mon=MonitorFactory.start("myFirstMonitor");
752
755
         standAlone = true;
753
-        theApplet3D = new GrafreeD();
754
-        theApplet3D.universe = new Composite();
755
-        theApplet3D.universe.name = "Scene";
756
-        theApplet3D.universe.material = new cMaterial();
756
+        grafreeD = new GrafreeD();
757
+        grafreeD.universe = new Composite();
758
+        grafreeD.universe.name = "Scene";
759
+        grafreeD.universe.material = new cMaterial();
757
760
         //   theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
758
761
 
759
-        theApplet3D.universe.root = true;
760
-        theApplet3D.universe.openEditWindow(null, true); //, true);
762
+        grafreeD.universe.root = true;
763
+        grafreeD.universe.openEditWindow(null, true); //, true);
761
764
         //mon.stop();
762
765
         //System.out.println(mon);
766
+        //timeflow.app.TimeflowAppLauncher.GetTimeFlow();
763
767
     }
764
768
 
765
769
     // Timer callback
..
..
@@ -984,7 +988,7 @@
984
988
         } while (avail > 0 && numRead >= 0);
985
989
         return new String(data, 0, pos, "US-ASCII");
986
990
     }
987
-    public static GrafreeD theApplet3D;
991
+    public static GrafreeD grafreeD;
988
992
     public static boolean standAlone = true;
989
993
     public Composite universe;
990
994
     public static Object3D clipboard = new Object3D();