~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,
..	..	@@ -604,15 +605,15 @@
604	605	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	606	}
606	607
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	608	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	609	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
	610	+ //constraints.gridx = 0;
	611	+ //constraints.gridy = 0;
	612	+ panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
612	613	fastCB.setToolTipText("Fast mode");
613	614	fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
	615	+ //constraints.gridy += 1;
	616	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
616	617	supportCB.setToolTipText("Enabled rigging");
617	618	supportCB.addItemListener(this);
618	619
..	..	@@ -620,26 +621,26 @@
620	621	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	622	// localCB.addItemListener(this);
622	623
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	624	+ //constraints.gridy += 1;
	625	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	626	crowdCB.setToolTipText("Used for crowds");
626	627	crowdCB.addItemListener(this);
627	628
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	629	+ //constraints.gridy += 1;
	630	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	631	smoothCB.setToolTipText("Snapping delay");
631	632	smoothCB.addItemListener(this);
632	633
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	634	+ //constraints.gridy += 1;
	635	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	636	slowCB.setToolTipText("Smooth interpolation");
636	637	slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	638	+ //constraints.gridy += 1;
	639	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	640	boxCB.setToolTipText("Display bounding boxes");
640	641	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	642	+ //constraints.gridy += 1;
	643	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	644	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	645	zoomBoxCB.addItemListener(this);
645	646
..	..	@@ -650,16 +651,16 @@
650	651	if (false)
651	652	{
652	653	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	654	+ //constraints.gridy += 1;
	655	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	656	speakerCameraCB.addItemListener(this);
656	657
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	658	+ //constraints.gridy += 1;
	659	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	660	speakerFocusCB.addItemListener(this);
660	661
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	662	+ //constraints.gridy += 1;
	663	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	664	smoothfocusCB.addItemListener(this);
664	665	}
665	666
..	..	@@ -667,12 +668,12 @@
667	668	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	669	// debugCB.addItemListener(this);
669	670
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	671	+ //constraints.gridy += 1;
	672	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	673	oeilCB.addItemListener(this);
673	674
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	675	+ //constraints.gridy += 1;
	676	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	677	lookAtCB.setToolTipText("Look-at target");
677	678	lookAtCB.addItemListener(this);
678	679
..	..	@@ -1518,6 +1519,7 @@
1518	1519	//
1519	1520	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1521	{
	1522	+ Object source = event.getSource();
1521	1523	/*
1522	1524	if (event.getSource() == nameField)
1523	1525	{
..	..	@@ -1529,11 +1531,11 @@
1529	1531	}
1530	1532	else
1531	1533	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1534	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1535	{
1534	1536	ScreenFit();
1535	1537	} else
1536		- if (event.getSource() == switchItem)
	1538	+ if (source == switchItem)
1537	1539	{
1538	1540	cVector v1 = new cVector();
1539	1541	cVector v2 = new cVector();
..	..	@@ -1542,11 +1544,11 @@
1542	1544	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1545	objEditor.cameraView.repaint();
1544	1546	} else
1545		- if (event.getSource() == rectoidItem)
	1547	+ if (source == rectoidItem)
1546	1548	{
1547	1549	makeSomething(new Box());
1548	1550	} else
1549		- if (event.getSource() == particleItem)
	1551	+ if (source == particleItem)
1550	1552	{
1551	1553	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1554	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1569,9 @@
1567	1569	applyExample(particleGeom, "SMOKE");
1568	1570	makeSomething(particleGeom);
1569	1571	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1572	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1573	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1574	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1575
1574	1576	ragdoll.toParent = LA.newMatrix();
1575	1577	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1589,7 @@
1587	1589	} else
1588	1590	/*
1589	1591	*/
1590		- if (event.getSource() == heightFieldItem)
	1592	+ if (source == heightFieldItem)
1591	1593	{
1592	1594	Object3D obj = new Object3D();
1593	1595
..	..	@@ -1625,31 +1627,31 @@
1625	1627
1626	1628	makeSomething(obj);
1627	1629	} else
1628		- if (event.getSource() == gridItem)
	1630	+ if (source == gridItem)
1629	1631	{
1630	1632	makeSomething(new Grid());
1631	1633	} else
1632		- if (event.getSource() == ellipsoidItem)
	1634	+ if (source == ellipsoidItem)
1633	1635	{
1634	1636	makeSomething(new Sphere());
1635	1637	} else
1636		- if (event.getSource() == coneItem)
	1638	+ if (source == coneItem)
1637	1639	{
1638	1640	makeSomething(new Cone());
1639	1641	} else
1640		- if (event.getSource() == torusItem)
	1642	+ if (source == torusItem)
1641	1643	{
1642	1644	makeSomething(new Torus());
1643	1645	} else
1644		- if (event.getSource() == superItem)
	1646	+ if (source == superItem)
1645	1647	{
1646	1648	makeSomething(new Superellipsoid());
1647	1649	} else
1648		- if (event.getSource() == kleinItem)
	1650	+ if (source == kleinItem)
1649	1651	{
1650	1652	makeSomething(new Klein());
1651	1653	} else
1652		- if (event.getSource() == blobItem)
	1654	+ if (source == blobItem)
1653	1655	{
1654	1656	Blob blob = new Blob();
1655	1657	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1659,15 @@
1657	1659	//blob.retile();
1658	1660	makeSomething(blob);
1659	1661	} else
1660		- if (event.getSource() == latheItem)
	1662	+ if (source == latheItem)
1661	1663	{
1662	1664	makeSomething(new Lathe());
1663	1665	} else
1664		- if (event.getSource() == bezierItem)
	1666	+ if (source == bezierItem)
1665	1667	{
1666	1668	makeSomething(new BezierSurface());
1667	1669	} else
1668		- if (event.getSource() == checkerItem)
	1670	+ if (source == checkerItem)
1669	1671	{
1670	1672	/*
1671	1673	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1682,7 @@
1680	1682	*/
1681	1683	makeSomething(new Checker());
1682	1684	} else
1683		- if (event.getSource() == meshItem)
	1685	+ if (source == meshItem)
1684	1686	{
1685	1687	Object3D itemtomake = new Object3D();
1686	1688	Object3D child;
..	..	@@ -1701,35 +1703,35 @@
1701	1703	makeSomething(child);
1702	1704	}
1703	1705	} else
1704		- if (event.getSource() == springItem)
	1706	+ if (source == springItem)
