Rename Grafreed

Normand Briere

2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439

 GroupEditor.java
..
..
@@ -98,14 +98,14 @@
98
98
 
99
99
     void CloneClipboard(boolean supports)
100
100
     {
101
-        assert(GrafreeD.clipboard.parent == null);
102
-        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
-        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
-        if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
-            makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+        assert(Grafreed.clipboard.parent == null);
102
+        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+        if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+            makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106
106
         else
107
-            makeSomething(CloneObject(GrafreeD.clipboard, false));
108
-        GrafreeD.clipboard.get(0).parent = keepparent;
107
+            makeSomething(CloneObject(Grafreed.clipboard, false));
108
+        Grafreed.clipboard.get(0).parent = keepparent;
109
109
     }
110
110
     
111
111
     static Object3D CloneObject(Object3D obj, boolean supports)
..
..
@@ -119,7 +119,7 @@
119
119
         //               obj.support = null;
120
120
         if (!supports)
121
121
             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123
123
         obj.parent = parent;
124
124
         //               obj.support = support;
125
125
         //               clone.support = support; // aout 2013
..
..
@@ -439,14 +439,17 @@
439
439
 		buildCreateMenu(menu);
440
440
                 
441
441
                 oe.menuBar.add(menu = new Menu("Include"));
442
-		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443
-		importGFDItem.addActionListener(this);
444
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445
-		importVRMLX3DItem.addActionListener(this);
446
-		importOBJItem = menu.add(new MenuItem("OBJ Object..."));
442
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
447
443
 		importOBJItem.addActionListener(this);
448
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
444
+		menu.add("-");
445
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
449
446
 		import3DSItem.addActionListener(this);
447
+		menu.add("-");
448
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449
+		importVRMLX3DItem.addActionListener(this);
450
+		menu.add("-");
451
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452
+		importGFDItem.addActionListener(this);
450
453
 
451
454
                 oe.menuBar.add(menu = new Menu("Tools"));
452
455
 		buildToolsMenu(menu);
..
..
@@ -488,7 +491,7 @@
488
491
                 liveCB.setToolTipText("Enabled animation");
489
492
                                 liveCB.addItemListener(this);
490
493
 
491
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
495
                 oneStepButton.setToolTipText("Animate one step forward");
493
496
 		oneStepButton.addActionListener(this);
494
497
                 
..
..
@@ -500,7 +503,7 @@
500
503
                 trackCB.setToolTipText("Enable tracking");
501
504
                                 trackCB.addItemListener(this);
502
505
 
503
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
507
                 screenfitButton.setToolTipText("Screen fit");
505
508
 		screenfitButton.addActionListener(this);
506
509
 
..
..
@@ -509,39 +512,39 @@
509
512
 
510
513
                 if (Globals.ADVANCED)
511
514
                 {
512
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
515
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513
516
                         snapobjectButton.addActionListener(this);
514
517
                         snapobjectButton.setToolTipText("Snap Object");
515
518
                 }
516
519
 
517
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518
521
                 flashSelectionButton.setToolTipText("Show selection");
519
522
 		flashSelectionButton.addActionListener(this);
520
523
                 
521
524
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522
525
                 
523
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524
527
                 twoButton.setToolTipText("Show center view only");
525
528
 		twoButton.addActionListener(this);
526
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527
530
 		fourButton.addActionListener(this);
528
531
                 fourButton.setToolTipText("Show left panel only");
529
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
532
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530
533
                 sixButton.setToolTipText("2-column layout left");
531
534
 		sixButton.addActionListener(this);
532
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
535
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533
536
                 threeButton.setToolTipText("2-column layout right");
534
537
 		threeButton.addActionListener(this);
535
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
538
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536
539
                 sevenButton.setToolTipText("3-column layout");
537
540
 		sevenButton.addActionListener(this);
538
541
                 //
539
542
 
540
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541
544
                 rootButton.setToolTipText("Edit selection in new tab");
542
545
 		rootButton.addActionListener(this);
543
546
 
544
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
547
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545
548
                 closeButton.setToolTipText("Close tab");
546
549
 		closeButton.addActionListener(this);
547
550
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -549,11 +552,11 @@
549
552
                         
550
553
                 cGridBag commandsPanel = new cGridBag();
551
554
                 
552
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
555
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553
556
                 editButton.setToolTipText("Edit selection");
554
557
 		editButton.addActionListener(this);
555
558
 
556
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
559
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557
560
                 uneditButton.setToolTipText("Unedit selection");
558
561
 		uneditButton.addActionListener(this);
