Remove "D".

Normand Briere

2019-05-05 f69d25e4682ca33edfc8cfad26187050f4eb558a

 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
..
..
@@ -491,7 +491,7 @@
491
491
                 liveCB.setToolTipText("Enabled animation");
492
492
                                 liveCB.addItemListener(this);
493
493
 
494
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495
495
                 oneStepButton.setToolTipText("Animate one step forward");
496
496
 		oneStepButton.addActionListener(this);
497
497
                 
..
..
@@ -503,7 +503,7 @@
503
503
                 trackCB.setToolTipText("Enable tracking");
504
504
                                 trackCB.addItemListener(this);
505
505
 
506
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507
507
                 screenfitButton.setToolTipText("Screen fit");
508
508
 		screenfitButton.addActionListener(this);
509
509
 
..
..
@@ -512,39 +512,39 @@
512
512
 
513
513
                 if (Globals.ADVANCED)
514
514
                 {
515
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
515
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516
516
                         snapobjectButton.addActionListener(this);
517
517
                         snapobjectButton.setToolTipText("Snap Object");
518
518
                 }
519
519
 
520
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521
521
                 flashSelectionButton.setToolTipText("Show selection");
522
522
 		flashSelectionButton.addActionListener(this);
523
523
                 
524
524
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525
525
                 
526
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527
527
                 twoButton.setToolTipText("Show center view only");
528
528
 		twoButton.addActionListener(this);
529
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530
530
 		fourButton.addActionListener(this);
531
531
                 fourButton.setToolTipText("Show left panel only");
532
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
532
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533
533
                 sixButton.setToolTipText("2-column layout left");
534
534
 		sixButton.addActionListener(this);
535
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
535
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536
536
                 threeButton.setToolTipText("2-column layout right");
537
537
 		threeButton.addActionListener(this);
538
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
538
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539
539
                 sevenButton.setToolTipText("3-column layout");
540
540
 		sevenButton.addActionListener(this);
541
541
                 //
542
542
 
543
-		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);
544
544
                 rootButton.setToolTipText("Edit selection in new tab");
545
545
 		rootButton.addActionListener(this);
546
546
 
547
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
547
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548
548
                 closeButton.setToolTipText("Close tab");
549
549
 		closeButton.addActionListener(this);
550
550
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -552,11 +552,11 @@
552
552
                         
553
553
                 cGridBag commandsPanel = new cGridBag();
554
554
                 
555
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
555
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556
556
                 editButton.setToolTipText("Edit selection");
557
557
 		editButton.addActionListener(this);
558
558
 
559
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
559
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560
560
                 uneditButton.setToolTipText("Unedit selection");
561
561
 		uneditButton.addActionListener(this);
562
562
 
..
..
@@ -564,11 +564,11 @@
564
564
                 allParamsButton.setToolTipText("Edit all params");
565
565
 		allParamsButton.addActionListener(this);
566
566
 
567
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
567
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568
568
                 clearPanelButton.setToolTipText("Clear edit panel");
569
569
 		clearPanelButton.addActionListener(this);
570
570
 
571
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
571
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572
572
                 unselectButton.setToolTipText("Unselect");
573
573
 		unselectButton.addActionListener(this);
574
574
 
..
..
@@ -969,7 +969,7 @@
969
969
                     
970
970
                     flashIt = false;
971
971
                     CameraPane pane = (CameraPane) target;
972
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
972
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
973
973
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
974
974
                     
975
975
                     if (group.selection.size() == 1)
..
..
@@ -1542,9 +1542,9 @@
1542
1542
     
1543
1543
     void Overwrite(int mask)