1705	1707	{
1706	1708	cSpring s = new cSpring();
1707	1709	s.setup();
1708	1710	makeSomething(s);
1709	1711	} else
1710		- if (event.getSource() == flagItem)
	1712	+ if (source == flagItem)
1711	1713	{
1712	1714	cSpring s = new cFlag();
1713	1715	s.setup();
1714	1716	makeSomething(s);
1715	1717	} else
1716		- if (event.getSource() == lightItem)
	1718	+ if (source == lightItem)
1717	1719	{
1718	1720	makeSomething(new Light());
1719	1721	} else
1720		- if (event.getSource() == csgItem)
	1722	+ if (source == csgItem)
1721	1723	{
1722	1724	group(new CSG());
1723	1725	} else
1724		- if (event.getSource() == templateItem)
	1726	+ if (source == templateItem)
1725	1727	{
1726	1728	group(new cTemplate());
1727	1729	} else
1728		- if (event.getSource() == attributeItem)
	1730	+ if (source == attributeItem)
1729	1731	{
1730	1732	makeSomething(new Attribute());
1731	1733	} else
1732		- if (event.getSource() == pointflowItem)
	1734	+ if (source == pointflowItem)
1733	1735	{
1734	1736	makeSomething(new PointFlow());
1735	1737	} else
..	..	@@ -1741,7 +1743,7 @@
1741	1743	} else
1742	1744	*/
1743	1745
1744		- if (event.getSource() == superLoopItem)
	1746	+ if (source == superLoopItem)
1745	1747	{
1746	1748	Composite g = new cGroup();
1747	1749	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1765,7 @@
1763	1765
1764	1766	group(g);
1765	1767	} else
1766		- if (event.getSource() == loopItem)
	1768	+ if (source == loopItem)
1767	1769	{
1768	1770	Composite csg = new GroupLeaf();
1769	1771	csg.count = 5;
..	..	@@ -1772,7 +1774,7 @@
1772	1774	csg.addChild(child);
1773	1775	child.addChild(csg);
1774	1776	} else
1775		- if (event.getSource() == doubleItem)
	1777	+ if (source == doubleItem)
1776	1778	{
1777	1779	Composite csg = new GroupLeaf();
1778	1780	csg.count = 5;
..	..	@@ -1784,7 +1786,7 @@
1784	1786	csg.addChild(child);
1785	1787	child.addChild(csg);
1786	1788	} else
1787		- if (event.getSource() == tripleItem)
	1789	+ if (source == tripleItem)
1788	1790	{
1789	1791	Composite csg = new GroupLeaf();
1790	1792	csg.count = 4;
..	..	@@ -1800,70 +1802,70 @@
1800	1802	child.addChild(csg);
1801	1803	} else
1802	1804
1803		- if (event.getSource() == importGFDItem)
	1805	+ if (source == importGFDItem)
1804	1806	{
1805	1807	ImportGFD();
1806	1808	} else
1807		- if (event.getSource() == importVRMLX3DItem)
	1809	+ if (source == importVRMLX3DItem)
1808	1810	{
1809	1811	ImportVRMLX3D();
1810	1812	} else
1811		- if (event.getSource() == import3DSItem)
	1813	+ if (source == import3DSItem)
1812	1814	{
1813	1815	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814	1816	} else
1815		- if (event.getSource() == importOBJItem)
	1817	+ if (source == importOBJItem)
1816	1818	{
1817	1819	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818	1820	} else
1819		- if (event.getSource() == computeAOItem)
	1821	+ if (source == computeAOItem)
1820	1822	{
1821	1823	Globals.drawMode = CameraPane.OCCLUSION;
1822	1824	Globals.theRenderer.repaint();
1823	1825	} else
1824		- if (event.getSource() == recompileItem)
	1826	+ if (source == recompileItem)
1825	1827	{
1826	1828	Recompile();
1827	1829	refreshContents();
1828	1830	} else
1829		- if (event.getSource() == editScriptItem)
	1831	+ if (source == editScriptItem)
1830	1832	{
1831	1833	OpenDialog();
1832	1834	refreshContents();
1833	1835	} else
1834		- if (event.getSource() == invariantsItem)
	1836	+ if (source == invariantsItem)
1835	1837	{
1836	1838	System.out.println("Invariants:");
1837	1839	GrafreeD.grafreeD.universe.invariants();
1838	1840	} else
1839		- if (event.getSource() == memoryItem)
	1841	+ if (source == memoryItem)
1840	1842	{
1841	1843	//System.out.println("Invariants:");
1842	1844	PrintMemory();
1843	1845	} else
1844		- if (event.getSource() == pathItem)
	1846	+ if (source == pathItem)
1845	1847	{
1846	1848	PrintPath();
1847	1849	} else
1848		- if (event.getSource() == analyzeItem)
	1850	+ if (source == analyzeItem)
1849	1851	{
1850	1852	AnalyzeObject();
1851	1853	} else
1852		- if (event.getSource() == dumpItem)
	1854	+ if (source == dumpItem)