559
562
 
..
..
@@ -561,11 +564,11 @@
561
564
                 allParamsButton.setToolTipText("Edit all params");
562
565
 		allParamsButton.addActionListener(this);
563
566
 
564
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
567
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
568
                 clearPanelButton.setToolTipText("Clear edit panel");
566
569
 		clearPanelButton.addActionListener(this);
567
570
 
568
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
571
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
572
                 unselectButton.setToolTipText("Unselect");
570
573
 		unselectButton.addActionListener(this);
571
574
 
..
..
@@ -937,7 +940,9 @@
937
940
 //                        objEditor.DropFile((java.io.File[]) object, true);
938
941
 //                        return;
939
942
 //                    }
940
-                    if (string.charAt(0) == '/')
943
+                    
944
+                    // File path for Mac and Windows
945
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
941
946
                     {
942
947
                         // file(s)
943
948
                         String[] names = string.split("\n");
..
..
@@ -964,7 +969,7 @@
964
969
                     
965
970
                     flashIt = false;
966
971
                     CameraPane pane = (CameraPane) target;
967
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
972
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968
973
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969
974
                     
970
975
                     if (group.selection.size() == 1)
..
..
@@ -1537,9 +1542,9 @@
1537
1542
     
1538
1543
     void Overwrite(int mask)
1539
1544
     {
1540
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1545
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1541
1546
         {
1542
-            Object3D content = GrafreeD.clipboard.get(0);
1547
+            Object3D content = Grafreed.clipboard.get(0);
1543
1548
 
1544
1549
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1545
1550
                 content = ((cGroup)content).get(0);
..
..
@@ -1859,7 +1864,15 @@
1859
1864
 		} else
1860
1865
 		if (source == importOBJItem)
1861
1866
 		{
1862
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1867
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869
+                            browser.setVisible(true);
1870
+                            String filename = browser.getFile();
1871
+                            if (filename != null && filename.length() > 0)
1872
+                            {
1873
+                                String fullname = browser.getDirectory() + filename;
1874
+                                makeSomething(ReadOBJ(fullname), true);
1875
+                            }
1863
1876
 		} else
1864
1877
 		if (source == computeAOItem)
1865
1878
 		{
..
..
@@ -1879,7 +1892,7 @@
1879
1892
 		if (source == invariantsItem)
1880
1893
 		{
1881
1894
                     System.out.println("Invariants:");
1882
-                    GrafreeD.grafreeD.universe.invariants();
1895
+                    Grafreed.grafreeD.universe.invariants();
1883
1896
 		} else
1884
1897
 		if (source == memoryItem)
1885
1898
 		{
..
..
@@ -1954,10 +1967,10 @@
1954
1967
 		} else
1955
1968
 		if (source == duplicateItem)
1956
1969
 		{
1957
-                    Object3D keep = GrafreeD.clipboard;
1970
+                    Object3D keep = Grafreed.clipboard;
1958
1971
 			loadClipboard(false);
1959
1972
 			paste(false);
1960
-                    GrafreeD.clipboard = keep;
1973
+                    Grafreed.clipboard = keep;
1961
1974
 		} else
1962
1975
 		if (source == cloneItem)
1963
1976
 		{
..
..
@@ -2177,9 +2190,9 @@
2177
2190
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2178
2191
 //		refreshContents();
2179
2192
 //                    }
2180
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2193
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2181
2194
                     {
2182
-                        Object3D content = GrafreeD.clipboard.get(0);
2195
+                        Object3D content = Grafreed.clipboard.get(0);
2183
2196
                         
2184
2197
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2185
2198
                             content = ((cGroup)content).get(0);
..
..
@@ -2229,9 +2242,9 @@
2229
2242
 		} else
2230
2243
 		if (source == setMasterItem)
2231
2244
 		{
2232
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2245
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233
2246
                     {
2234
-                        Object3D content = GrafreeD.clipboard.get(0);
2247
+                        Object3D content = Grafreed.clipboard.get(0);
2235
2248
                         
2236
2249
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2237
2250
                             content = ((cGroup)content).get(0);
..
..
@@ -2244,9 +2257,9 @@
2244
2257
 		{
2245
2258
                     if (group.selection.size() == 1)
2246
2259
                     {
2247
-                        if (GrafreeD.clipboard.size() == 1)
2260
+                        if (Grafreed.clipboard.size() == 1)
2248
2261
                         {
2249
-                            Object3D content = GrafreeD.clipboard.get(0);
2262
+                            Object3D content = Grafreed.clipboard.get(0);
2250
2263
 
2251
2264
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2252
2265
                                 content = ((cGroup)content).get(0);
..
..
@@ -3325,9 +3338,9 @@
3325
3338
                     obj = (Object3D)e.nextElement();
3326
3339
                     
3327
3340
                     System.out.println("Object is: " + obj);
3328
-                    GrafreeD.AnalyzeObject(obj);
3341
+                    Grafreed.AnalyzeObject(obj);
3329
3342
                     System.out.println("Boundary rep: " + obj.bRep);
3330
-                    GrafreeD.AnalyzeObject(obj.bRep);
3343
+                    Grafreed.AnalyzeObject(obj.bRep);
3331
3344
                     
3332
3345
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3333
3346
                 }
..
..
@@ -3541,8 +3554,8 @@
3541
3554
 	
3542
3555
 	void ParseVertices()
3543
3556
 	{
3544
-            boolean epsequal = GrafreeD.epsequal;
3545
-            GrafreeD.epsequal = true;
3557
+            boolean epsequal = Grafreed.epsequal;
3558
+            Grafreed.epsequal = true;
3546
3559
             
3547
3560
             for (int i=0; i<group.selection.size(); i++)
3548
3561
             {
..
..
@@ -3567,7 +3580,7 @@
3567
3580
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568
3581
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569
3582
 
3570
-                                g.add(GrafreeD.clipboard);
3583
+                                g.add(Grafreed.clipboard);
3571
3584
 
3572
3585
                                 buffer.add(g);
3573
3586
                             }
..
..
@@ -3582,7 +3595,7 @@
3582
3595
                 makeSomething(buffer, i==group.selection.size()-1);
3583
3596
             }
3584
3597
             
3585
-            GrafreeD.epsequal = epsequal;
3598
+            Grafreed.epsequal = epsequal;
3586
3599
             
3587
3600
             refreshContents();
3588
3601
 	}
..
..
@@ -3732,7 +3745,7 @@
3732
3745
                 return;
3733
3746
             
3734
3747
             Object3D poses = group.selection.get(0);
3735
-            Object3D ref = GrafreeD.clipboard.get(0);
3748
+            Object3D ref = Grafreed.clipboard.get(0);
3736
3749
             
3737
3750
             Object3D newgroup = new Object3D("Po:" + poses.name);
3738
3751
             
..
..
@@ -3926,9 +3939,9 @@
3926
3939
 	
3927
3940
 	void ClipMesh()
3928
3941
 	{
3929
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3942
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3930
3943
             {
3931
-                Object3D content = GrafreeD.clipboard.get(0);
3944
+                Object3D content = Grafreed.clipboard.get(0);
3932
3945
 
3933
3946
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3934
3947
                     content = ((cGroup)content).get(0);
..
..
@@ -3937,7 +3950,7 @@
3937
3950
 //                {
3938
3951
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939
3952
 //                }
3940
-                  group.selection.ClipMesh(GrafreeD.clipboard);
3953
+                  group.selection.ClipMesh(Grafreed.clipboard);
3941
3954
             }
3942
3955
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3943
3956
             System.out.println("DONE.");
..
..
@@ -4277,12 +4290,12 @@
4277
4290
 	{
4278
4291
 		if (group.selection.isEmpty())
4279
4292
 			return;
4280
-		GrafreeD.clipboardIsTempGroup = false;
4293
+		Grafreed.clipboardIsTempGroup = false;
4281
4294
 		Composite tGroup = null;
4282
4295
 		if (group.selection.size() > 0) // 1)
4283
4296
 		{
4284
4297
 			tGroup = new cGroup();
4285
-			GrafreeD.clipboardIsTempGroup = true;
4298
+			Grafreed.clipboardIsTempGroup = true;
4286
4299
 		}
4287
4300
                 
4288
4301
 		if (cut)
..
..
@@ -4322,16 +4335,16 @@
4322
4335
 		//System.out.println("cut " + child);
4323
4336
 		//System.out.println("parent = " + child.parent);
4324
4337
                 //                   tmp.addChild(child);
4325
-                                    if (GrafreeD.clipboardIsTempGroup)
4338
+                                    if (Grafreed.clipboardIsTempGroup)
4326
4339
                                             tGroup.add/*Child*/(tmp);
4327
4340
                                     else
4328
-                                            GrafreeD.clipboard = tmp;
4341
+                                            Grafreed.clipboard = tmp;
4329
4342
                                 }
4330
4343
                                 else
4331
-                                    if (GrafreeD.clipboardIsTempGroup)
4344
+                                    if (Grafreed.clipboardIsTempGroup)
4332
4345
                                             tGroup.add/*Child*/(child);
4333
4346
                                     else
4334
-                                            GrafreeD.clipboard = child;
4347
+                                            Grafreed.clipboard = child;
4335
4348
 			}
4336
4349
 			
4337
4350
 			//ResetModel();
..
..
@@ -4363,21 +4376,21 @@
4363
4376
 		//System.out.println("cut " + elem);
4364
4377
 		//System.out.println("parent = " + elem.parent);
4365
4378
                 //                    tmp.addChild(elem);
4366
-                                    if (GrafreeD.clipboardIsTempGroup)
4379
+                                    if (Grafreed.clipboardIsTempGroup)
4367
4380
                                             tGroup.add/*Child*/(tmp);
4368
4381
                                     else
4369
-                                            GrafreeD.clipboard = tmp;
4382
+                                            Grafreed.clipboard = tmp;
4370
4383
                                 }
4371
4384
                                 else
4372
-                                    if (GrafreeD.clipboardIsTempGroup)
4385
+                                    if (Grafreed.clipboardIsTempGroup)
4373
4386
                                             tGroup.add/*Child*/(child);
4374
4387
                                     else
4375
-                                            GrafreeD.clipboard = child;
4388
+                                            Grafreed.clipboard = child;
4376
4389
 			}
4377
4390
 			
4378
4391
 		}
4379
-		if (GrafreeD.clipboardIsTempGroup)
4380
-			GrafreeD.clipboard = tGroup;
4392
+		if (Grafreed.clipboardIsTempGroup)
4393
+			Grafreed.clipboard = tGroup;
4381
4394
 		if (cut)
4382
4395
                 {
4383
4396
                     ResetModel();
..
..
@@ -4391,7 +4404,7 @@
4391
4404
 	//		return;
4392
4405
 		boolean first = true;
4393
4406
 		
4394
-		if (GrafreeD.clipboardIsTempGroup)
4407
+		if (Grafreed.clipboardIsTempGroup)
4395
4408
 		{
4396
4409
 			Composite temp;
4397
4410
 			
..
..
@@ -4402,7 +4415,7 @@
4402
4415
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4403
4416
                          */
4404
4417
 			Object3D elem;
4405
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4418
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406
4419
 			{
4407
4420
 				Object3D child = (Object3D)e.nextElement();
4408
4421
                                 
..
..
@@ -4436,14 +4449,14 @@
4436
4449
 			//Object3D cb = Applet3D.clipboard;
4437
4450
 			//temp.addChild(cb);
4438
4451
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439
-                    assert(GrafreeD.clipboard.parent == null);
4440
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4441
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4452
+                    assert(Grafreed.clipboard.parent == null);
4453
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4454
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4455
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4456
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444
4457
                         else
4445
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4458
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4459
+                        Grafreed.clipboard.get(0).parent = keepparent;
4447
4460
 		}
4448
4461
 		
4449
4462
 		ResetModel();
..
..
@@ -4492,9 +4505,9 @@
4492
4505
 		{
4493
4506
 			boolean first = true;
4494
4507
 			
4495
-			if (GrafreeD.clipboardIsTempGroup)
4508
+			if (Grafreed.clipboardIsTempGroup)
4496
4509
 			{
4497
-				Composite temp = (Composite)GrafreeD.clipboard;
4510
+				Composite temp = (Composite)Grafreed.clipboard;
4498
4511
 				Object3D copy;
4499
4512
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500
4513
 				{
..
..
@@ -4504,7 +4517,7 @@
4504
4517
 				}
4505
4518
 			} else
4506
4519
 			{
4507
-				linkSomething(GrafreeD.clipboard); //.get(0));
4520
+				linkSomething(Grafreed.clipboard); //.get(0));
4508
4521
 			}
4509
4522
 		}
4510
4523
             }
..
..
@@ -4949,7 +4962,7 @@
4949
4962
 
4950
4963
 	void ImportVRMLX3D()
4951
4964
 	{
4952
-		if (GrafreeD.standAlone)
4965
+		if (Grafreed.standAlone)
4953
4966
 		{
4954
4967
                     /**/
4955
4968
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4966,7 +4979,7 @@
4966
4979
 				
4967
4980
 	String GetFile(String dialogName)
4968
4981
 	{
4969
-		if (GrafreeD.standAlone)
4982
+		if (Grafreed.standAlone)
4970
4983
 		{
4971
4984
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972
4985
 			browser.show();