1544
1544
     {
1545
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1545
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1546
1546
         {
1547
-            Object3D content = GrafreeD.clipboard.get(0);
1547
+            Object3D content = Grafreed.clipboard.get(0);
1548
1548
 
1549
1549
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1550
1550
                 content = ((cGroup)content).get(0);
..
..
@@ -1892,7 +1892,7 @@
1892
1892
 		if (source == invariantsItem)
1893
1893
 		{
1894
1894
                     System.out.println("Invariants:");
1895
-                    GrafreeD.grafreeD.universe.invariants();
1895
+                    Grafreed.grafreeD.universe.invariants();
1896
1896
 		} else
1897
1897
 		if (source == memoryItem)
1898
1898
 		{
..
..
@@ -1967,10 +1967,10 @@
1967
1967
 		} else
1968
1968
 		if (source == duplicateItem)
1969
1969
 		{
1970
-                    Object3D keep = GrafreeD.clipboard;
1970
+                    Object3D keep = Grafreed.clipboard;
1971
1971
 			loadClipboard(false);
1972
1972
 			paste(false);
1973
-                    GrafreeD.clipboard = keep;
1973
+                    Grafreed.clipboard = keep;
1974
1974
 		} else
1975
1975
 		if (source == cloneItem)
1976
1976
 		{
..
..
@@ -2190,9 +2190,9 @@
2190
2190
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2191
2191
 //		refreshContents();
2192
2192
 //                    }
2193
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2193
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2194
2194
                     {
2195
-                        Object3D content = GrafreeD.clipboard.get(0);
2195
+                        Object3D content = Grafreed.clipboard.get(0);
2196
2196
                         
2197
2197
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2198
2198
                             content = ((cGroup)content).get(0);
..
..
@@ -2242,9 +2242,9 @@
2242
2242
 		} else
2243
2243
 		if (source == setMasterItem)
2244
2244
 		{
2245
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2245
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2246
2246
                     {
2247
-                        Object3D content = GrafreeD.clipboard.get(0);
2247
+                        Object3D content = Grafreed.clipboard.get(0);
2248
2248
                         
2249
2249
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2250
2250
                             content = ((cGroup)content).get(0);
..
..
@@ -2257,9 +2257,9 @@
2257
2257
 		{
2258
2258
                     if (group.selection.size() == 1)
2259
2259
                     {
2260
-                        if (GrafreeD.clipboard.size() == 1)
2260
+                        if (Grafreed.clipboard.size() == 1)
2261
2261
                         {
2262
-                            Object3D content = GrafreeD.clipboard.get(0);
2262
+                            Object3D content = Grafreed.clipboard.get(0);
2263
2263
 
2264
2264
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2265
2265
                                 content = ((cGroup)content).get(0);
..
..
@@ -3338,9 +3338,9 @@
3338
3338
                     obj = (Object3D)e.nextElement();
3339
3339
                     
3340
3340
                     System.out.println("Object is: " + obj);
3341
-                    GrafreeD.AnalyzeObject(obj);
3341
+                    Grafreed.AnalyzeObject(obj);
3342
3342
                     System.out.println("Boundary rep: " + obj.bRep);
3343
-                    GrafreeD.AnalyzeObject(obj.bRep);
3343
+                    Grafreed.AnalyzeObject(obj.bRep);
3344
3344
                     
3345
3345
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3346
3346
                 }
..
..
@@ -3554,8 +3554,8 @@
3554
3554
 	
3555
3555
 	void ParseVertices()
3556
3556
 	{
3557
-            boolean epsequal = GrafreeD.epsequal;
3558
-            GrafreeD.epsequal = true;
3557
+            boolean epsequal = Grafreed.epsequal;
3558
+            Grafreed.epsequal = true;
3559
3559
             
3560
3560
             for (int i=0; i<group.selection.size(); i++)
3561
3561
             {
..
..
@@ -3580,7 +3580,7 @@
3580
3580
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3581
3581
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3582
3582
 
3583
-                                g.add(GrafreeD.clipboard);
3583
+                                g.add(Grafreed.clipboard);
3584
3584
 
3585
3585
                                 buffer.add(g);
3586
3586
                             }
..
..
@@ -3595,7 +3595,7 @@
3595
3595
                 makeSomething(buffer, i==group.selection.size()-1);
3596
3596
             }
3597
3597
             
3598
-            GrafreeD.epsequal = epsequal;
3598
+            Grafreed.epsequal = epsequal;
3599
3599
             
3600
3600
             refreshContents();
3601
3601
 	}
..
..
@@ -3745,7 +3745,7 @@
3745
3745
                 return;
3746
3746
             
3747
3747
             Object3D poses = group.selection.get(0);
3748
-            Object3D ref = GrafreeD.clipboard.get(0);
3748
+            Object3D ref = Grafreed.clipboard.get(0);
3749
3749
             
3750
3750
             Object3D newgroup = new Object3D("Po:" + poses.name);
3751
3751
             
..
..
@@ -3939,9 +3939,9 @@
3939
3939
 	
3940
3940
 	void ClipMesh()
3941
3941
 	{
3942
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3942
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3943
3943
             {
3944
-                Object3D content = GrafreeD.clipboard.get(0);
3944
+                Object3D content = Grafreed.clipboard.get(0);
3945
3945
 
3946
3946
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3947
3947
                     content = ((cGroup)content).get(0);
..
..
@@ -3950,7 +3950,7 @@
3950
3950
 //                {
3951
3951
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3952
3952
 //                }
3953
-                  group.selection.ClipMesh(GrafreeD.clipboard);
3953
+                  group.selection.ClipMesh(Grafreed.clipboard);
3954
3954
             }
3955
3955
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3956
3956
             System.out.println("DONE.");
..
..
@@ -4290,12 +4290,12 @@
4290
4290
 	{
4291
4291
 		if (group.selection.isEmpty())
4292
4292
 			return;
4293
-		GrafreeD.clipboardIsTempGroup = false;
4293
+		Grafreed.clipboardIsTempGroup = false;
4294
4294
 		Composite tGroup = null;
4295
4295
 		if (group.selection.size() > 0) // 1)
4296
4296
 		{
4297
4297
 			tGroup = new cGroup();
4298
-			GrafreeD.clipboardIsTempGroup = true;
4298
+			Grafreed.clipboardIsTempGroup = true;
4299
4299
 		}
4300
4300
                 
4301
4301
 		if (cut)
..
..
@@ -4335,16 +4335,16 @@
4335
4335
 		//System.out.println("cut " + child);
4336
4336
 		//System.out.println("parent = " + child.parent);
4337
4337
                 //                   tmp.addChild(child);
4338
-                                    if (GrafreeD.clipboardIsTempGroup)
4338
+                                    if (Grafreed.clipboardIsTempGroup)
4339
4339
                                             tGroup.add/*Child*/(tmp);
4340
4340
                                     else
4341
-                                            GrafreeD.clipboard = tmp;
4341
+                                            Grafreed.clipboard = tmp;
4342
4342
                                 }
4343
4343
                                 else
4344
-                                    if (GrafreeD.clipboardIsTempGroup)
4344
+                                    if (Grafreed.clipboardIsTempGroup)
4345
4345
                                             tGroup.add/*Child*/(child);
4346
4346
                                     else
4347
-                                            GrafreeD.clipboard = child;
4347
+                                            Grafreed.clipboard = child;
4348
4348
 			}
4349
4349
 			
4350
4350
 			//ResetModel();
..
..
@@ -4376,21 +4376,21 @@
4376
4376
 		//System.out.println("cut " + elem);
4377
4377
 		//System.out.println("parent = " + elem.parent);
4378
4378
                 //                    tmp.addChild(elem);
4379
-                                    if (GrafreeD.clipboardIsTempGroup)
4379
+                                    if (Grafreed.clipboardIsTempGroup)
4380
4380
                                             tGroup.add/*Child*/(tmp);
4381
4381
                                     else
4382
-                                            GrafreeD.clipboard = tmp;
4382
+                                            Grafreed.clipboard = tmp;
4383
4383
                                 }
4384
4384
                                 else
4385
-                                    if (GrafreeD.clipboardIsTempGroup)
4385
+                                    if (Grafreed.clipboardIsTempGroup)
4386
4386
                                             tGroup.add/*Child*/(child);
4387
4387
                                     else
4388
-                                            GrafreeD.clipboard = child;
4388
+                                            Grafreed.clipboard = child;
4389
4389
 			}
4390
4390
 			
4391
4391
 		}
4392
-		if (GrafreeD.clipboardIsTempGroup)
4393
-			GrafreeD.clipboard = tGroup;
4392
+		if (Grafreed.clipboardIsTempGroup)
4393
+			Grafreed.clipboard = tGroup;
4394
4394
 		if (cut)
4395
4395
                 {
4396
4396
                     ResetModel();
..
..
@@ -4404,7 +4404,7 @@
4404
4404
 	//		return;
4405
4405
 		boolean first = true;
4406
4406
 		
4407
-		if (GrafreeD.clipboardIsTempGroup)
4407
+		if (Grafreed.clipboardIsTempGroup)
4408
4408
 		{
4409
4409
 			Composite temp;
4410
4410
 			
..
..
@@ -4415,7 +4415,7 @@
4415
4415
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4416
4416
                          */
4417
4417
 			Object3D elem;
4418
-			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))
4419
4419
 			{
4420
4420
 				Object3D child = (Object3D)e.nextElement();
4421
4421
                                 
..
..
@@ -4449,14 +4449,14 @@
4449
4449
 			//Object3D cb = Applet3D.clipboard;
4450
4450
 			//temp.addChild(cb);
4451
4451
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
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());
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());
4457
4457
                         else
4458
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4459
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4458
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4459
+                        Grafreed.clipboard.get(0).parent = keepparent;
4460
4460
 		}
4461
4461
 		
4462
4462
 		ResetModel();
..
..
@@ -4505,9 +4505,9 @@
4505
4505
 		{
4506
4506
 			boolean first = true;
4507
4507
 			
4508
-			if (GrafreeD.clipboardIsTempGroup)
4508
+			if (Grafreed.clipboardIsTempGroup)
4509
4509
 			{
4510
-				Composite temp = (Composite)GrafreeD.clipboard;
4510
+				Composite temp = (Composite)Grafreed.clipboard;
4511
4511
 				Object3D copy;
4512
4512
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4513
4513
 				{
..
..
@@ -4517,7 +4517,7 @@
4517
4517
 				}
4518
4518
 			} else
4519
4519
 			{
4520
-				linkSomething(GrafreeD.clipboard); //.get(0));
4520
+				linkSomething(Grafreed.clipboard); //.get(0));
4521
4521
 			}
4522
4522
 		}
4523
4523
             }
..
..
@@ -4962,7 +4962,7 @@
4962
4962
 
4963
4963
 	void ImportVRMLX3D()
4964
4964
 	{
4965
-		if (GrafreeD.standAlone)
4965
+		if (Grafreed.standAlone)
4966
4966
 		{
4967
4967
                     /**/
4968
4968
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4979,7 +4979,7 @@
4979
4979
 				
4980
4980
 	String GetFile(String dialogName)
4981
4981
 	{
4982
-		if (GrafreeD.standAlone)
4982
+		if (Grafreed.standAlone)
4983
4983
 		{
4984
4984
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4985
4985
 			browser.show();