1853	1855	{
1854	1856	DumpObject();
1855	1857	} else
1856		- if (event.getSource() == screenfitButton)
	1858	+ if (source == screenfitButton)
1857	1859	{
1858	1860	//Reload(lastConverter, lastFilename, true);
1859	1861	ScreenFit();
1860	1862	} else
1861		- if (event.getSource() == screenfitpointButton)
	1863	+ if (source == screenfitpointButton)
1862	1864	{
1863	1865	//Reload(lastConverter, lastFilename, true);
1864	1866	ScreenFitPoint();
1865	1867	} else
1866		- if (event.getSource() == snapobjectButton)
	1868	+ if (source == snapobjectButton)
1867	1869	{
1868	1870	//Reload(lastConverter, lastFilename, true);
1869	1871	SnapObject();
..	..	@@ -1874,13 +1876,13 @@
1874	1876	// Recompile();
1875	1877	// refreshContents();
1876	1878	// } else
1877		- if (event.getSource() == gcButton)
	1879	+ if (source == gcButton)
1878	1880	{
1879	1881	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	1882	System.gc();
1881	1883	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	1884	} else
1883		- if (event.getSource() == editLeafItem)
	1885	+ if (source == editLeafItem)
1884	1886	{
1885	1887	Object3D obj;
1886	1888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +1896,62 @@
1894	1896	}
1895	1897	refreshContents(true);
1896	1898	} else
1897		- if (event.getSource() == openWindowItem)
	1899	+ if (source == openWindowItem)
