~nbriere/GrafreeD.git - Noware Git Repository

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