Fix animation and fast mode.

Normand Briere

2019-05-01 20c1a07b76c39462594aedfedfe6e6adb17cd552

 GroupEditor.java
..
..
@@ -12,6 +12,7 @@
12
12
 import com.jme.math.Vector3f;
13
13
 import com.jme.renderer.ColorRGBA;
14
14
 
15
+import grafeme.ui.*;
15
16
 //import buoy.widget.BFileChooser;
16
17
 
17
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..
..
@@ -433,31 +434,28 @@
433
434
         oe.radioPanel.add(dummyButton);
434
435
         oe.buttonGroup.add(dummyButton);
435
436
          */
436
-                aConstraints.gridy += 1;
437
-                
438
437
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439
438
                 
440
-		oe.aConstraints.gridwidth = 1;
441
-        	oe.aConstraints.gridx = 0;
442
-                
443
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
439
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
444
440
                 liveCB.setToolTipText("Enabled animation");
445
441
                                 liveCB.addItemListener(this);
446
442
 
447
-        	oe.aConstraints.gridx += 1;
448
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
443
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
+                fastCB.setToolTipText("Fast mode");
445
+                                fastCB.addItemListener(this);
446
+                                
447
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449
448
                 trackCB.setToolTipText("Enable tracking");
450
449
                                 trackCB.addItemListener(this);
451
450
 
452
-        	oe.aConstraints.gridx += 1;
453
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
451
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
454
452
                 screenfitButton.setToolTipText("Screen fit");
455
453
 		screenfitButton.addActionListener(this);
456
-			oe.aConstraints.gridx += 1;
454
+
457
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458
456
 //		screenfitpointButton.addActionListener(this);
459
457
 //			oe.aConstraints.gridx += 1;
460
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
458
+		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
461
459
 		snapobjectButton.addActionListener(this);
462
460
                 snapobjectButton.setToolTipText("Snap Object");
463
461
 			oe.aConstraints.gridx += 1;
..
..
@@ -467,76 +465,66 @@
467
465
 		oe.aConstraints.weighty = 0;
468
466
 		oe.aConstraints.gridwidth = 1;
469
467
 		
470
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
468
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
471
469
                 flashSelectionButton.setToolTipText("Show selection");
472
470
 		flashSelectionButton.addActionListener(this);
473
471
                 
474
-		oe.toolbarPanel.add(new cButton("     ", false));
472
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475
473
                 
476
-		oe.aConstraints.gridx += 1;
477
-		oe.aConstraints.weighty = 0;
478
-		oe.aConstraints.gridwidth = 1;
479
-                
480
-                //
481
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
474
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
482
475
                 twoButton.setToolTipText("Show center view only");
483
476
 		twoButton.addActionListener(this);
484
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
477
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485
478
 		fourButton.addActionListener(this);
486
479
                 fourButton.setToolTipText("Show left panel only");
487
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
480
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
481
                 sixButton.setToolTipText("2-column layout left");
489
482
 		sixButton.addActionListener(this);
490
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
483
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
491
484
                 threeButton.setToolTipText("2-column layout right");
492
485
 		threeButton.addActionListener(this);
493
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
486
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494
487
                 sevenButton.setToolTipText("3-column layout");
495
488
 		sevenButton.addActionListener(this);
496
489
                 //
497
490
 
498
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499
-                rootButton.setToolTipText("Edit object in new tab");
491
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
+                rootButton.setToolTipText("Edit selection in new tab");
500
493
 		rootButton.addActionListener(this);
501
-			oe.aConstraints.gridx += 1;
502
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
494
+
495
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503
496
                 closeButton.setToolTipText("Close tab");
504
497
 		closeButton.addActionListener(this);
505
498
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506
499
 		//clearButton.addActionListener(this);
507
-			oe.aConstraints.gridx += 1;
508
500
                         
509
-		oe.aConstraints.gridx = 1; //
510
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
501
+                cGridBag commandsPanel = new cGridBag();
502
+                
503
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
+                editButton.setToolTipText("Edit selection");
511
505
 		editButton.addActionListener(this);
512
-		oe.aConstraints.gridx += 1;
513
-		oe.aConstraints.weighty = 0;
514
-		oe.aConstraints.gridwidth = 1;
515
506
 
516
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
507
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508
+                uneditButton.setToolTipText("Unedit selection");
517
509
 		uneditButton.addActionListener(this);
518
510
 
519
-		oe.aConstraints.gridx += 1;
520
-		oe.aConstraints.weighty = 0;
521
-		oe.aConstraints.gridwidth = 1;
522
-                
523
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
511
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
+                clearPanelButton.setToolTipText("Clear edit panel");
524
513
 		clearPanelButton.addActionListener(this);
525
514
 
526
-		oe.aConstraints.gridx += 1;
527
-		oe.aConstraints.weighty = 0;
528
-		oe.aConstraints.gridwidth = 1;
529
-                
530
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
515
+		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
+                allParamsButton.setToolTipText("All params??");
531
517
 		allParamsButton.addActionListener(this);
532
518
 
533
-		oe.aConstraints.gridx += 1;
534
-		oe.aConstraints.weighty = 0;
535
-		oe.aConstraints.gridwidth = 1;
536
-                
537
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
519
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+                unselectButton.setToolTipText("Unselect");
538
521
 		unselectButton.addActionListener(this);
539
522
 
523
+                commandsPanel.preferredHeight = 1;
524
+                
525
+                oe.treePanel.add(commandsPanel);
526
+                oe.treePanel.Return();
527
+                
540
528
 //		oe.aConstraints.gridx += 1;
541
529
 //		oe.aConstraints.weighty = 0;
542
530
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -548,40 +536,37 @@
548
536
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549
537
 //		gcButton.addActionListener(this);
550
538
                 
551
-                oe.aConstraints.gridx = 0;
552
-		oe.aConstraints.gridy += 1;
553
-                
554
-		//ctrlPanel.add(objList = new List(5, true));
555
-		oe.aConstraints.gridwidth = 100;
556
-	//	oe.aConstraints.gridheight = 100;
557
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558
-		oe.aConstraints.gridheight = 1;
559
-		oe.aConstraints.weighty = 0.5;
560
-		oe.aConstraints.gridx = 0;
561
-		JScrollPane jSP;
539
+                cGridBag jSPPanel = new cGridBag();
540
+
541
+                JScrollPane jSP;
562
542
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
543
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564
544
                 ResetModel();
565
-		oe.aConstraints.weighty = 0.5;
566
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567
-		oe.aConstraints.gridy += 1;
568
-		oe.aConstraints.gridwidth = 1;
545
+                
546
+                oe.treePanel.add(jSPPanel);
547
+                oe.treePanel.Return();
569
548
 
570
-		oe.aConstraints.weighty = 0;
571
-		oe.aConstraints.gridwidth = 2;
572
-
573
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
549
+                cGridBag copyOptionsPanel = new cGridBag();
550
+                
551
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552
+                colorCB.setToolTipText("Copy color when dropped");
574
553
                 colorCB.addItemListener(this);
575
-                oe.aConstraints.gridx += 2;
576
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
554
+
555
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556
+                materialCB.setToolTipText("Copy material when dropped");
577
557
                 materialCB.addItemListener(this);
578
-                oe.aConstraints.gridx += 2;
579
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
558
+
559
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560
+                textureCB.setToolTipText("Copy texture when dropped");
580
561
                 textureCB.addItemListener(this);
581
562
                         
582
-                oe.aConstraints.gridx = 0;
583
-		oe.aConstraints.gridy += 1;
563
+                copyOptionsPanel.preferredHeight = 1;
564
+                oe.treePanel.add(copyOptionsPanel);
565
+                oe.treePanel.Return();
584
566
                 
567
+//        mainPanel.setDividerLocation(0.5); //1.0);
568
+//        mainPanel.setResizeWeight(0.5);
569
+        
585
570
 		//jList.addListSelectionListener(this);
586
571
 		oe.jTree.addTreeSelectionListener(this);
587
572
 		//jTree.setRootVisible(false);
..
..
@@ -604,42 +589,32 @@
604
589
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605
590
 	}
606
591
         