1898	1900	{
1899	1901	EditSelection(true);
1900	1902	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1903	+ if (source == cutItem \|\| source == clearButton)
1902	1904	{
1903	1905	loadClipboard(true);
1904	1906	} else
1905		- if (event.getSource() == duplicateItem)
	1907	+ if (source == duplicateItem)
1906	1908	{
1907	1909	Object3D keep = GrafreeD.clipboard;
1908	1910	loadClipboard(false);
1909	1911	paste(false);
1910	1912	GrafreeD.clipboard = keep;
1911	1913	} else
1912		- if (event.getSource() == cloneItem)
	1914	+ if (source == cloneItem)
1913	1915	{
1914	1916	CloneSelection(false);
1915	1917	} else
1916		- if (event.getSource() == cloneSupportItem)
	1918	+ if (source == cloneSupportItem)
1917	1919	{
1918	1920	CloneSelection(true);
1919	1921	} else
1920		- if (event.getSource() == copyItem)
	1922	+ if (source == copyItem)
1921	1923	{
1922	1924	loadClipboard(false);
1923	1925	} else
1924		- if (event.getSource() == pasteItem)
	1926	+ if (source == pasteItem)
1925	1927	{
1926	1928	paste(false);
1927	1929	} else
1928		- if (event.getSource() == pasteLinkItem)
	1930	+ if (source == pasteLinkItem)
1929	1931	{
1930	1932	pasteInto(false);
1931	1933	} else
1932		- if (event.getSource() == pasteCloneItem)
	1934	+ if (source == pasteCloneItem)
1933	1935	{
1934	1936	pasteInto(true);
1935	1937	} else
1936		- if (event.getSource() == pasteExpandItem)
	1938	+ if (source == pasteExpandItem)
1937	1939	{
1938	1940	paste(true);
1939	1941	} else
1940		- if (event.getSource() == synchronizeItem)
	1942	+ if (source == synchronizeItem)
1941	1943	{
1942	1944	Overwrite(Object3D.TRANSFORM);
1943	1945	} else
1944		- if (event.getSource() == overwriteNameItem)
	1946	+ if (source == overwriteNameItem)
1945	1947	{
1946	1948	Overwrite(Object3D.NAME);
1947	1949	} else
1948		- if (event.getSource() == overwriteUVItem)
	1950	+ if (source == overwriteUVItem)
1949	1951	{
1950	1952	Overwrite(Object3D.UV);
1951	1953	} else
1952		- if (event.getSource() == overwriteMatItem)
	1954	+ if (source == overwriteMatItem)
1953	1955	{
1954	1956	/* july 2015
1955	1957	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +1971,7 @@
1969	1971
1970	1972	Overwrite(dropAttributes);
1971	1973	}
1972		- if (event.getSource() == overwriteGeoItem)
	1974	+ if (source == overwriteGeoItem)
1973	1975	{
1974	1976	Overwrite(Object3D.GEOMETRY);
1975	1977	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +1988,7 @@
1986	1988	// refreshContents();
1987	1989	// }
1988	1990	} else
1989		- if (event.getSource() == generateMeshItem)
	1991	+ if (source == generateMeshItem)
1990	1992	{
1991	1993	//if (group.selection.size() == 1)
1992	1994	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +1999,7 @@
1997	1999	ResetModel();
1998	2000	refreshContents();
1999	2001	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2002	+ if (source == extractGeometriesItem)
2001	2003	{
2002	2004	boolean one = false;
2003	2005
..	..	@@ -2024,7 +2026,7 @@
2024	2026	ResetModel();
2025	2027	refreshContents();
2026	2028	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2029	+ if (source == cloneGeometriesItem)
2028	2030	{
2029	2031	boolean one = false;
2030	2032
..	..	@@ -2050,7 +2052,7 @@
2050	2052	ResetModel();
2051	2053	refreshContents();
2052	2054	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2055	+ if (source == shareGeometriesItem)
2054	2056	{
2055	2057	boolean one = false;
2056	2058
..	..	@@ -2080,7 +2082,7 @@
2080	2082	refreshContents();
2081	2083	}
2082	2084	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2085	+ if (source == mergeGeometriesItem)
2084	2086	{
2085	2087	boolean one = false;
2086	2088
..	..	@@ -2110,7 +2112,7 @@
2110	2112	ResetModel();
2111	2113	refreshContents();
2112	2114	} else
2113		- if (event.getSource() == linkverticesItem)
	2115	+ if (source == linkverticesItem)
2114	2116	{
2115	2117	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2118	// {
..	..	@@ -2143,7 +2145,7 @@
2143	2145	refreshContents();
2144	2146	}
2145	2147	} else
2146		- if (event.getSource() == resetsupportItem)
	2148	+ if (source == resetsupportItem)
2147	2149	{
2148	2150	for (int i=0; i<group.selection.size(); i++)
2149	2151	{
..	..	@@ -2155,7 +2157,7 @@
2155	2157
2156	2158	refreshContents();
2157	2159	} else
2158		- if (event.getSource() == relinkverticesItem)
	2160	+ if (source == relinkverticesItem)
2159	2161	{
2160	2162	boolean random = CameraPane.RANDOM;
2161	2163	CameraPane.RANDOM = false; // parse all random nodes
..	..	@@ -2164,7 +2166,7 @@
2164	2166
2165	2167	refreshContents();
2166	2168	} else
2167		- if (event.getSource() == resetreferencesItem)
	2169	+ if (source == resetreferencesItem)
2168	2170	{
2169	2171	for (int i=0; i<group.selection.size(); i++)
2170	2172	{
..	..	@@ -2173,7 +2175,7 @@
2173	2175
2174	2176	refreshContents();
2175	2177	} else
2176		- if (event.getSource() == setMasterItem)
	2178	+ if (source == setMasterItem)
2177	2179	{
2178	2180	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2179	2181	{
..	..	@@ -2186,7 +2188,7 @@
2186	2188	refreshContents();
2187	2189	}
2188	2190	} else
2189		- if (event.getSource() == poseMeshItem)
	2191	+ if (source == poseMeshItem)
2190	2192	{
2191	2193	if (group.selection.size() == 1)
2192	2194	{
..	..	@@ -2205,19 +2207,19 @@
2205	2207	}
2206	2208
2207	2209	} else
2208		- if (event.getSource() == revertMeshItem)
	2210	+ if (source == revertMeshItem)
2209	2211	{
2210	2212	RevertMeshes();
2211	2213	} else
2212		- if (event.getSource() == resetMeshItem)
	2214	+ if (source == resetMeshItem)
2213	2215	{
2214	2216	ResetAll();
2215	2217	} else
2216		- if (event.getSource() == stepAllItem)
	2218	+ if (source == stepAllItem)
2217	2219	{
2218	2220	StepAll();
2219	2221	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2222	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2223	{
2222	2224	//int indices[] = jList.getSelectedIndices();
2223	2225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2227,46 @@
2225	2227
2226	2228	ClearSelection(false);
2227	2229	} else
2228		- if (event.getSource() == clearAllItem)
	2230	+ if (source == clearAllItem)
2229	2231	{
2230	2232	ClearSelection(true);
2231	2233	} else
2232		- if (event.getSource() == grabItem)
	2234	+ if (source == grabItem)
2233	2235	{
2234	2236	group(new cGroup(), true);
2235	2237	} else
2236		- if (event.getSource() == hideItem)
	2238	+ if (source == hideItem)
2237	2239	{
2238	2240	group(new HiddenObject());
2239	2241	} else
2240		- if (event.getSource() == frontItem)
	2242	+ if (source == frontItem)
2241	2243	{
2242	2244	front();
2243	2245	} else
2244		- if (event.getSource() == backItem)
	2246	+ if (source == backItem)
2245	2247	{
2246	2248	back();
2247	2249	} else
2248		- if (event.getSource() == cameraItem)
	2250	+ if (source == cameraItem)
2249	2251	{
2250	2252	makeSomething(new Camera());
2251	2253	} else
2252		- if (event.getSource() == compositeItem)
	2254	+ if (source == compositeItem)
2253	2255	{
2254	2256	group(new Composite());
2255	2257	} else
2256		- if (event.getSource() == randomItem)
	2258	+ if (source == randomItem)
2257	2259	{
2258	2260	RandomNode random = new RandomNode();
2259	2261	group(random);
2260	2262	if (random.size() > 0)
2261	2263	random.name = random.get(0).name + "Rnd";
2262	2264	} else
2263		- if (event.getSource() == physicsItem)
	2265	+ if (source == physicsItem)
2264	2266	{
2265	2267	group(new PhysicsNode());
2266	2268	} else
2267		- if (event.getSource() == frameselectorItem)
	2269	+ if (source == frameselectorItem)
2268	2270	{
2269	2271	for (int i=0; i<group.selection.size(); i++)
2270	2272	{
..	..	@@ -2276,7 +2278,7 @@
2276	2278	ResetModel();
2277	2279	refreshContents();
2278	2280	} else
2279		- if (event.getSource() == switchGeoItem)
	2281	+ if (source == switchGeoItem)
2280	2282	{
2281	2283	for (int i=0; i<group.selection.size(); i++)
2282	2284	{
..	..	@@ -2288,7 +2290,7 @@
2288	2290	ResetModel();
2289	2291	refreshContents();
2290	2292	} else
2291		- if (event.getSource() == switchTransfoItem)
	2293	+ if (source == switchTransfoItem)
2292	2294	{
2293	2295	for (int i=0; i<group.selection.size(); i++)
2294	2296	{
..	..	@@ -2300,7 +2302,7 @@
2300	2302	ResetModel();
2301	2303	refreshContents();
2302	2304	} else
2303		- if (event.getSource() == morphItem)
	2305	+ if (source == morphItem)
2304	2306	{
2305	2307	for (int i=0; i<group.selection.size(); i++)
2306	2308	{
..	..	@@ -2312,7 +2314,7 @@
2312	2314	ResetModel();
2313	2315	refreshContents();
2314	2316	} else
2315		- if (event.getSource() == scriptNodeItem)
	2317	+ if (source == scriptNodeItem)
2316	2318	{
2317	2319	boolean atleastone = false;
2318	2320
..	..	@@ -2351,31 +2353,31 @@
2351	2353	}
2352	2354	}
2353	2355	} else
2354		- if (event.getSource() == linkerItem)
	2356	+ if (source == linkerItem)
2355	2357	{
2356	2358	group(new cLinker());
2357	2359	} else
2358		- if (event.getSource() == textureItem)
	2360	+ if (source == textureItem)
2359	2361	{
2360	2362	group(new TextureNode());
2361	2363	} else
2362		- if (event.getSource() == billboardItem)
	2364	+ if (source == billboardItem)
2363	2365	{
2364	2366	group(new BillboardNode());
2365	2367	} else
2366		- if (event.getSource() == shadowXItem)
	2368	+ if (source == shadowXItem)
2367	2369	{
2368	2370	CastShadow(0);
2369	2371	} else
2370		- if (event.getSource() == shadowYItem)
	2372	+ if (source == shadowYItem)
2371	2373	{
2372	2374	CastShadow(1);
2373	2375	} else
2374		- if (event.getSource() == shadowZItem)
	2376	+ if (source == shadowZItem)
2375	2377	{
2376	2378	CastShadow(2);
2377	2379	} else
2378		- if (event.getSource() == ungroupItem)
	2380	+ if (source == ungroupItem)
2379	2381	{
2380	2382	//ungroup();
2381	2383	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2389,179 @@
2387	2389
2388	2390	refreshContents();
2389	2391	} else
2390		- if (event.getSource() == genUVItem)
	2392	+ if (source == genUVItem)
2391	2393	{
2392	2394	GenUV();
2393	2395	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2396	+ if (source == genNormalsCADItem)
2395	2397	{
2396	2398	GenNormals(true);
2397	2399	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2400	+ if (source == genNormalsMESHItem)
2399	2401	{
2400	2402	GenNormals(true); // TODO
2401	2403	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2404	+ if (source == genNormalsORGANItem)
2403	2405	{
2404	2406	GenNormals(false);
2405	2407	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2408	+ if (source == genNormalsMINEItem)
2407	2409	{
2408	2410	GenNormalsMINE();
2409	2411	} else
2410		- if (event.getSource() == stripifyItem)
	2412	+ if (source == stripifyItem)
2411	2413	{
2412	2414	Stripify();
2413	2415	} else
2414		- if (event.getSource() == unstripifyItem)
	2416	+ if (source == unstripifyItem)
2415	2417	{
2416	2418	Unstripify();
2417	2419	} else
2418		- if (event.getSource() == trimItem)
	2420	+ if (source == trimItem)
2419	2421	{
2420	2422	Trim();
2421	2423	} else
2422		- if (event.getSource() == untrimItem)
	2424	+ if (source == untrimItem)
2423	2425	{
2424	2426	Untrim();
2425	2427	} else
2426		- if (event.getSource() == clearColorsItem)
	2428	+ if (source == clearColorsItem)
2427	2429	{
2428	2430	ClearColors();
2429	2431	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2432	+ if (source == clearMaterialsItem)
2431	2433	{
2432	2434	ClearMaterials();
2433	2435	} else
2434		- if (event.getSource() == liveleavesItem)
	2436	+ if (source == liveleavesItem)
2435	2437	{
2436	2438	LiveLeaves(true);
2437	2439	} else
2438		- if (event.getSource() == unliveleavesItem)
	2440	+ if (source == unliveleavesItem)
2439	2441	{
2440	2442	LiveLeaves(false);
2441	2443	} else
2442		- if (event.getSource() == supportleavesItem)
	2444	+ if (source == supportleavesItem)
2443	2445	{
2444	2446	SupportLeaves(true);
2445	2447	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2448	+ if (source == unsupportleavesItem)
2447	2449	{
2448	2450	SupportLeaves(false);
2449	2451	} else
2450		- if (event.getSource() == hideleavesItem)
	2452	+ if (source == hideleavesItem)
2451	2453	{
2452	2454	HideLeaves(true);
2453	2455	} else
2454		- if (event.getSource() == showleavesItem)
	2456	+ if (source == showleavesItem)
2455	2457	{
2456	2458	HideLeaves(false);
2457	2459	} else
2458		- if (event.getSource() == markleavesItem)
	2460	+ if (source == markleavesItem)
2459	2461	{
2460	2462	MarkLeaves(true);
2461	2463	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2464	+ if (source == unmarkleavesItem)
2463	2465	{
2464	2466	MarkLeaves(false);
2465	2467	} else
2466		- if (event.getSource() == flipVItem)
	2468	+ if (source == flipVItem)
2467	2469	{
2468	2470	FlipV(true);
2469	2471	} else
2470		- if (event.getSource() == unflipVItem)
	2472	+ if (source == unflipVItem)
2471	2473	{
2472	2474	FlipV(false);
2473	2475	} else
2474		- if (event.getSource() == lowTexturesItem)
	2476	+ if (source == lowTexturesItem)
2475	2477	{
2476	2478	SetTexRes(0);
2477	2479	} else
2478		- if (event.getSource() == normalTexturesItem)
	2480	+ if (source == normalTexturesItem)
2479	2481	{
2480	2482	SetTexRes(1);
2481	2483	} else
2482		- if (event.getSource() == highTexturesItem)
	2484	+ if (source == highTexturesItem)
2483	2485	{
2484	2486	SetTexRes(2);
2485	2487	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2488	+ if (source == veryhighTexturesItem)
2487	2489	{
2488	2490	SetTexRes(3);
2489	2491	} else
2490		- if (event.getSource() == maxTexturesItem)
	2492	+ if (source == maxTexturesItem)
2491	2493	{
2492	2494	SetTexRes(4);
2493	2495	} else
2494		- if (event.getSource() == panoTexturesItem)
	2496	+ if (source == panoTexturesItem)
2495	2497	{
2496	2498	SetTexRes(5);
2497	2499	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2500	+ if (source == reverseNormalsItem)
2499	2501	{
2500	2502	ReverseNormals();
2501	2503	} else
2502		- if (event.getSource() == parseverticesItem)
	2504	+ if (source == parseverticesItem)
2503	2505	{
2504	2506	ParseVertices();
2505	2507	} else
2506		- if (event.getSource() == textureFieldItem)
	2508	+ if (source == textureFieldItem)
2507	2509	{
2508	2510	TextureVertices();
2509	2511	} else
2510		- if (event.getSource() == alignItem)
	2512	+ if (source == alignItem)
2511	2513	{
2512	2514	Align();
2513	2515	} else
2514		- if (event.getSource() == mirrorItem)
	2516	+ if (source == mirrorItem)
2515	2517	{
2516	2518	MirrorPoses();
2517	2519	} else
2518		- if (event.getSource() == reduceMorphItem)
	2520	+ if (source == reduceMorphItem)
2519	2521	{
2520	2522	MeshReduction(false);
2521	2523	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2524	+ if (source == reduce34MorphItem)
2523	2525	{
2524	2526	MeshReduction(true);
2525	2527	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2528	+ if (source == reverseTrianglesItem)
2527	2529	{
2528	2530	ReverseTriangles();
2529	2531	} else
2530		- if (event.getSource() == reduceMeshItem)
	2532	+ if (source == reduceMeshItem)
2531	2533	{
2532	2534	ReduceMesh(false);
2533	2535	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2536	+ if (source == reduce34MeshItem)
2535	2537	{
2536	2538	ReduceMesh(true);
2537	2539	} else
2538		- if (event.getSource() == increaseMeshItem)
	2540	+ if (source == increaseMeshItem)
2539	2541	{
2540	2542	IncreaseMesh();
2541	2543	} else
2542		- if (event.getSource() == clipMeshItem)
	2544	+ if (source == clipMeshItem)
2543	2545	{
2544	2546	ClipMesh();
2545	2547	} else
2546		- if (event.getSource() == smoothMeshItem)
	2548	+ if (source == smoothMeshItem)
2547	2549	{
2548	2550	SmoothMesh();
2549	2551	} else
2550		- if (event.getSource() == transformgeometryItem)
	2552	+ if (source == transformgeometryItem)
2551	2553	{
2552	2554	TransformGeometry();
2553	2555	} else
2554		- if (event.getSource() == resetTransformItem)
	2556	+ if (source == resetTransformItem)
2555	2557	{
2556	2558	ResetTransform();
2557	2559	} else
2558		- if (event.getSource() == resetCentroidItem)
	2560	+ if (source == resetCentroidItem)
2559	2561	{
2560	2562	ResetCentroid();
2561	2563	} else
2562		- if (event.getSource() == resetParentItem)
	2564	+ if (source == resetParentItem)
2563	2565	{
2564	2566	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2567	{
..	..	@@ -2569,7 +2571,7 @@
2569	2571
2570	2572	refreshContents();
2571	2573	} else
2572		- if (event.getSource() == repairParentItem)
	2574	+ if (source == repairParentItem)
2573	2575	{
2574	2576	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2577	{
..	..	@@ -2583,7 +2585,7 @@
2583	2585
2584	2586	refreshContents();
2585	2587	} else
2586		- if (event.getSource() == repairShadowItem)
	2588	+ if (source == repairShadowItem)
2587	2589	{
2588	2590	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2591	{
..	..	@@ -2597,7 +2599,7 @@
2597	2599
2598	2600	refreshContents();
2599	2601	} else
2600		- if (event.getSource() == sortbysizeItem)
	2602	+ if (source == sortbysizeItem)
2601	2603	{
2602	2604	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2605	{
..	..	@@ -2609,7 +2611,7 @@
2609	2611	ResetModel();
2610	2612	refreshContents();
2611	2613	} else
2612		- if (event.getSource() == sortbynameItem)
	2614	+ if (source == sortbynameItem)
2613	2615	{
2614	2616	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2617	{
..	..	@@ -2621,7 +2623,7 @@
2621	2623	ResetModel();
2622	2624	refreshContents();
2623	2625	} else
2624		- if (event.getSource() == attachPigmentItem)
	2626	+ if (source == attachPigmentItem)
2625	2627	{
2626	2628	String texture = GetFile("Attach pigment");
2627	2629	Object3D obj;
..	..	@@ -2633,7 +2635,7 @@
2633	2635
2634	2636	refreshContents();
2635	2637	} else
2636		- if (event.getSource() == detachPigmentItem)
	2638	+ if (source == detachPigmentItem)
2637	2639	{
2638	2640	Object3D obj;
2639	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2646,7 @@
2644	2646
2645	2647	refreshContents();
2646	2648	} else
2647		- if (event.getSource() == attachBumpItem)
	2649	+ if (source == attachBumpItem)
2648	2650	{
2649	2651	String texture = GetFile("Attach bump");
2650	2652	Object3D obj;
..	..	@@ -2656,7 +2658,7 @@
2656	2658
2657	2659	refreshContents();
2658	2660	} else
2659		- if (event.getSource() == detachBumpItem)
	2661	+ if (source == detachBumpItem)
2660	2662	{
2661	2663	Object3D obj;
2662	2664	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2669,7 @@
2667	2669
2668	2670	refreshContents();
2669	2671	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2672	+ if (source == pigmentBumpItem)
2671	2673	{
2672	2674	Object3D obj;
2673	2675	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2680,195 @@
2678	2680
2679	2681	refreshContents();
2680	2682	} else
2681		- if (event.getSource() == flashSelectionButton)
	2683	+ if (source == flashSelectionButton)
2682	2684	{
2683	2685	CameraPane.flash = true;
2684	2686	refreshContents();
2685	2687	} else
2686		- if (event.getSource() == oneButton)
	2688	+ if (source == oneButton)
2687	2689	{
2688	2690	} else
2689		- if (event.getSource() == twoButton)
	2691	+ if (source == twoButton)
2690	2692	{
2691	2693	radio.layout = twoButton;
2692	2694	// bug
2693	2695	//gridPanel.setDividerLocation(1.0);
2694	2696	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2697	+// bigThree.remove(scenePanel);
	2698	+// bigThree.remove(centralPanel);
	2699	+// bigThree.remove(XYZPanel);
	2700	+// aWindowConstraints.gridx = 0;
	2701	+// aWindowConstraints.gridy = 0;
	2702	+// aWindowConstraints.gridwidth = 1;
	2703	+// // aConstraints.gridheight = 3;
	2704	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2705	+// aWindowConstraints.weightx = 0;
	2706	+// aWindowConstraints.weighty = 1;
	2707	+// //bigThree.add(jtp, aWindowConstraints);
	2708	+// aWindowConstraints.weightx = 1;
	2709	+// aWindowConstraints.gridwidth = 3;
	2710	+// // aConstraints.gridheight = 3;
	2711	+// aWindowConstraints.gridx = 1;
	2712	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2713	+// bigThree.add(centralPanel, aWindowConstraints);
	2714	+// aWindowConstraints.weightx = 0;
	2715	+// aWindowConstraints.gridx = 4;
	2716	+// aWindowConstraints.gridwidth = 1;
	2717	+// // aConstraints.gridheight = 3;
	2718	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2719	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2720	+// scenePanel.setVisible(false);
	2721	+// centralPanel.setVisible(true);
	2722	+// XYZPanel.setVisible(false);
	2723	+ bigThree.ClearUI();
	2724	+ bigThree.add(centralPanel);
	2725	+ bigThree.FlushUI();
2719	2726	} else
2720		- if (event.getSource() == threeButton)
	2727	+ if (source == threeButton)
2721	2728	{
2722	2729	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	2730	+
	2731	+// bigThree.remove(scenePanel);
	2732	+// bigThree.remove(centralPanel);
	2733	+// bigThree.remove(XYZPanel);
	2734	+// aWindowConstraints.gridx = 0;
	2735	+// aWindowConstraints.gridy = 0;
	2736	+// aWindowConstraints.gridwidth = 1;
	2737	+// // aConstraints.gridheight = 3;
	2738	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2739	+// aWindowConstraints.weightx = 0;
	2740	+// aWindowConstraints.weighty = 1;
	2741	+// //bigThree.add(jtp, aWindowConstraints);
	2742	+// aWindowConstraints.weightx = 1;
	2743	+// aWindowConstraints.gridwidth = 3;
	2744	+// // aConstraints.gridheight = 3;
	2745	+// aWindowConstraints.gridx = 1;
	2746	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2747	+// bigThree.add(centralPanel, aWindowConstraints);
	2748	+// aWindowConstraints.weightx = 0;
	2749	+// aWindowConstraints.gridx = 4;
	2750	+// aWindowConstraints.gridwidth = 1;
	2751	+// // aConstraints.gridheight = 3;
	2752	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2753	+// bigThree.add(XYZPanel, aWindowConstraints);
	2754	+// bigThree.validate();
	2755	+// scenePanel.setVisible(false);
	2756	+// centralPanel.setVisible(true);
	2757	+// XYZPanel.setVisible(true);
	2758	+ bigThree.ClearUI();
	2759	+ bigThree.add(centralPanel);
	2760	+ bigThree.add(XYZPanel);
	2761	+ bigThree.FlushUI();
2747	2762	} else
2748		- if (event.getSource() == fourButton)
	2763	+ if (source == fourButton)
2749	2764	{
2750	2765	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	2766	+
	2767	+// bigThree.remove(scenePanel);
	2768	+// bigThree.remove(centralPanel);
	2769	+// bigThree.remove(XYZPanel);
	2770	+// aWindowConstraints.gridx = 0;
	2771	+// aWindowConstraints.gridy = 0;
	2772	+// aWindowConstraints.gridwidth = 1;
	2773	+// // aWindowConstraints.gridheight = 3;
	2774	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2775	+// aWindowConstraints.weightx = 1;
	2776	+// aWindowConstraints.weighty = 1;
	2777	+// bigThree.add(scenePanel, aWindowConstraints);
	2778	+// aWindowConstraints.weightx = 1;
	2779	+// aWindowConstraints.gridwidth = 3;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.gridx = 1;
	2782	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2783	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.gridx = 4;
	2786	+// aWindowConstraints.gridwidth = 1;
	2787	+// // aWindowConstraints.gridheight = 3;
	2788	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2789	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2790	+// bigThree.validate();
	2791	+// scenePanel.setVisible(true);
	2792	+// centralPanel.setVisible(false);
	2793	+// XYZPanel.setVisible(false);
	2794	+ bigThree.ClearUI();
	2795	+ bigThree.add(scenePanel);
	2796	+ bigThree.FlushUI();
2775	2797	} else
2776		- if (event.getSource() == sixButton)
	2798	+ if (source == sixButton)
2777	2799	{
2778	2800	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	2801	+
	2802	+// bigThree.remove(scenePanel);
	2803	+// bigThree.remove(centralPanel);
	2804	+// bigThree.remove(XYZPanel);
	2805	+// aWindowConstraints.gridx = 0;
	2806	+// aWindowConstraints.gridy = 0;
	2807	+// aWindowConstraints.gridwidth = 1;
	2808	+// // aConstraints.gridheight = 3;
	2809	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2810	+// aWindowConstraints.weightx = 0;
	2811	+// aWindowConstraints.weighty = 1;
	2812	+// bigThree.add(scenePanel, aWindowConstraints);
	2813	+// aWindowConstraints.weightx = 1;
	2814	+// aWindowConstraints.gridwidth = 3;
	2815	+// // aWindowConstraints.gridheight = 3;
	2816	+// aWindowConstraints.gridx = 1;
	2817	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2818	+// bigThree.add(centralPanel, aWindowConstraints);
	2819	+// aWindowConstraints.weightx = 0;
	2820	+// aWindowConstraints.gridx = 4;
	2821	+// aWindowConstraints.gridwidth = 1;
	2822	+// // aWindowConstraints.gridheight = 3;
	2823	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2824	+// //bigThree.add(XYZPanel, aConstraints);
	2825	+// bigThree.validate();
	2826	+// scenePanel.setVisible(true);
	2827	+// centralPanel.setVisible(true);
	2828	+// XYZPanel.setVisible(false);
	2829	+ bigThree.ClearUI();
	2830	+ bigThree.add(scenePanel);
	2831	+ bigThree.add(centralPanel);
	2832	+ bigThree.FlushUI();
2803	2833	} else
2804		- if (event.getSource() == sevenButton)
	2834	+ if (source == sevenButton)
2805	2835	{
2806	2836	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	2837	+
	2838	+// bigThree.remove(scenePanel);
	2839	+// bigThree.remove(centralPanel);
	2840	+// bigThree.remove(XYZPanel);
	2841	+// aWindowConstraints.gridx = 0;
	2842	+// aWindowConstraints.gridy = 0;
	2843	+// aWindowConstraints.gridwidth = 1;
	2844	+// // aWindowConstraints.gridheight = 3;
	2845	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2846	+// aWindowConstraints.weightx = 0;
	2847	+// aWindowConstraints.weighty = 1;
	2848	+// bigThree.add(scenePanel, aWindowConstraints);
	2849	+// aWindowConstraints.weightx = 1;
	2850	+// aWindowConstraints.gridwidth = 3;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.gridx = 1;
	2853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2854	+// bigThree.add(centralPanel, aWindowConstraints);
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.gridx = 4;
	2857	+// aWindowConstraints.gridwidth = 1;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2860	+// bigThree.add(XYZPanel, aWindowConstraints);
	2861	+// bigThree.validate();
	2862	+// scenePanel.setVisible(true);
	2863	+// centralPanel.setVisible(true);
	2864	+// XYZPanel.setVisible(true);
	2865	+ bigThree.ClearUI();
	2866	+ bigThree.add(scenePanel);
	2867	+ bigThree.add(centralPanel);
	2868	+ bigThree.add(XYZPanel);
	2869	+ bigThree.FlushUI();
2831	2870	} else
2832		- if (event.getSource() == rootButton)
	2871	+ if (source == rootButton)
2833	2872	{
2834	2873	Object3D obj;
2835	2874	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2841,7 +2880,7 @@
2841	2880
2842	2881	refreshContents(true);
2843	2882	} else
2844		- if (event.getSource() == closeButton)
	2883	+ if (source == closeButton)
2845	2884	{
2846	2885	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	2886	cRadio ab;
..	..	@@ -2862,11 +2901,11 @@
2862	2901	}
2863	2902	refreshContents(true);
2864	2903	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2904	+ if (source == editItem \|\| source == editButton)
2866	2905	{
2867	2906	EditSelection(false);
2868	2907	} else
2869		- if (event.getSource() == uneditButton)
	2908	+ if (source == uneditButton)
2870	2909	{
2871	2910	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	2911	{
..	..	@@ -2878,12 +2917,12 @@
2878	2917
2879	2918	child.editWindow = null; // ???????????
2880	2919	}
2881		- objEditor.ctrlPanel.revalidate();
	2920	+ objEditor.ctrlPanel.validate();
2882	2921	//objEditor.jTree.clearSelection();
2883	2922	//objEditor.ResetSliders();
2884	2923	refreshContents(true);
2885	2924	} else
2886		- if (event.getSource() == clearPanelButton)
	2925	+ if (source == clearPanelButton)
2887	2926	{
2888	2927	assert(copy == group);
2889	2928	//copy.ClearUI();
..	..	@@ -2894,7 +2933,7 @@
2894	2933	listUI.clear();
2895	2934	refreshContents(true);
2896	2935	} else
2897		- if (event.getSource() == allParamsButton)
	2936	+ if (source == allParamsButton)
2898	2937	{
2899	2938	assert(copy == group);
2900	2939
..	..	@@ -2915,19 +2954,19 @@
2915	2954
2916	2955	refreshContents(true);
2917	2956	} else
2918		- if (event.getSource() == unselectButton)
	2957	+ if (source == unselectButton)
2919	2958	{
2920	2959	objEditor.jTree.clearSelection();
2921	2960	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	2961	objEditor.ResetSliders();
2923	2962	refreshContents(true);
2924	2963	} else
2925		- if(event.getSource() instanceof cRadio)
	2964	+ if(source instanceof cRadio)
2926	2965	{
2927	2966	group.parent = keepparent;
2928	2967	group.attributes = 0;
2929	2968	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	2969	+ /cRadio/ radio = (cRadio)source;
2931	2970	Object3D obj = radio.GetObject();
2932	2971	System.out.println("Edit " + obj);
2933	2972	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)