From: Bill Kuker <bkuker@billkuker.com>
Date: Wed, 24 Nov 2010 18:22:49 +0000 (+0000)
Subject: Addign build file
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ae499b0c7a517c280058d5851c36a63c9b26ccf5;p=sw%2Fmotorsim

Addign build file
Removed GUI references from core
---

diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..78009ba
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0"?>
+
+<project name="MotorSim" basedir=".">
+	<property name="name" value="MotorSim" />
+
+	<property name="findbugs.root" value="C:\src\Libs\findbugs-1.3.9" />
+
+	<property name="core.src.dir" value="src" />
+	<property name="test.src.dir" value="test" />
+	<property name="gui.src.dir" value="test" />
+	
+	<property name="core.build.dir" value=".classes" />
+	<property name="test.build.dir" value=".tests" />
+	<property name="gui.build.dir" value=".tests" />
+	
+	<property name="dist.dir" value="dist" />
+	<property name="temp.dir" value=".temp" />
+
+	<path id="findbugs.classpath">
+		<fileset dir="${findbugs.root}/lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+	<path id="core.classpath">
+		<fileset dir="lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<path id="gui.classpath">
+		<fileset dir="lib">
+			<include name="*.jar" />
+		</fileset>
+		<fileset dir="dist">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+	<path id="test.classpath">
+		<path refid="core.classpath" />
+		<path refid="gui.classpath" />
+		<fileset dir="${dist.dir}">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+
+	<target name="clean" description="Clean output dirs (build, docs, dist)">
+		<delete dir="${core.build.dir}" />
+		<delete dir="${gui.build.dir}" />
+		<delete dir="${test.build.dir}" />
+		<delete dir="${dist.dir}" />
+		<delete dir="${temp.dir}" />
+		<delete file="${name}-findbugs.xml" />
+		<delete file="TEST-UnitTests.xml" />
+	</target>
+
+	<target name="core.build" description="Compile main source tree java files into class files.">
+		<mkdir dir="${core.build.dir}" />
+		<javac destdir="${core.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+			<src path="${core.src.dir}" />
+			<classpath refid="core.classpath" />
+		</javac>
+	</target>
+	
+	<target name="gui.build" depends='core.jarfile' description="Compile main source tree java files into class files.">
+		<mkdir dir="${gui.build.dir}" />
+		<javac destdir="${gui.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+			<src path="${gui.src.dir}" />
+			<classpath refid="gui.classpath" />
+		</javac>
+	</target>
+		
+	
+	<target name="core.jarfile" depends="core.build" description="Build the jar file">
+		<mkdir dir="${dist.dir}" />
+		<jar jarfile="${dist.dir}/${name}-API.jar" compress="true" basedir="${cure.build.dir}" />
+	</target>
+	
+	<target name="gui.jarfile" depends="gui.build" description="Build the jar file">
+		<mkdir dir="${dist.dir}" />
+		<jar jarfile="${dist.dir}/${name}-API.jar" compress="true" basedir="${cure.build.dir}" />
+	</target>
+
+<!--
+
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
+		<classpath>
+			<fileset dir="ant/">
+				<include name="*.jar" />
+			</fileset>
+		</classpath>
+	</taskdef>
+
+	<target name="dist" depends="Fat-Jar">
+		<delete quiet='true'>
+			<fileset dir="${dist.dir}/installers" includes="*"/>
+		</delete>
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${dist.dir}/installers" />
+
+
+		<ant dir="RPM" target="dist" inheritAll='false' />
+		<ant target="One-Jar"/>
+		<trycatch>
+			<try>
+				<ant dir="MSI" target="dist" inheritAll='false' />
+			</try>
+			<catch><echo>Skipping MSI</echo></catch>
+		</trycatch>
+	</target>
+
+
+
+
+	<taskdef name="one-jar" classname="com.simontuffs.onejar.ant.OneJarTask">
+		<classpath>
+			<fileset dir="ant">
+				<include name="*.jar" />
+			</fileset>
+		</classpath>
+	</taskdef>
+	<target name='One-Jar' depends='jarfile-main, jarfile-api'>
+		<property file=".classes/MarProbe.version.properties" />
+		<property name="destfilename" value="${name}-${version}.jar"/>
+		<one-jar destfile="${dist.dir}/installers/${destfilename}" manifest="manifest.mf">
+			<main>
+				<fileset dir="${src.dir}">
+					<include name="log4j.properties" />
+					<include name="martello.pem" />
+					<include name="MartelloKey.der" />
+				</fileset>
+			</main>
+			<lib>
+				<fileset dir="${dist.dir}">
+					<include name="${name}.jar" />
+					<include name="${name}-API.jar" />
+				</fileset>
+				<fileset dir="lib/build">
+					<include name="*.jar" />
+				</fileset>
+				<fileset dir="lib/runtime">
+					<include name="*.jar" />
+				</fileset>
+			</lib>
+			<fileset dir="${build.dir}">
+				<include name="com/martellotech/Diagnostic*.class" />
+			</fileset>
+		</one-jar>
+	</target>
+
+
+	<target name="Fat-Jar" depends="jarfile-main, jarfile-api">
+		<delete dir="${temp.dir}" quiet="true" />
+		<unjar dest="${temp.dir}">
+			<fileset dir="lib/build">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="lib/runtime">
+				<include name="**/*.jar" />
+			</fileset>
+		</unjar>
+		<unjar dest="${temp.dir}">
+			<fileset dir="lib/build">
+				<include name="**/Martello-*.jar" />
+			</fileset>
+			<fileset dir="lib/runtime">
+				<include name="**/Martello-*.jar" />
+			</fileset>
+		</unjar>
+		<unjar dest="${temp.dir}">
+			<fileset dir="${dist.dir}">
+					<include name="${name}.jar" />
+					<include name="${name}-API.jar" />
+			</fileset>
+		</unjar>
+		<delete dir='${temp.dir}/META-INF'/>
+		<jar jarfile="${dist.dir}/${name}-Fat.jar" basedir="${temp.dir}" includes="**/*.*" update="false" compress="true">
+			<fileset dir="${src.dir}">
+				<include name="log4j.properties" />
+				<include name="martello.pem" />
+				<include name="MartelloKey.der" />
+			</fileset>
+		</jar>
+	</target>
+	
+	
+
+	<target name="findbugs" depends="jarfile-main, jarfile-api">
+
+		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs.classpath" />
+
+		<findbugs home="${findbugs.root}" output="xml" outputFile="${name}-findbugs.xml">
+			<auxClasspath refid="test-classpath" />
+			<sourcePath path="${src.dir}" />
+			<class location="${dist.dir}/${name}.jar" />
+		</findbugs>
+	</target>
+
+
+	<target name="test" depends="dist">
+		<mkdir dir="${test.build.dir}" />
+		<javac destdir="${test.build.dir}" source="1.5" target="1.5" debug="true" deprecation="false" optimize="false" failonerror="true">
+			<src path="${test.src.dir}" />
+			<classpath refid="test-classpath" />
+		</javac>
+		<copy todir="${test.build.dir}">
+			<fileset dir="${test.src.dir}">
+				<include name="**/*.xml" />
+				<include name="**/*.properties" />
+			</fileset>
+		</copy>
+		<mkdir dir="${dist.dir}" />
+		<jar jarfile="${dist.dir}/${name}-tests.jar" compress="true" basedir="${test.build.dir}" />
+		<junit printsummary="yes" fork="yes" haltonfailure="no" haltonerror="false" showoutput="yes">
+
+
+			<classpath refid="test-classpath" />
+
+
+			<formatter type="xml" />
+
+
+			<test name="UnitTests" />
+		</junit>
+
+	</target>	-->
+
+</project>
diff --git a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
index a0bd25f..4430d99 100644
--- a/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
+++ b/src/com/billkuker/rocketry/motorsim/GraphSimplifier.java
@@ -11,18 +11,10 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
 