607
-        void AddOptions(JPanel panel, GridBagConstraints constraints)
592
+        void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608
593
         {
609
-        	constraints.gridx = 0;
610
-        	constraints.gridy = 0;
611
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612
-                fastCB.setToolTipText("Fast mode");
613
-                                fastCB.addItemListener(this);
614
-        	constraints.gridy += 1;
615
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
594
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
616
595
                 supportCB.setToolTipText("Enabled rigging");
617
596
                                 supportCB.addItemListener(this);
618
597
 
619
-        //	constraints.gridy += 1;
620
598
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621
599
         //                        localCB.addItemListener(this);
622
600
 
623
-        	constraints.gridy += 1;
624
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
601
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625
602
                 crowdCB.setToolTipText("Used for crowds");
626
603
                                 crowdCB.addItemListener(this);
627
604
 
628
-        	constraints.gridy += 1;
629
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
605
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630
606
                 smoothCB.setToolTipText("Snapping delay");
631
607
                                 smoothCB.addItemListener(this);
632
608
 
633
-        	constraints.gridy += 1;
634
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
609
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635
610
                 slowCB.setToolTipText("Smooth interpolation");
636
611
                                 slowCB.addItemListener(this);
637
-        	constraints.gridy += 1;
638
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
612
+                                
613
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639
614
                 boxCB.setToolTipText("Display bounding boxes");
640
615
                                 boxCB.addItemListener(this);
641
-        	constraints.gridy += 1;
642
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
616
+                                
617
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643
618
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644
619
                                 zoomBoxCB.addItemListener(this);
645
620
 
..
..
@@ -650,16 +625,16 @@
650
625
             if (false)
651
626
             {
652
627
                 // handled in scripts
653
-        	constraints.gridy += 1;
654
-                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
628
+        	//constraints.gridy += 1;
629
+                panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655
630
                                 speakerCameraCB.addItemListener(this);
656
631
 
657
-        	constraints.gridy += 1;
658
-                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
632
+        	//constraints.gridy += 1;
633
+                panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659
634
                                 speakerFocusCB.addItemListener(this);
660
635
 
661
-        	constraints.gridy += 1;
662
-                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
636
+        	//constraints.gridy += 1;
637
+                panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663
638
                                 smoothfocusCB.addItemListener(this);
664
639
             }
665
640
 
..
..
@@ -667,14 +642,18 @@
667
642
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668
643
 //                debugCB.addItemListener(this);
669
644
 
670
-        	constraints.gridy += 1;
671
-                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
645
+                panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672
646
                                 oeilCB.addItemListener(this);
673
647
 
674
-        	constraints.gridy += 1;
675
-                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
648
+                panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676
649
                 lookAtCB.setToolTipText("Look-at target");
677
650
                                 lookAtCB.addItemListener(this);
651
+                                
652
+                cGridBag fill = new cGridBag();
653
+                                
654
+                fill.preferredHeight = 200;
655
+                
656
+                panel.add(fill);
678
657
 
679
658
         }
680
659
 	
..
..
@@ -1123,7 +1102,7 @@
1123
1102
 	{
1124
1103
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125
1104
 		animationItem.addItemListener(this);
1126
-                animationItem.setState(CameraPane.ANIMATION);
1105
+                animationItem.setState(Globals.ANIMATION);
1127
1106
                 
1128
1107
 		menu.add("-");
1129
1108
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -1518,6 +1497,7 @@
1518
1497
 //
1519
1498
         public void actionPerformed(ActionEvent event) // , Object arg)
1520
1499
 	{
1500
+                Object source = event.getSource();
1521
1501
             /*
1522
1502
 		if (event.getSource() == nameField)
1523
1503
 		{
..
..
@@ -1529,11 +1509,11 @@
1529
1509
 		}
1530
1510
                 else
1531
1511
              */
1532
-		if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
1512
+		if (source == lookAtItem || source == lookFromItem)
1533
1513
 		{
1534
1514
                     ScreenFit();
1535
1515
                 } else
1536
-		if (event.getSource() == switchItem)
1516
+		if (source == switchItem)
1537
1517
 		{
1538
1518
 			cVector v1 = new cVector();
1539
1519
 			cVector v2 = new cVector();
..
..
@@ -1542,11 +1522,11 @@
1542
1522
 			objEditor.cameraView.renderCamera.setAim(v2, v1);
1543
1523
 			objEditor.cameraView.repaint();
1544
1524
 		} else
1545
-		if (event.getSource() == rectoidItem)
1525
+		if (source == rectoidItem)
1546
1526
 		{
1547
1527
 			makeSomething(new Box());
1548
1528
 		} else
1549
-		if (event.getSource() == particleItem)
1529
+		if (source == particleItem)
1550
1530
 		{
1551
1531
         ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552
1532
         ParticleController particleController = new ParticleController(particleGeom);
..
..
@@ -1567,9 +1547,9 @@
1567
1547
         applyExample(particleGeom, "SMOKE");
1568
1548
 			makeSomething(particleGeom);
1569
1549
 		} else
1570
-		if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
1550
+		if (source == ragdollItem || source == ragdoll2Item)
1571
1551
 		{
1572
-                    GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
1552
+                    GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573
1553
                     
1574
1554
                     ragdoll.toParent = LA.newMatrix();
1575
1555
                     ragdoll.fromParent = LA.newMatrix();
..
..
@@ -1587,7 +1567,7 @@
1587
1567
 		} else
1588
1568
                     /*
1589
1569
                      */
1590
-		if (event.getSource() == heightFieldItem)
1570
+		if (source == heightFieldItem)
1591
1571
 		{
1592
1572
                     Object3D obj = new Object3D();
1593
1573
                     
..
..
@@ -1625,31 +1605,31 @@
1625
1605
                     
1626
1606
                     makeSomething(obj);
1627
1607
 		} else
1628
-		if (event.getSource() == gridItem)
1608
+		if (source == gridItem)
1629
1609
 		{
1630
1610
 			makeSomething(new Grid());
1631
1611
 		} else
1632
-		if (event.getSource() == ellipsoidItem)
1612
+		if (source == ellipsoidItem)
1633
1613
 		{
1634
1614
 			makeSomething(new Sphere());
1635
1615
 		} else
1636
-		if (event.getSource() == coneItem)
1616
+		if (source == coneItem)
1637
1617
 		{
1638
1618
 			makeSomething(new Cone());
1639
1619
 		} else
1640
-		if (event.getSource() == torusItem)
1620
+		if (source == torusItem)
1641
1621
 		{
1642
1622
 			makeSomething(new Torus());
1643
1623
 		} else
1644
-		if (event.getSource() == superItem)
1624
+		if (source == superItem)
1645
1625
 		{
1646
1626
 			makeSomething(new Superellipsoid());
1647
1627
 		} else
1648
-		if (event.getSource() == kleinItem)
1628
+		if (source == kleinItem)
1649
1629
 		{
1650
1630
 			makeSomething(new Klein());
1651
1631
 		} else
1652
-		if (event.getSource() == blobItem)
1632
+		if (source == blobItem)
1653
1633
 		{
1654
1634
 			Blob blob = new Blob();
1655
1635
 			BlobComponent comp = new BlobComponent();
..
..
@@ -1657,15 +1637,15 @@
1657
1637
 			//blob.retile();
1658
1638
 			makeSomething(blob);
1659
1639
 		} else
1660
-		if (event.getSource() == latheItem)
1640
+		if (source == latheItem)
1661
1641
 		{
1662
1642
 			makeSomething(new Lathe());
1663
1643
 		} else
1664
-		if (event.getSource() == bezierItem)
1644
+		if (source == bezierItem)
1665
1645
 		{
1666
1646
 			makeSomething(new BezierSurface());
1667
1647
 		} else
1668
-		if (event.getSource() == checkerItem)
1648
+		if (source == checkerItem)
1669
1649
 		{
1670
1650
                     /*
1671
1651
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1680,7 +1660,7 @@
1680
1660
                      */
1681
1661
 			makeSomething(new Checker());
1682
1662
 		} else
1683
-		if (event.getSource() == meshItem)
1663
+		if (source == meshItem)
1684
1664
 		{
1685
1665
                     Object3D itemtomake = new Object3D();
1686
1666
                     Object3D child;
..
..
@@ -1701,35 +1681,35 @@
1701
1681
                         makeSomething(child);
1702
1682
                     }
1703
1683
 		} else
1704
-		if (event.getSource() == springItem)
1684
+		if (source == springItem)
1705
1685
 		{
1706
1686
 			cSpring s = new cSpring();
1707
1687
                         s.setup();
1708
1688
 			makeSomething(s);
1709
1689
 		} else
1710
-		if (event.getSource() == flagItem)
1690
+		if (source == flagItem)
1711
1691
 		{
1712
1692
 			cSpring s = new cFlag();
1713
1693
                         s.setup();
1714
1694
 			makeSomething(s);
1715
1695
 		} else
1716
-		if (event.getSource() == lightItem)
1696
+		if (source == lightItem)
1717
1697
 		{
1718
1698
 			makeSomething(new Light());
1719
1699
 		} else
1720
-		if (event.getSource() == csgItem)
1700
+		if (source == csgItem)
1721
1701
 		{
1722
1702
 			group(new CSG());
1723
1703
 		} else
1724
-		if (event.getSource() == templateItem)
1704
+		if (source == templateItem)
1725
1705
 		{
1726
1706
 			group(new cTemplate());
1727
1707
 		} else
1728
-		if (event.getSource() == attributeItem)
1708
+		if (source == attributeItem)
1729
1709
 		{
1730
1710
 			makeSomething(new Attribute());
1731
1711
 		} else
1732
-		if (event.getSource() == pointflowItem)
1712
+		if (source == pointflowItem)
1733
1713
 		{
1734
1714
 			makeSomething(new PointFlow());
1735
1715
 		} else
..
..
@@ -1741,7 +1721,7 @@
1741
1721
 		} else
