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