-import javax.measure.quantity.Area;
-import javax.measure.quantity.Length;
 import javax.measure.quantity.Quantity;
-import javax.measure.unit.SI;
-import javax.swing.JFrame;
-import javax.swing.JSplitPane;
 
 import org.jscience.physics.amount.Amount;
 
-import com.billkuker.rocketry.motorsim.grain.EndBurner;
-import com.billkuker.rocketry.motorsim.visual.Chart;
-
 public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
 	Method f;
 	
@@ -123,48 +115,6 @@ public class GraphSimplifier<X extends Quantity, Y extends Quantity> {
 				break;
 		}
 		
-		
-
-	}
-
-	public static void main(String args[]) throws Exception {
-		/*
-		CoredCylindricalGrain g = new CoredCylindricalGrain();
-		g.setLength(Amount.valueOf(70, SI.MILLIMETER));
-		g.setOD(Amount.valueOf(30, SI.MILLIMETER));
-		g.setID(Amount.valueOf(10, SI.MILLIMETER));
-		*/
-		EndBurner g = new EndBurner();
-		g.setLength(Amount.valueOf(70, SI.MILLIMETER));
-		g.setOD(Amount.valueOf(30, SI.MILLIMETER));
-		g.setPuntDepth(Amount.valueOf(10, SI.MILLIMETER));
-		g.setPuntDiameter(Amount.valueOf(10, SI.MILLIMETER));
-		
-		JFrame f = new JFrame();
-		f.setSize(1024, 768);
-		f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		JSplitPane jsp = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
-		f.add(jsp);
-
-		Chart<Length, Area> c = new Chart<Length, Area>(SI.MILLIMETER,
-				SI.MILLIMETER.pow(2).asType(Area.class), g, "surfaceArea");
-		c.setDomain(c.new IntervalDomain(Amount.valueOf(0, SI.CENTIMETER), g
-				.webThickness()));
-		jsp.setTopComponent(c);
-
-		GraphSimplifier<Length, Area> gs = new GraphSimplifier(g,
-				"surfaceArea", c.new IntervalDomain(Amount.valueOf(0,
-						SI.CENTIMETER), g.webThickness()).iterator());
-
-		Chart<Length, Area> d = new Chart<Length, Area>(SI.MILLIMETER,
-				SI.MILLIMETER.pow(2).asType(Area.class), gs, "value");
-		d.setDomain(gs.getDomain());
-		jsp.setBottomComponent(d);
-		
-
-		
-		f.setVisible(true);
-		jsp.setDividerLocation(.5);
-		jsp.revalidate();
 	}