1742
1722
                      */
1743
1723
                     
1744
-		if (event.getSource() == superLoopItem)
1724
+		if (source == superLoopItem)
1745
1725
 		{
1746
1726
                         Composite g = new cGroup();
1747
1727
                         for (int i=0; i<15; i++)
..
..
@@ -1763,7 +1743,7 @@
1763
1743
                             
1764
1744
 			group(g);
1765
1745
 		} else
1766
-		if (event.getSource() == loopItem)
1746
+		if (source == loopItem)
1767
1747
 		{
1768
1748
                         Composite csg = new GroupLeaf();
1769
1749
                         csg.count = 5;
..
..
@@ -1772,7 +1752,7 @@
1772
1752
                         csg.addChild(child);
1773
1753
                         child.addChild(csg);
1774
1754
 		} else
1775
-		if (event.getSource() == doubleItem)
1755
+		if (source == doubleItem)
1776
1756
 		{
1777
1757
                         Composite csg = new GroupLeaf();
1778
1758
                         csg.count = 5;
..
..
@@ -1784,7 +1764,7 @@
1784
1764
                         csg.addChild(child);
1785
1765
                         child.addChild(csg);
1786
1766
 		} else
1787
-		if (event.getSource() == tripleItem)
1767
+		if (source == tripleItem)
1788
1768
 		{
1789
1769
                         Composite csg = new GroupLeaf();
1790
1770
                         csg.count = 4;
..
..
@@ -1800,70 +1780,70 @@
1800
1780
                         child.addChild(csg);
1801
1781
 		} else
1802
1782
                     
1803
-		if (event.getSource() == importGFDItem)
1783
+		if (source == importGFDItem)
1804
1784
 		{
1805
1785
 			ImportGFD();
1806
1786
 		} else
1807
-		if (event.getSource() == importVRMLX3DItem)
1787
+		if (source == importVRMLX3DItem)
1808
1788
 		{
1809
1789
 			ImportVRMLX3D();
1810
1790
 		} else
1811
-		if (event.getSource() == import3DSItem)
1791
+		if (source == import3DSItem)
1812
1792
 		{
1813
1793
 			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814
1794
 		} else
1815
-		if (event.getSource() == importOBJItem)
1795
+		if (source == importOBJItem)
1816
1796
 		{
1817
1797
 			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818
1798
 		} else
1819
-		if (event.getSource() == computeAOItem)
1799
+		if (source == computeAOItem)
1820
1800
 		{
1821
1801
                     Globals.drawMode = CameraPane.OCCLUSION;
1822
1802
                     Globals.theRenderer.repaint();
1823
1803
 		} else
1824
-		if (event.getSource() == recompileItem)
1804
+		if (source == recompileItem)
1825
1805
 		{
1826
1806
                     Recompile();
1827
1807
                     refreshContents();
1828
1808
 		} else
1829
-		if (event.getSource() == editScriptItem)
1809
+		if (source == editScriptItem)
1830
1810
 		{
1831
1811
                     OpenDialog();
1832
1812
                     refreshContents();
1833
1813
 		} else
1834
-		if (event.getSource() == invariantsItem)
1814
+		if (source == invariantsItem)
1835
1815
 		{
1836
1816
                     System.out.println("Invariants:");
1837
1817
                     GrafreeD.grafreeD.universe.invariants();
1838
1818
 		} else
1839
-		if (event.getSource() == memoryItem)
1819
+		if (source == memoryItem)
1840
1820
 		{
1841
1821
                     //System.out.println("Invariants:");
1842
1822
                     PrintMemory();
1843
1823
 		} else
1844
-		if (event.getSource() == pathItem)
1824
+		if (source == pathItem)
1845
1825
 		{
1846
1826
                     PrintPath();
1847
1827
 		} else
1848
-		if (event.getSource() == analyzeItem)
1828
+		if (source == analyzeItem)
1849
1829
 		{
1850
1830
                     AnalyzeObject();
1851
1831
 		} else
1852
-		if (event.getSource() == dumpItem)
1832
+		if (source == dumpItem)
1853
1833
 		{
1854
1834
                     DumpObject();
1855
1835
 		} else
1856
-		if (event.getSource() == screenfitButton)
1836
+		if (source == screenfitButton)
1857
1837
 		{
1858
1838
 			//Reload(lastConverter, lastFilename, true);
1859
1839
                     ScreenFit();
1860
1840
 		} else
1861
-		if (event.getSource() == screenfitpointButton)
1841
+		if (source == screenfitpointButton)
1862
1842
 		{
1863
1843
 			//Reload(lastConverter, lastFilename, true);
1864
1844
                     ScreenFitPoint();
1865
1845
 		} else
1866
-		if (event.getSource() == snapobjectButton)
1846
+		if (source == snapobjectButton)
1867
1847
 		{
1868
1848
 			//Reload(lastConverter, lastFilename, true);
1869
1849
                     SnapObject();
..
..
@@ -1874,13 +1854,13 @@
1874
1854
 //                    Recompile();
1875
1855
 //                    refreshContents();
1876
1856
 //		} else
1877
-		if (event.getSource() == gcButton)
1857
+		if (source == gcButton)
1878
1858
 		{
1879
1859
                     System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880
1860
                     System.gc();
1881
1861
                     System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882
1862
 		} else
1883
-		if (event.getSource() == editLeafItem)
1863
+		if (source == editLeafItem)
1884
1864
 		{
1885
1865
                     Object3D obj;
1886
1866
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -1894,62 +1874,62 @@
1894
1874
                     }
1895
1875
                     refreshContents(true);
1896
1876
 		} else
1897
-		if (event.getSource() == openWindowItem)
1877
+		if (source == openWindowItem)
1898
1878
 		{
1899
1879
 			EditSelection(true);
1900
1880
 		} else
1901
-		if (event.getSource() == cutItem || event.getSource() == clearButton)
1881
+		if (source == cutItem || source == clearButton)
1902
1882
 		{
1903
1883
 			loadClipboard(true);
1904
1884
 		} else
1905
-		if (event.getSource() == duplicateItem)
1885
+		if (source == duplicateItem)
1906
1886
 		{
1907
1887
                     Object3D keep = GrafreeD.clipboard;
1908
1888
 			loadClipboard(false);
1909
1889
 			paste(false);
1910
1890
                     GrafreeD.clipboard = keep;
1911
1891
 		} else
1912
-		if (event.getSource() == cloneItem)
1892
+		if (source == cloneItem)
1913
1893
 		{
1914
1894
                     CloneSelection(false);
1915
1895
 		} else
1916
-		if (event.getSource() == cloneSupportItem)
1896
+		if (source == cloneSupportItem)
1917
1897
 		{
1918
1898
                     CloneSelection(true);
1919
1899
 		} else
1920
-		if (event.getSource() == copyItem)
1900
+		if (source == copyItem)
1921
1901
 		{
1922
1902
 			loadClipboard(false);
1923
1903
 		} else
1924
-		if (event.getSource() == pasteItem)
1904
+		if (source == pasteItem)
1925
1905
 		{
1926
1906
 			paste(false);
1927
1907
 		} else
1928
-		if (event.getSource() == pasteLinkItem)
1908
+		if (source == pasteLinkItem)
1929
1909
 		{
1930
1910
 			pasteInto(false);
1931
1911
 		} else
1932
-		if (event.getSource() == pasteCloneItem)
1912
+		if (source == pasteCloneItem)
1933
1913
 		{
1934
1914
 			pasteInto(true);
1935
1915
 		} else
1936
-		if (event.getSource() == pasteExpandItem)
1916
+		if (source == pasteExpandItem)
1937
1917
 		{
1938
1918
 			paste(true);
1939
1919
 		} else
1940
-		if (event.getSource() == synchronizeItem)
1920
+		if (source == synchronizeItem)
1941
1921
 		{
1942
1922
                     Overwrite(Object3D.TRANSFORM);
1943
1923
                 } else
