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