+	
 }
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNDX.java b/src/com/billkuker/rocketry/motorsim/fuel/KNDX.java
index cf1bc0a..a095677 100644
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNDX.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNDX.java
@@ -1,15 +1,12 @@
 package com.billkuker.rocketry.motorsim.fuel;
 
-import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Velocity;
 import javax.measure.quantity.VolumetricDensity;
 import javax.measure.unit.SI;
 
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;
-import com.billkuker.rocketry.motorsim.visual.Chart;
 
 public class KNDX extends PiecewiseSaintRobertFuel {
 
@@ -47,24 +44,6 @@ public class KNDX extends PiecewiseSaintRobertFuel {
 			}
 		};
 	}
-	
-	public static void main( String args[]) throws Exception{
-		KNDX f = new KNDX();
-		
-		Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(
-				SI.MEGA(SI.PASCAL),
-				SI.METERS_PER_SECOND,
-				f,
-				"burnRate");
-		burnRate.setDomain(
-				burnRate.new IntervalDomain(
-						Amount.valueOf(0, SI.MEGA(SI.PASCAL)),
-						Amount.valueOf(11, SI.MEGA(SI.PASCAL)),
-						20
-						));
-		
-		burnRate.show();
-	}
 
 	public double getCombustionEfficiency() {
 		return .97;
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNER.java b/src/com/billkuker/rocketry/motorsim/fuel/KNER.java
index a80a485..624a299 100644
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNER.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNER.java
@@ -2,14 +2,12 @@ package com.billkuker.rocketry.motorsim.fuel;
 
 import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Velocity;
 import javax.measure.quantity.VolumetricDensity;
 import javax.measure.unit.SI;
 
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;
-import com.billkuker.rocketry.motorsim.visual.Chart;
 
 public class KNER extends SaintRobertFuel {
 
@@ -53,24 +51,6 @@ public class KNER extends SaintRobertFuel {
 			}
 		};
 	}
