Fix info panel

Normand Briere

2019-05-01 b1585b5b2b60c4165be400636c787fae24428c6a

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