1944
-		if (event.getSource() == overwriteNameItem)
1924
+		if (source == overwriteNameItem)
1945
1925
 		{
1946
1926
                     Overwrite(Object3D.NAME);
1947
1927
                 } else
1948
-		if (event.getSource() == overwriteUVItem)
1928
+		if (source == overwriteUVItem)
1949
1929
 		{
1950
1930
                     Overwrite(Object3D.UV);
1951
1931
                 } else
1952
-		if (event.getSource() == overwriteMatItem)
1932
+		if (source == overwriteMatItem)
1953
1933
 		{
1954
1934
                     /* july 2015
1955
1935
                     if ((dropAttributes & Object3D.TEXTURE) == 0)
..
..
@@ -1969,7 +1949,7 @@
1969
1949
                     
1970
1950
                     Overwrite(dropAttributes);
1971
1951
                 }
1972
-		if (event.getSource() == overwriteGeoItem)
1952
+		if (source == overwriteGeoItem)
1973
1953
 		{
1974
1954
                     Overwrite(Object3D.GEOMETRY);
1975
1955
 //                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
..
..
@@ -1986,7 +1966,7 @@
1986
1966
 //		refreshContents();
1987
1967
 //                    }
1988
1968
 		} else
1989
-		if (event.getSource() == generateMeshItem)
1969
+		if (source == generateMeshItem)
1990
1970
 		{
1991
1971
                     //if (group.selection.size() == 1)
1992
1972
 //                    for (int i=0; i<group.selection.size(); i++)
..
..
@@ -1997,7 +1977,7 @@
1997
1977
                     ResetModel();
1998
1978
                     refreshContents();
1999
1979
 		} else
2000
-		if (event.getSource() == extractGeometriesItem)
1980
+		if (source == extractGeometriesItem)
2001
1981
 		{
2002
1982
                     boolean one = false;
2003
1983
                     
..
..
@@ -2024,7 +2004,7 @@
2024
2004
                     ResetModel();
2025
2005
                     refreshContents();
2026
2006
 		} else
2027
-		if (event.getSource() == cloneGeometriesItem)
2007
+		if (source == cloneGeometriesItem)
2028
2008
 		{
2029
2009
                     boolean one = false;
2030
2010
                     
..
..
@@ -2050,7 +2030,7 @@
2050
2030
                     ResetModel();
2051
2031
                     refreshContents();
2052
2032
 		} else
2053
-		if (event.getSource() == shareGeometriesItem)
2033
+		if (source == shareGeometriesItem)
2054
2034
 		{
2055
2035
                     boolean one = false;
2056
2036
                     
..
..
@@ -2080,7 +2060,7 @@
2080
2060
                         refreshContents();
2081
2061
                     }
2082
2062
 		} else
2083
-		if (event.getSource() == mergeGeometriesItem)
2063
+		if (source == mergeGeometriesItem)
2084
2064
 		{
2085
2065
                     boolean one = false;
2086
2066
                     
..
..
@@ -2110,7 +2090,7 @@
2110
2090
                     ResetModel();
2111
2091
                     refreshContents();
2112
2092
 		} else
2113
-		if (event.getSource() == linkverticesItem)
2093
+		if (source == linkverticesItem)
2114
2094
 		{
2115
2095
 //                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116
2096
 //                    {
..
..
@@ -2143,7 +2123,7 @@
2143
2123
 		refreshContents();
2144
2124
                     }
2145
2125
 		} else
2146
-		if (event.getSource() == resetsupportItem)
2126
+		if (source == resetsupportItem)
2147
2127
 		{
2148
2128
                     for (int i=0; i<group.selection.size(); i++)
2149
2129
                     {
..
..
@@ -2155,7 +2135,7 @@
2155
2135
 
2156
2136
                     refreshContents();
2157
2137
 		} else
2158
-		if (event.getSource() == relinkverticesItem)
2138
+		if (source == relinkverticesItem)
2159
2139
 		{
2160
2140
                     boolean random = CameraPane.RANDOM;
2161
2141
                     CameraPane.RANDOM = false; // parse all random nodes
..
..
@@ -2164,7 +2144,7 @@
2164
2144
 
2165
2145
                     refreshContents();
2166
2146
 		} else
2167
-		if (event.getSource() == resetreferencesItem)
2147
+		if (source == resetreferencesItem)
2168
2148
 		{
2169
2149
                     for (int i=0; i<group.selection.size(); i++)
2170
2150
                     {
..
..
@@ -2173,7 +2153,7 @@
2173
2153
 
2174
2154
                     refreshContents();
2175
2155
 		} else
2176
-		if (event.getSource() == setMasterItem)
2156
+		if (source == setMasterItem)
2177
2157
 		{
2178
2158
                     if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2179
2159
                     {
..
..
@@ -2186,7 +2166,7 @@
2186
2166
 		refreshContents();
2187
2167
                     }
2188
2168
 		} else
2189
-		if (event.getSource() == poseMeshItem)
2169
+		if (source == poseMeshItem)
2190
2170
 		{
2191
2171
                     if (group.selection.size() == 1)
2192
2172
                     {
..
..
@@ -2205,19 +2185,19 @@
2205
2185
                     }
2206
2186
                         
2207
2187
 		} else
2208
-		if (event.getSource() == revertMeshItem)
2188
+		if (source == revertMeshItem)
2209
2189
 		{
2210
2190
 			RevertMeshes();
2211
2191
 		} else
2212
-		if (event.getSource() == resetMeshItem)
2192
+		if (source == resetMeshItem)
2213
2193
 		{
2214
2194
 			ResetAll();
2215
2195
 		} else
2216
-		if (event.getSource() == stepAllItem)
2196
+		if (source == stepAllItem)
2217
2197
 		{
2218
2198
 			StepAll();
2219
2199
 		} else
2220
-		if (event.getSource() == clearItem) // || event.getSource() == clearButton)
2200
+		if (source == clearItem) // || event.getSource() == clearButton)
2221
2201
 		{
2222
2202
 			//int indices[] = jList.getSelectedIndices();
2223
2203
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -2225,46 +2205,46 @@
2225
2205
 
2226
2206
 			ClearSelection(false);
2227
2207
 		} else
2228
-		if (event.getSource() == clearAllItem)
2208
+		if (source == clearAllItem)
2229
2209
 		{
2230
2210
 			ClearSelection(true);
2231
2211
 		} else
2232
-		if (event.getSource() == grabItem)
2212
+		if (source == grabItem)
2233
2213
 		{
2234
2214
 			group(new cGroup(), true);
2235
2215
 		} else
2236
-		if (event.getSource() == hideItem)
2216
+		if (source == hideItem)
2237
2217
 		{
2238
2218
 			group(new HiddenObject());
2239
2219
 		} else
2240
-		if (event.getSource() == frontItem)
2220
+		if (source == frontItem)
2241
2221
 		{
2242
2222
                     front();
2243
2223
 		} else
2244
-		if (event.getSource() == backItem)
2224
+		if (source == backItem)
2245
2225
 		{
2246
2226
                     back();
2247
2227
 		} else
2248
-		if (event.getSource() == cameraItem)
2228
+		if (source == cameraItem)
2249
2229
 		{
2250
2230
 			makeSomething(new Camera());
2251
2231
 		} else
2252
-		if (event.getSource() == compositeItem)
2232
+		if (source == compositeItem)
2253
2233
 		{
2254
2234
 			group(new Composite());
2255
2235
 		} else
2256
-		if (event.getSource() == randomItem)
2236
+		if (source == randomItem)
2257
2237
 		{
2258
2238
                         RandomNode random = new RandomNode();
2259
2239
 			group(random);
2260
2240
                         if (random.size() > 0)
2261
2241
                             random.name = random.get(0).name + "Rnd";
2262
2242
 		} else
2263
-		if (event.getSource() == physicsItem)
2243
+		if (source == physicsItem)
2264
2244
                 {
2265
2245
                     group(new PhysicsNode());
2266
2246
 		} else
2267
-		if (event.getSource() == frameselectorItem)
2247
+		if (source == frameselectorItem)
2268
2248
 		{
2269
2249
                     for (int i=0; i<group.selection.size(); i++)
2270
2250
                     {
..
..
@@ -2276,7 +2256,7 @@
2276
2256
                     ResetModel();
2277
2257
                     refreshContents();
2278
2258
 		} else
2279
-		if (event.getSource() == switchGeoItem)
2259
+		if (source == switchGeoItem)
2280
2260
 		{
2281
2261
                     for (int i=0; i<group.selection.size(); i++)
2282
2262
                     {
..
..
@@ -2288,7 +2268,7 @@
2288
2268
                     ResetModel();
2289
2269
                     refreshContents();
2290
2270
 		} else
2291
-		if (event.getSource() == switchTransfoItem)
2271
+		if (source == switchTransfoItem)
2292
2272
 		{
2293
2273
                     for (int i=0; i<group.selection.size(); i++)
2294
2274
                     {
..
..
@@ -2300,7 +2280,7 @@
2300
2280
                     ResetModel();
2301
2281
                     refreshContents();
2302
2282
 		} else
2303
-		if (event.getSource() == morphItem)
2283
+		if (source == morphItem)
2304
2284
 		{
2305
2285
                     for (int i=0; i<group.selection.size(); i++)
2306
2286
                     {
..
..
@@ -2312,7 +2292,7 @@
2312
2292
                     ResetModel();
2313
2293
                     refreshContents();
2314
2294
 		} else
2315
-		if (event.getSource() == scriptNodeItem)
2295
+		if (source == scriptNodeItem)
2316
2296
 		{
2317
2297
                     boolean atleastone = false;
2318
2298
                     
..
..
@@ -2351,31 +2331,31 @@
2351
2331
                         }
2352
2332
                     }
2353
2333
 		} else
2354
-		if (event.getSource() == linkerItem)
2334
+		if (source == linkerItem)
2355
2335
 		{
2356
2336
 			group(new cLinker());
2357
2337
 		} else
2358
-		if (event.getSource() == textureItem)
2338
+		if (source == textureItem)
2359
2339
 		{
2360
2340
 			group(new TextureNode());
2361
2341
 		} else
2362
-		if (event.getSource() == billboardItem)
2342
+		if (source == billboardItem)
2363
2343
 		{
2364
2344
 			group(new BillboardNode());
2365
2345
 		} else
2366
-		if (event.getSource() == shadowXItem)
2346
+		if (source == shadowXItem)
2367
2347
 		{
2368
2348
 			CastShadow(0);
2369
2349
 		} else
2370
-		if (event.getSource() == shadowYItem)
2350
+		if (source == shadowYItem)
2371
2351
 		{
2372
2352
 			CastShadow(1);
2373
2353
 		} else
2374
-		if (event.getSource() == shadowZItem)
2354
+		if (source == shadowZItem)
2375
2355
 		{
2376
2356
 			CastShadow(2);
2377
2357
 		} else
2378
-		if (event.getSource() == ungroupItem)
2358
+		if (source == ungroupItem)
2379
2359
 		{
2380
2360
 			//ungroup();
2381
2361
                     for (int i=0; i<group.selection.size(); i++)
..
..
@@ -2387,179 +2367,179 @@
2387
2367
                     
2388
2368
                     refreshContents();
2389
2369
 		} else
2390
-		if (event.getSource() == genUVItem)
2370
+		if (source == genUVItem)
2391
2371
                 {
2392
2372
 			GenUV();
2393
2373
 		} else
2394
-		if (event.getSource() == genNormalsCADItem)
2374
+		if (source == genNormalsCADItem)
2395
2375
                 {
2396
2376
 			GenNormals(true);
2397
2377
 		} else
2398
-		if (event.getSource() == genNormalsMESHItem)
2378
+		if (source == genNormalsMESHItem)
2399
2379
                 {
2400
2380
 			GenNormals(true); // TODO
2401
2381
 		} else
2402
-		if (event.getSource() == genNormalsORGANItem)
2382
+		if (source == genNormalsORGANItem)
2403
2383
                 {
2404
2384
 			GenNormals(false);
2405
2385
 		} else
2406
-		if (event.getSource() == genNormalsMINEItem)
2386
+		if (source == genNormalsMINEItem)
2407
2387
                 {
2408
2388
 			GenNormalsMINE();
2409
2389
 		} else
2410
-		if (event.getSource() == stripifyItem)
2390
+		if (source == stripifyItem)
2411
2391
                 {
2412
2392
 			Stripify();
2413
2393
 		} else
2414
-		if (event.getSource() == unstripifyItem)
2394
+		if (source == unstripifyItem)
2415
2395
                 {
2416
2396
 			Unstripify();
2417
2397
 		} else
2418
-		if (event.getSource() == trimItem)
2398
+		if (source == trimItem)
2419
2399
                 {
2420
2400
 			Trim();
2421
2401
 		} else
2422
-		if (event.getSource() == untrimItem)
2402
+		if (source == untrimItem)
2423
2403
                 {
2424
2404
 			Untrim();
2425
2405
 		} else
2426
-		if (event.getSource() == clearColorsItem)
2406
+		if (source == clearColorsItem)
2427
2407
                 {
2428
2408
 			ClearColors();
2429
2409
 		} else
2430
-		if (event.getSource() == clearMaterialsItem)
2410
+		if (source == clearMaterialsItem)
2431
2411
                 {
2432
2412
 			ClearMaterials();
2433
2413
 		} else
2434
-		if (event.getSource() == liveleavesItem)
2414
+		if (source == liveleavesItem)
2435
2415
                 {
2436
2416
 			LiveLeaves(true);
2437
2417
 		} else
2438
-		if (event.getSource() == unliveleavesItem)
2418
+		if (source == unliveleavesItem)
2439
2419
                 {
2440
2420
 			LiveLeaves(false);
2441
2421
 		} else
2442
-		if (event.getSource() == supportleavesItem)
2422
+		if (source == supportleavesItem)
2443
2423
                 {
2444
2424
 			SupportLeaves(true);
2445
2425
 		} else
2446
-		if (event.getSource() == unsupportleavesItem)
2426
+		if (source == unsupportleavesItem)
2447
2427
                 {
2448
2428
 			SupportLeaves(false);
2449
2429
 		} else
2450
-		if (event.getSource() == hideleavesItem)
2430
+		if (source == hideleavesItem)
2451
2431
                 {
2452
2432
 			HideLeaves(true);
2453
2433
 		} else
2454
-		if (event.getSource() == showleavesItem)
2434
+		if (source == showleavesItem)
2455
2435
                 {
2456
2436
 			HideLeaves(false);
2457
2437
 		} else
2458
-		if (event.getSource() == markleavesItem)
2438
+		if (source == markleavesItem)
2459
2439
                 {
2460
2440
 			MarkLeaves(true);
2461
2441
 		} else
2462
-		if (event.getSource() == unmarkleavesItem)
2442
+		if (source == unmarkleavesItem)
2463
2443
                 {
2464
2444
 			MarkLeaves(false);
2465
2445
 		} else
2466
-		if (event.getSource() == flipVItem)
2446
+		if (source == flipVItem)
2467
2447
                 {
2468
2448
 			FlipV(true);
2469
2449
 		} else
2470
-		if (event.getSource() == unflipVItem)
2450
+		if (source == unflipVItem)
2471
2451
                 {
2472
2452
 			FlipV(false);
2473
2453
 		} else
2474
-		if (event.getSource() == lowTexturesItem)
2454
+		if (source == lowTexturesItem)
2475
2455
                 {
2476
2456
 			SetTexRes(0);
2477
2457
 		} else
2478
-		if (event.getSource() == normalTexturesItem)
2458
+		if (source == normalTexturesItem)
2479
2459
                 {
2480
2460
 			SetTexRes(1);
2481
2461
 		} else
2482
-		if (event.getSource() == highTexturesItem)
2462
+		if (source == highTexturesItem)
2483
2463
                 {
2484
2464
 			SetTexRes(2);
2485
2465
 		} else
2486
-		if (event.getSource() == veryhighTexturesItem)
2466
+		if (source == veryhighTexturesItem)
2487
2467
                 {
2488
2468
 			SetTexRes(3);
2489
2469
 		} else
2490
-		if (event.getSource() == maxTexturesItem)
2470
+		if (source == maxTexturesItem)
2491
2471
                 {
2492
2472
 			SetTexRes(4);
2493
2473
 		} else
2494
-		if (event.getSource() == panoTexturesItem)
2474
+		if (source == panoTexturesItem)
2495
2475
                 {
2496
2476
 			SetTexRes(5);
2497
2477
 		} else
2498
-		if (event.getSource() == reverseNormalsItem)
2478
+		if (source == reverseNormalsItem)
2499
2479
                 {
2500
2480
 			ReverseNormals();
2501
2481
 		} else
2502
-		if (event.getSource() == parseverticesItem)
2482
+		if (source == parseverticesItem)
2503
2483
                 {
2504
2484
 			ParseVertices();
2505
2485
 		} else
2506
-		if (event.getSource() == textureFieldItem)
2486
+		if (source == textureFieldItem)
2507
2487
                 {
2508
2488
 			TextureVertices();
2509
2489
 		} else
2510
-		if (event.getSource() == alignItem)
2490
+		if (source == alignItem)
2511
2491
                 {
2512
2492
 			Align();
2513
2493
 		} else
2514
-		if (event.getSource() == mirrorItem)
2494
+		if (source == mirrorItem)
2515
2495
                 {
2516
2496
 			MirrorPoses();
2517
2497
 		} else
2518
-		if (event.getSource() == reduceMorphItem)
2498
+		if (source == reduceMorphItem)
2519
2499
                 {
2520
2500
 			MeshReduction(false);
2521
2501
 		} else
2522
-		if (event.getSource() == reduce34MorphItem)
2502
+		if (source == reduce34MorphItem)
2523
2503
                 {
2524
2504
 			MeshReduction(true);
2525
2505
 		} else
2526
-		if (event.getSource() == reverseTrianglesItem)
2506
+		if (source == reverseTrianglesItem)
2527
2507
                 {
2528
2508
 			ReverseTriangles();
2529
2509
 		} else
2530
-		if (event.getSource() == reduceMeshItem)
2510
+		if (source == reduceMeshItem)
2531
2511
                 {
2532
2512
 			ReduceMesh(false);
2533
2513
 		} else
2534
-		if (event.getSource() == reduce34MeshItem)
2514
+		if (source == reduce34MeshItem)
2535
2515
                 {
2536
2516
 			ReduceMesh(true);
2537
2517
 		} else
2538
-		if (event.getSource() == increaseMeshItem)
2518
+		if (source == increaseMeshItem)
2539
2519
                 {
2540
2520
 			IncreaseMesh();
2541
2521
 		} else
2542
-		if (event.getSource() == clipMeshItem)
2522
+		if (source == clipMeshItem)
2543
2523
                 {
2544
2524
 			ClipMesh();
2545
2525
 		} else
2546
-		if (event.getSource() == smoothMeshItem)
2526
+		if (source == smoothMeshItem)
2547
2527
                 {
2548
2528
 			SmoothMesh();
2549
2529
 		} else
2550
-		if (event.getSource() == transformgeometryItem)
2530
+		if (source == transformgeometryItem)
2551
2531
 		{
2552
2532
                         TransformGeometry();
2553
2533
 		} else
2554
-		if (event.getSource() == resetTransformItem)
2534
+		if (source == resetTransformItem)
2555
2535
 		{
2556
2536
                         ResetTransform();
2557
2537
 		} else
2558
-		if (event.getSource() == resetCentroidItem)
2538
+		if (source == resetCentroidItem)
2559
2539
 		{
2560
2540
                         ResetCentroid();
2561
2541
 		} else
2562
-		if (event.getSource() == resetParentItem)
2542
+		if (source == resetParentItem)
2563
2543
 		{
2564
2544
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565
2545
 			{
..
..
@@ -2569,7 +2549,7 @@
2569
2549
 			
2570
2550
 			refreshContents();
2571
2551
 		} else
2572
-		if (event.getSource() == repairParentItem)
2552
+		if (source == repairParentItem)
2573
2553
 		{
2574
2554
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575
2555
 			{
..
..
@@ -2583,7 +2563,7 @@
2583
2563
 			
2584
2564
 			refreshContents();
2585
2565
 		} else
2586
-		if (event.getSource() == repairShadowItem)
2566
+		if (source == repairShadowItem)
2587
2567
 		{
2588
2568
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589
2569
 			{
..
..
@@ -2597,7 +2577,7 @@
2597
2577
 			
2598
2578
 			refreshContents();
2599
2579
 		} else
2600
-		if (event.getSource() == sortbysizeItem)
2580
+		if (source == sortbysizeItem)
2601
2581
 		{
2602
2582
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603
2583
 			{
..
..
@@ -2609,7 +2589,7 @@
2609
2589
                         ResetModel();
2610
2590
 			refreshContents();
2611
2591
 		} else
2612
-		if (event.getSource() == sortbynameItem)
2592
+		if (source == sortbynameItem)
2613
2593
 		{
2614
2594
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615
2595
 			{
..
..
@@ -2621,7 +2601,7 @@
2621
2601
         		ResetModel();
2622
2602
 			refreshContents();
2623
2603
 		} else
2624
-		if (event.getSource() == attachPigmentItem)
2604
+		if (source == attachPigmentItem)
2625
2605
 		{
2626
2606
                     String texture = GetFile("Attach pigment");
2627
2607
 			Object3D obj;
..
..
@@ -2633,7 +2613,7 @@
2633
2613
 			
2634
2614
 			refreshContents();
2635
2615
 		} else
2636
-		if (event.getSource() == detachPigmentItem)
2616
+		if (source == detachPigmentItem)
2637
2617
 		{
2638
2618
 			Object3D obj;
2639
2619
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2644,7 +2624,7 @@
2644
2624
 			
2645
2625
 			refreshContents();
2646
2626
 		} else
2647
-		if (event.getSource() == attachBumpItem)
2627
+		if (source == attachBumpItem)
2648
2628
 		{
2649
2629
                     String texture = GetFile("Attach bump");
2650
2630
 			Object3D obj;
..
..
@@ -2656,7 +2636,7 @@
2656
2636
 			
2657
2637
 			refreshContents();
2658
2638
 		} else
2659
-		if (event.getSource() == detachBumpItem)
2639
+		if (source == detachBumpItem)
2660
2640
 		{
2661
2641
 			Object3D obj;
2662
2642
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2667,7 +2647,7 @@
2667
2647
 			
2668
2648
 			refreshContents();
2669
2649
 		} else
2670
-		if (event.getSource() == pigmentBumpItem)
2650
+		if (source == pigmentBumpItem)
2671
2651
 		{
2672
2652
 			Object3D obj;
2673
2653
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2678,158 +2658,195 @@
2678
2658
 			
2679
2659
 			refreshContents();
2680
2660
 		} else
2681
-		if (event.getSource() == flashSelectionButton)
2661
+		if (source == flashSelectionButton)
2682
2662
 		{
2683
2663
 			CameraPane.flash = true;
2684
2664
 			refreshContents();
2685
2665
 		} else
2686
-		if (event.getSource() == oneButton)
2666
+		if (source == oneButton)
2687
2667
 		{
2688
2668
                 } else
2689
-		if (event.getSource() == twoButton)
2669
+		if (source == twoButton)
2690
2670
 		{
2691
2671
                     radio.layout = twoButton;
2692
2672
                     // bug
2693
2673
                     //gridPanel.setDividerLocation(1.0);
2694
2674
                     //bigPanel.setDividerLocation(0.0);
2695
-                    bigThree.remove(scenePanel);
2696
-                    bigThree.remove(centralPanel);
2697
-                    bigThree.remove(XYZPanel);
2698
-                    aWindowConstraints.gridx = 0;
2699
-                    aWindowConstraints.gridy = 0;
2700
-                    aWindowConstraints.gridwidth = 1;
2701
-            //        aConstraints.gridheight = 3;
2702
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703
-                    aWindowConstraints.weightx = 0;
2704
-                    aWindowConstraints.weighty = 1;
2705
-                    //bigThree.add(jtp, aWindowConstraints);
2706
-                    aWindowConstraints.weightx = 1;
2707
-                    aWindowConstraints.gridwidth = 3;
2708
-            //        aConstraints.gridheight = 3;
2709
-                    aWindowConstraints.gridx = 1;
2710
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2711
-                    bigThree.add(centralPanel, aWindowConstraints);
2712
-                    aWindowConstraints.weightx = 0;
2713
-                    aWindowConstraints.gridx = 4;
2714
-                    aWindowConstraints.gridwidth = 1;
2715
-            //        aConstraints.gridheight = 3;
2716
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717
-                    //bigThree.add(XYZPanel, aWindowConstraints);
2718
-                    bigThree.revalidate();
2675
+//                    bigThree.remove(scenePanel);
2676
+//                    bigThree.remove(centralPanel);
2677
+//                    bigThree.remove(XYZPanel);
2678
+//                    aWindowConstraints.gridx = 0;
2679
+//                    aWindowConstraints.gridy = 0;
2680
+//                    aWindowConstraints.gridwidth = 1;
2681
+//            //        aConstraints.gridheight = 3;
2682
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2683
+//                    aWindowConstraints.weightx = 0;
2684
+//                    aWindowConstraints.weighty = 1;
2685
+//                    //bigThree.add(jtp, aWindowConstraints);
2686
+//                    aWindowConstraints.weightx = 1;
2687
+//                    aWindowConstraints.gridwidth = 3;
2688
+//            //        aConstraints.gridheight = 3;
2689
+//                    aWindowConstraints.gridx = 1;
2690
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2691
+//                    bigThree.add(centralPanel, aWindowConstraints);
2692
+//                    aWindowConstraints.weightx = 0;
2693
+//                    aWindowConstraints.gridx = 4;
2694
+//                    aWindowConstraints.gridwidth = 1;
2695
+//            //        aConstraints.gridheight = 3;
2696
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2697
+//                    //bigThree.add(XYZPanel, aWindowConstraints);
2698
+//                    scenePanel.setVisible(false);
2699
+//                    centralPanel.setVisible(true);
2700
+//                    XYZPanel.setVisible(false);
2701
+                    bigThree.ClearUI();
2702
+                    bigThree.add(centralPanel);
2703
+                    bigThree.FlushUI();
2719
2704
                 } else
2720
-		if (event.getSource() == threeButton)
2705
+		if (source == threeButton)
2721
2706
 		{
2722
2707
                     radio.layout = threeButton;
2723
-                    bigThree.remove(scenePanel);
2724
-                    bigThree.remove(centralPanel);
2725
-                    bigThree.remove(XYZPanel);
2726
-                    aWindowConstraints.gridx = 0;
2727
-                    aWindowConstraints.gridy = 0;
2728
-                    aWindowConstraints.gridwidth = 1;
2729
-            //        aConstraints.gridheight = 3;
2730
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731
-                    aWindowConstraints.weightx = 0;
2732
-                    aWindowConstraints.weighty = 1;
2733
-                    //bigThree.add(jtp, aWindowConstraints);
2734
-                    aWindowConstraints.weightx = 1;
2735
-                    aWindowConstraints.gridwidth = 3;
2736
-            //        aConstraints.gridheight = 3;
2737
-                    aWindowConstraints.gridx = 1;
2738
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2739
-                    bigThree.add(centralPanel, aWindowConstraints);
2740
-                    aWindowConstraints.weightx = 0;
2741
-                    aWindowConstraints.gridx = 4;
2742
-                    aWindowConstraints.gridwidth = 1;
2743
-            //        aConstraints.gridheight = 3;
2744
-                    aConstraints.fill = GridBagConstraints.VERTICAL;
2745
-                    bigThree.add(XYZPanel, aWindowConstraints);
2746
-                    bigThree.revalidate();
2708
+                    
2709
+//                    bigThree.remove(scenePanel);
2710
+//                    bigThree.remove(centralPanel);
2711
+//                    bigThree.remove(XYZPanel);
2712
+//                    aWindowConstraints.gridx = 0;
2713
+//                    aWindowConstraints.gridy = 0;
2714
+//                    aWindowConstraints.gridwidth = 1;
2715
+//            //        aConstraints.gridheight = 3;
2716
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717
+//                    aWindowConstraints.weightx = 0;
2718
+//                    aWindowConstraints.weighty = 1;
2719
+//                    //bigThree.add(jtp, aWindowConstraints);
2720
+//                    aWindowConstraints.weightx = 1;
2721
+//                    aWindowConstraints.gridwidth = 3;
2722
+//            //        aConstraints.gridheight = 3;
2723
+//                    aWindowConstraints.gridx = 1;
2724
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2725
+//                    bigThree.add(centralPanel, aWindowConstraints);
2726
+//                    aWindowConstraints.weightx = 0;
2727
+//                    aWindowConstraints.gridx = 4;
2728
+//                    aWindowConstraints.gridwidth = 1;
2729
+//            //        aConstraints.gridheight = 3;
2730
+//                    aConstraints.fill = GridBagConstraints.VERTICAL;
2731
+//                    bigThree.add(XYZPanel, aWindowConstraints);
2732
+//                    bigThree.validate();
2733
+//                    scenePanel.setVisible(false);
2734
+//                    centralPanel.setVisible(true);
2735
+//                    XYZPanel.setVisible(true);
2736
+                    bigThree.ClearUI();
2737
+                    bigThree.add(centralPanel);
2738
+                    bigThree.add(XYZPanel);
2739
+                    bigThree.FlushUI();
2747
2740
                 } else
2748
-		if (event.getSource() == fourButton)
2741
+		if (source == fourButton)
2749
2742
 		{
2750
2743
                     radio.layout = fourButton;
2751
-                    bigThree.remove(scenePanel);
2752
-                    bigThree.remove(centralPanel);
2753
-                    bigThree.remove(XYZPanel);
2754
-                    aWindowConstraints.gridx = 0;
2755
-                    aWindowConstraints.gridy = 0;
2756
-                    aWindowConstraints.gridwidth = 1;
2757
-              //      aWindowConstraints.gridheight = 3;
2758
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2759
-                    aWindowConstraints.weightx = 1;
2760
-                    aWindowConstraints.weighty = 1;
2761
-                    bigThree.add(scenePanel, aWindowConstraints);
2762
-                    aWindowConstraints.weightx = 1;
2763
-                    aWindowConstraints.gridwidth = 3;
2764
-              //      aConstraints.gridheight = 3;
2765
-                    aWindowConstraints.gridx = 1;
2766
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2767
-                    //bigThree.add(cameraPanel, aWindowConstraints);
2768
-                    aWindowConstraints.weightx = 0;
2769
-                    aWindowConstraints.gridx = 4;
2770
-                    aWindowConstraints.gridwidth = 1;
2771
-              //      aWindowConstraints.gridheight = 3;
2772
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773
-                    //bigThree.add(XYZPanel, aWindowConstraints);
2774
-                    bigThree.revalidate();
2744
+                    
2745
+//                    bigThree.remove(scenePanel);
2746
+//                    bigThree.remove(centralPanel);
2747
+//                    bigThree.remove(XYZPanel);
2748
+//                    aWindowConstraints.gridx = 0;
2749
+//                    aWindowConstraints.gridy = 0;
2750
+//                    aWindowConstraints.gridwidth = 1;
2751
+//              //      aWindowConstraints.gridheight = 3;
2752
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2753
+//                    aWindowConstraints.weightx = 1;
2754
+//                    aWindowConstraints.weighty = 1;
2755
+//                    bigThree.add(scenePanel, aWindowConstraints);
2756
+//                    aWindowConstraints.weightx = 1;
2757
+//                    aWindowConstraints.gridwidth = 3;
2758
+//              //      aConstraints.gridheight = 3;
2759
+//                    aWindowConstraints.gridx = 1;
2760
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2761
+//                    //bigThree.add(cameraPanel, aWindowConstraints);
2762
+//                    aWindowConstraints.weightx = 0;
2763
+//                    aWindowConstraints.gridx = 4;
2764
+//                    aWindowConstraints.gridwidth = 1;
2765
+//              //      aWindowConstraints.gridheight = 3;
2766
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2767
+//                    //bigThree.add(XYZPanel, aWindowConstraints);
2768
+//                    bigThree.validate();
2769
+//                    scenePanel.setVisible(true);
2770
+//                    centralPanel.setVisible(false);
2771
+//                    XYZPanel.setVisible(false);
2772
+                    bigThree.ClearUI();
2773
+                    bigThree.add(scenePanel);
2774
+                    bigThree.FlushUI();
2775
2775
                 } else
2776
-		if (event.getSource() == sixButton)
2776
+		if (source == sixButton)
2777
2777
 		{
2778
2778
                     radio.layout = sixButton;
2779
-                    bigThree.remove(scenePanel);
2780
-                    bigThree.remove(centralPanel);
2781
-                    bigThree.remove(XYZPanel);
2782
-                    aWindowConstraints.gridx = 0;
2783
-                    aWindowConstraints.gridy = 0;
2784
-                    aWindowConstraints.gridwidth = 1;
2785
-              //      aConstraints.gridheight = 3;
2786
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787
-                    aWindowConstraints.weightx = 0;
2788
-                    aWindowConstraints.weighty = 1;
2789
-                    bigThree.add(scenePanel, aWindowConstraints);
2790
-                    aWindowConstraints.weightx = 1;
2791
-                    aWindowConstraints.gridwidth = 3;
2792
-              //      aWindowConstraints.gridheight = 3;
2793
-                    aWindowConstraints.gridx = 1;
2794
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2795
-                    bigThree.add(centralPanel, aWindowConstraints);
2796
-                    aWindowConstraints.weightx = 0;
2797
-                    aWindowConstraints.gridx = 4;
2798
-                    aWindowConstraints.gridwidth = 1;
2799
-              //      aWindowConstraints.gridheight = 3;
2800
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801
-                    //bigThree.add(XYZPanel, aConstraints);
2802
-                    bigThree.revalidate();
2779
+                    
2780
+//                    bigThree.remove(scenePanel);
2781
+//                    bigThree.remove(centralPanel);
2782
+//                    bigThree.remove(XYZPanel);
2783
+//                    aWindowConstraints.gridx = 0;
2784
+//                    aWindowConstraints.gridy = 0;
2785
+//                    aWindowConstraints.gridwidth = 1;
2786
+//              //      aConstraints.gridheight = 3;
2787
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2788
+//                    aWindowConstraints.weightx = 0;
2789
+//                    aWindowConstraints.weighty = 1;
2790
+//                    bigThree.add(scenePanel, aWindowConstraints);
2791
+//                    aWindowConstraints.weightx = 1;
2792
+//                    aWindowConstraints.gridwidth = 3;
2793
+//              //      aWindowConstraints.gridheight = 3;
2794
+//                    aWindowConstraints.gridx = 1;
2795
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2796
+//                    bigThree.add(centralPanel, aWindowConstraints);
2797
+//                    aWindowConstraints.weightx = 0;
2798
+//                    aWindowConstraints.gridx = 4;
2799
+//                    aWindowConstraints.gridwidth = 1;
2800
+//              //      aWindowConstraints.gridheight = 3;
2801
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2802
+//                    //bigThree.add(XYZPanel, aConstraints);
2803
+//                    bigThree.validate();
2804
+//                    scenePanel.setVisible(true);
2805
+//                    centralPanel.setVisible(true);
2806
+//                    XYZPanel.setVisible(false);
2807
+                    bigThree.ClearUI();
2808
+                    bigThree.add(scenePanel);
2809
+                    bigThree.add(centralPanel);
2810
+                    bigThree.FlushUI();
2803
2811
                 } else
2804
-		if (event.getSource() == sevenButton)
2812
+		if (source == sevenButton)
2805
2813
 		{
2806
2814
                     radio.layout = sevenButton;
2807
-                    bigThree.remove(scenePanel);
2808
-                    bigThree.remove(centralPanel);
2809
-                    bigThree.remove(XYZPanel);
2810
-                    aWindowConstraints.gridx = 0;
2811
-                    aWindowConstraints.gridy = 0;
2812
-                    aWindowConstraints.gridwidth = 1;
2813
-               //     aWindowConstraints.gridheight = 3;
2814
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815
-                    aWindowConstraints.weightx = 0;
2816
-                    aWindowConstraints.weighty = 1;
2817
-                    bigThree.add(scenePanel, aWindowConstraints);
2818
-                    aWindowConstraints.weightx = 1;
2819
-                    aWindowConstraints.gridwidth = 3;
2820
-               //     aWindowConstraints.gridheight = 3;
2821
-                    aWindowConstraints.gridx = 1;
2822
-                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2823
-                    bigThree.add(centralPanel, aWindowConstraints);
2824
-                    aWindowConstraints.weightx = 0;
2825
-                    aWindowConstraints.gridx = 4;
2826
-                    aWindowConstraints.gridwidth = 1;
2827
-               //     aConstraints.gridheight = 3;
2828
-                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829
-                    bigThree.add(XYZPanel, aWindowConstraints);
2830
-                    bigThree.revalidate();
2815
+                    
2816
+//                    bigThree.remove(scenePanel);
2817
+//                    bigThree.remove(centralPanel);
2818
+//                    bigThree.remove(XYZPanel);
2819
+//                    aWindowConstraints.gridx = 0;
2820
+//                    aWindowConstraints.gridy = 0;
2821
+//                    aWindowConstraints.gridwidth = 1;
2822
+//               //     aWindowConstraints.gridheight = 3;
2823
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2824
+//                    aWindowConstraints.weightx = 0;
2825
+//                    aWindowConstraints.weighty = 1;
2826
+//                    bigThree.add(scenePanel, aWindowConstraints);
2827
+//                    aWindowConstraints.weightx = 1;
2828
+//                    aWindowConstraints.gridwidth = 3;
2829
+//               //     aWindowConstraints.gridheight = 3;
2830
+//                    aWindowConstraints.gridx = 1;
2831
+//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
2832
+//                    bigThree.add(centralPanel, aWindowConstraints);
2833
+//                    aWindowConstraints.weightx = 0;
2834
+//                    aWindowConstraints.gridx = 4;
2835
+//                    aWindowConstraints.gridwidth = 1;
2836
+//               //     aConstraints.gridheight = 3;
2837
+//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2838
+//                    bigThree.add(XYZPanel, aWindowConstraints);
2839
+//                    bigThree.validate();
2840
+//                    scenePanel.setVisible(true);
2841
+//                    centralPanel.setVisible(true);
2842
+//                    XYZPanel.setVisible(true);
2843
+                    bigThree.ClearUI();
2844
+                    bigThree.add(scenePanel);
2845
+                    bigThree.add(centralPanel);
2846
+                    bigThree.add(XYZPanel);
2847
+                    bigThree.FlushUI();
2831
2848
                 } else
2832
-		if (event.getSource() == rootButton)
2849
+		if (source == rootButton)
2833
2850
 		{
2834
2851
                     Object3D obj;
2835
2852
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -2841,7 +2858,7 @@
2841
2858
 
2842
2859
                     refreshContents(true);
2843
2860
 		} else
2844
-		if (event.getSource() == closeButton)
2861
+		if (source == closeButton)
2845
2862
 		{
2846
2863
 //System.out.println("CLOSE: " + buttonGroup.getSelection());
2847
2864
                     cRadio ab;
..
..
@@ -2862,11 +2879,11 @@
2862
2879
                     }
2863
2880
                     refreshContents(true);
2864
2881
 		} else
2865
-		if (event.getSource() == editItem || event.getSource() == editButton)
2882
+		if (source == editItem || source == editButton)
2866
2883
 		{
2867
2884
 			EditSelection(false);
2868
2885
 		} else
2869
-		if (event.getSource() == uneditButton)
2886
+		if (source == uneditButton)
2870
2887
 		{
2871
2888
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872
2889
 			{
..
..
@@ -2878,12 +2895,12 @@
2878
2895
                                 
2879
2896
                                 child.editWindow = null; // ???????????
2880
2897
 			}
2881
-			objEditor.ctrlPanel.revalidate();
2898
+			objEditor.ctrlPanel.validate();
2882
2899
 			//objEditor.jTree.clearSelection();
2883
2900
 			//objEditor.ResetSliders();
2884
2901
                     refreshContents(true);
2885
2902
 		} else
2886
-		if (event.getSource() == clearPanelButton)
2903
+		if (source == clearPanelButton)
2887
2904
 		{
2888
2905
                     assert(copy == group);
2889
2906
                     //copy.ClearUI();
..
..
@@ -2894,7 +2911,7 @@
2894
2911
                     listUI.clear();
2895
2912
                     refreshContents(true);
2896
2913
 		} else
2897
-		if (event.getSource() == allParamsButton)
2914
+		if (source == allParamsButton)
2898
2915
 		{
2899
2916
                     assert(copy == group);
2900
2917
                     
..
..
@@ -2915,19 +2932,19 @@
2915
2932
                         
2916
2933
                     refreshContents(true);
2917
2934
 		} else
2918
-		if (event.getSource() == unselectButton)
2935
+		if (source == unselectButton)
2919
2936
 		{
2920
2937
 			objEditor.jTree.clearSelection();
2921
2938
              // ?? oct 2012           GrafreeD.clipboard.clear();
2922
2939
 			objEditor.ResetSliders();
2923
2940
                     refreshContents(true);
2924
2941
 		} else
2925
-                if(event.getSource() instanceof cRadio)
2942
+                if(source instanceof cRadio)
2926
2943
 		{
2927
2944
                     group.parent = keepparent;
2928
2945
                         group.attributes = 0;
2929
2946
                     //group.editWindow = null;
2930
-                    /*cRadio*/ radio = (cRadio)event.getSource();
2947
+                    /*cRadio*/ radio = (cRadio)source;
2931
2948
                     Object3D obj = radio.GetObject();
2932
2949
                     System.out.println("Edit " + obj);
2933
2950
                     if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..
..
@@ -4086,12 +4103,12 @@
4086
4103
             System.err.println("info : " + child.GetPath());
4087
4104
 				}
4088
4105
 			}
4089
-			else
4090
-                        {
4091
-				objEditor.SetMaterial(group); // .GetMaterial());
4092
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4093
-            System.err.println("info : " + group.GetPath());
4094
-                        }
4106
+//			else
4107
+//                        {
4108
+//				objEditor.SetMaterial(group); // .GetMaterial());
4109
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4110
+//            System.err.println("info : " + group.GetPath());
4111
+//                        }
4095
4112
 			
4096
4113
                         objEditor.SetText(); // jan 2014
4097
4114