-	
-	public static void main( String args[]) throws Exception{
-		KNER f = new KNER();
-		
-		Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(
-				SI.MEGA(SI.PASCAL),
-				SI.METERS_PER_SECOND,
-				f,
-				"burnRate");
-		burnRate.setDomain(
-				burnRate.new IntervalDomain(
-						Amount.valueOf(0, SI.MEGA(SI.PASCAL)),
-						Amount.valueOf(11, SI.MEGA(SI.PASCAL)),
-						20
-						));
-		
-		burnRate.show();
-	}
 
 	public double getCombustionEfficiency() {
 		return .97;
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
index a1a323b..5ac01a6 100644
--- a/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/KNSB.java
@@ -1,15 +1,12 @@
 package com.billkuker.rocketry.motorsim.fuel;
 
-import javax.measure.quantity.Pressure;
 import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Velocity;
 import javax.measure.quantity.VolumetricDensity;
 import javax.measure.unit.SI;
 
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;
-import com.billkuker.rocketry.motorsim.visual.Chart;
 
 public class KNSB extends PiecewiseSaintRobertFuel {
 
@@ -47,24 +44,6 @@ public class KNSB extends PiecewiseSaintRobertFuel {
 			}
 		};
 	}
-	
-	public static void main( String args[]) throws Exception{
-		KNSB f = new KNSB();
-		
-		Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(
-				SI.MEGA(SI.PASCAL),
-				SI.METERS_PER_SECOND,
-				f,
-				"burnRate");
-		burnRate.setDomain(
-				burnRate.new IntervalDomain(
-						Amount.valueOf(0, SI.MEGA(SI.PASCAL)),
-						Amount.valueOf(11, SI.MEGA(SI.PASCAL)),
-						20
-						));
-		
-		burnRate.show();
-	}
 
 	public double getCombustionEfficiency() {
 		return .97;
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
index 7b163ad..a74dfd4 100644
--- a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
@@ -17,7 +17,6 @@ import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.RocketScience;
 import com.billkuker.rocketry.motorsim.fuel.EditableCombustionProduct;
-import com.billkuker.rocketry.motorsim.visual.Chart;
 
 public class EditablePiecewiseLinearFuel implements EditableFuel{
 	private static final Logger log = Logger
@@ -164,28 +163,4 @@ public class EditablePiecewiseLinearFuel implements EditableFuel{
 		}
 	}
 
-
-	
-	public static void main( String args[]) throws Exception{
-		EditablePiecewiseLinearFuel f = new EditablePiecewiseLinearFuel();
-		f.add(Amount.valueOf(0,SI.MEGA(SI.PASCAL)), Amount.valueOf(2, SI.METERS_PER_SECOND));
-		//f.add(Amount.valueOf(2,SI.MEGA(SI.PASCAL)), Amount.valueOf(2, SI.METERS_PER_SECOND));
-		//f.add(Amount.valueOf(4,SI.MEGA(SI.PASCAL)), Amount.valueOf(1, SI.METERS_PER_SECOND));
-		//f.add(Amount.valueOf(10,SI.MEGA(SI.PASCAL)), Amount.valueOf(3, SI.METERS_PER_SECOND));
-		//f.add(Amount.valueOf(20,SI.MEGA(SI.PASCAL)), Amount.valueOf(4, SI.METERS_PER_SECOND));
-		Chart<Pressure, Velocity> burnRate = new Chart<Pressure, Velocity>(
-				SI.MEGA(SI.PASCAL),
-				SI.METERS_PER_SECOND,
-				f,
-				"burnRate");
-		burnRate.setDomain(
-				burnRate.new IntervalDomain(
-						Amount.valueOf(0, SI.MEGA(SI.PASCAL)),
-						Amount.valueOf(11, SI.MEGA(SI.PASCAL)),
-						200
-						));
-		
-		burnRate.show();
-	}
-
 }
diff --git a/src/com/billkuker/rocketry/motorsim/grain/CSlot.java b/src/com/billkuker/rocketry/motorsim/grain/CSlot.java
index c3154c5..d26657f 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/CSlot.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/CSlot.java
@@ -13,8 +13,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public class CSlot extends ExtrudedShapeGrain implements Validating {
 
@@ -104,12 +102,6 @@ public class CSlot extends ExtrudedShapeGrain implements Validating {
 		generateGeometry();
 	}
 
-	public static void main(String args[]) throws Exception {
-		CSlot e = new CSlot();
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
-	
 	public void validate() throws ValidationException{
 		if ( oD.equals(Amount.ZERO) )
 			throw new ValidationException(this, "Invalid oD");
diff --git a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
index 5b05536..6248239 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/CoredCylindricalGrain.java
@@ -13,8 +13,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Validating;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 
 public class CoredCylindricalGrain extends ExtrudedGrain implements Validating {
@@ -248,10 +246,4 @@ public class CoredCylindricalGrain extends ExtrudedGrain implements Validating {
 		this.innerSurfaceInhibited = innerSurfaceInhibited;
 	}
 
-	public static void main(String args[]) throws Exception {
-		CoredCylindricalGrain e = DEFAULT_GRAIN;
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
-
 }
diff --git a/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java b/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
index aefaf32..4ef34ae 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/Finocyl.java
@@ -14,8 +14,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public class Finocyl extends ExtrudedShapeGrain implements Validating {
 	private Amount<Length> oD = Amount.valueOf(30, SI.MILLIMETER);
@@ -109,12 +107,6 @@ public class Finocyl extends ExtrudedShapeGrain implements Validating {
 		generateGeometry();
 	}
 	
-	public static void main(String args[]) throws Exception {
-		Finocyl e = new Finocyl();
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
-	
 	@Override
 	public void validate() throws ValidationException{
 		if ( iD.equals(Amount.ZERO) )
diff --git a/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java b/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
index 9844f3e..ffbd4b6 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/Moonburner.java
@@ -12,8 +12,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public class Moonburner extends ExtrudedShapeGrain implements Validating {
 
@@ -76,13 +74,7 @@ public class Moonburner extends ExtrudedShapeGrain implements Validating {
 		xsection.subtract(new Ellipse2D.Double(odmm/2 - idmm/2 + offmm, odmm/2 - idmm/2, idmm, idmm));
 		webThickness = null;
 	}
-	
-	public static void main(String args[]) throws Exception {
-		Moonburner e = new Moonburner();
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
-	
+
 	public void validate() throws ValidationException{
 		if ( iD.equals(Amount.ZERO) )
 			throw new ValidationException(this, "Invalid iD");
diff --git a/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
index 3ce4dae..a3ede32 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/RodAndTubeGrain.java
@@ -7,10 +7,7 @@ import javax.measure.unit.SI;
 
 import org.jscience.physics.amount.Amount;
 
-import com.billkuker.rocketry.motorsim.Grain;
 import com.billkuker.rocketry.motorsim.Validating;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public class RodAndTubeGrain extends CompoundGrain implements Validating {
 	CoredCylindricalGrain rod, tube;
@@ -104,13 +101,6 @@ public class RodAndTubeGrain extends CompoundGrain implements Validating {
 		tube.setForeEndInhibited(foreEndInhibited);
 	}
 
-
-	public static void main(String args[]) throws Exception {
-		Grain g = DEFAULT_GRAIN;
-		new Editor(g).showAsWindow();
-		new GrainPanel(g).showAsWindow();
-	}
-
 	@Override
 	public void validate() throws ValidationException {
 		rod.validate();
diff --git a/src/com/billkuker/rocketry/motorsim/grain/Star.java b/src/com/billkuker/rocketry/motorsim/grain/Star.java
index 655daa5..223e4b2 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/Star.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/Star.java
@@ -14,8 +14,6 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Validating;
 import com.billkuker.rocketry.motorsim.grain.util.BurningShape;
 import com.billkuker.rocketry.motorsim.grain.util.ExtrudedShapeGrain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public class Star extends ExtrudedShapeGrain implements Validating {
 	private Amount<Length> oD = Amount.valueOf(30, SI.MILLIMETER);
@@ -102,13 +100,6 @@ public class Star extends ExtrudedShapeGrain implements Validating {
 		generateGeometry();
 	}
 	
-	
-	public static void main(String args[]) throws Exception {
-		Star e = new Star();
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
-	
 	@Override
 	public void validate() throws ValidationException{
 		if ( iD.equals(Amount.ZERO) )
diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
index d734334..62fc8b9 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/util/ExtrudedShapeGrain.java
@@ -14,8 +14,6 @@ import javax.measure.unit.SI;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.grain.ExtrudedGrain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public abstract class ExtrudedShapeGrain extends ExtrudedGrain {
 	
@@ -140,11 +138,5 @@ public abstract class ExtrudedShapeGrain extends ExtrudedGrain {
 		}
 		return res;
 	}
-	
-	public static void main(String args[]) throws Exception {
-		ExtrudedShapeGrain e = DEFAULT_GRAIN;
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
 
 }
diff --git a/src/com/billkuker/rocketry/motorsim/grain/util/RotatedShapeGrain.java b/src/com/billkuker/rocketry/motorsim/grain/util/RotatedShapeGrain.java
index 20cd4e4..879499d 100644
--- a/src/com/billkuker/rocketry/motorsim/grain/util/RotatedShapeGrain.java
+++ b/src/com/billkuker/rocketry/motorsim/grain/util/RotatedShapeGrain.java
@@ -17,8 +17,6 @@ import org.apache.log4j.Logger;
 import org.jscience.physics.amount.Amount;
 
 import com.billkuker.rocketry.motorsim.Grain;
-import com.billkuker.rocketry.motorsim.visual.Editor;
-import com.billkuker.rocketry.motorsim.visual.GrainPanel;
 
 public abstract class RotatedShapeGrain implements Grain {
 	
@@ -246,13 +244,5 @@ public abstract class RotatedShapeGrain implements Grain {
 		}
 		return len;
 	}
-
-	
-
-	public static void main(String args[]) throws Exception {
-		RotatedShapeGrain e = DEFAULT_GRAIN;
-		new Editor(e).showAsWindow();
-		new GrainPanel(e).showAsWindow();
-	}
 	
 }
diff --git a/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java b/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
index d03e699..9450ce5 100644
--- a/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
+++ b/src/com/billkuker/rocketry/motorsim/io/HTMLExporter.java
@@ -1,7 +1,5 @@
 package com.billkuker.rocketry.motorsim.io;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
@@ -22,9 +20,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.Burn;
 import com.billkuker.rocketry.motorsim.BurnSummary;
 import com.billkuker.rocketry.motorsim.GraphSimplifier;
-import com.billkuker.rocketry.motorsim.Motor;
 import com.billkuker.rocketry.motorsim.RocketScience;
-import com.billkuker.rocketry.motorsim.motors.kuker.PVC9;
 
 public class HTMLExporter {
 
@@ -212,35 +208,4 @@ public class HTMLExporter {
 		out.close();
 	}
 
-	public static void main(String args[]) throws Exception {
-
-		Motor m = new PVC9();
-		Burn b = new Burn(m);
-
-		File f = new File("test.html");
-		export(b, System.out);
-		export(b, new FileOutputStream(f));
-
-		/*
-		 * 
-		 * EndBurner g = new EndBurner(); g.setLength(Amount.valueOf(70,
-		 * SI.MILLIMETER)); g.setoD(Amount.valueOf(30, SI.MILLIMETER));
-		 * g.setPuntDepth(Amount.valueOf(10, SI.MILLIMETER));
-		 * g.setPuntDiameter(Amount.valueOf(10, SI.MILLIMETER));
-		 * 
-		 * Chart<Length, Area> c = new Chart<Length, Area>(SI.MILLIMETER,
-		 * SI.MILLIMETER.pow(2).asType(Area.class), g, "surfaceArea");
-		 * c.setDomain(c.new IntervalDomain(Amount.valueOf(0, SI.CENTIMETER), g
-		 * .webThickness()));
-		 * 
-		 * GraphSimplifier<Length, Area> gs = new GraphSimplifier<Length,
-		 * Area>(g, "surfaceArea", c.new IntervalDomain(Amount.valueOf(0,
-		 * SI.CENTIMETER), g.webThickness()).iterator());
-		 * 
-		 * System.out.print(toChart(SI.MILLIMETER,
-		 * SI.MILLIMETER.pow(2).asType(Area.class), gs, "value", gs
-		 * .getDomain().iterator(), "Area"));
-		 */
-	}
-
 }