cleanup of any development markers

core/src/test/java/net/sf/openrocket/communication/UpdateInfoTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.communication;
 
 import static org.junit.Assert.assertEquals;
@@ -9,9 +8,7 @@ import static org.junit.Assert.fail;
 import java.util.Arrays;
 import java.util.List;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/communication/WelcomeInfoTest.java

@@ -1,10 +1,7 @@
-// thzero
 package net.sf.openrocket.communication;
 
 import org.junit.Test;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;

core/src/test/java/net/sf/openrocket/file/iterator/TestDirectoryIterator.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.file.iterator;
 
 import java.io.File;
@@ -11,9 +10,7 @@ public class TestDirectoryIterator {
 	
 	@Test
 	public void testDirectoryIterator() throws IOException {
-// thzero - begin
 		DirectoryIterator iterator = new DirectoryIterator(new File("src/test/java/net/sf/openrocket/file"), new FileFilter() {
-// thzero - end
 			@Override
 			public boolean accept(File pathname) {
 				return pathname.getName().matches("^Test(Directory|File)Iterator.java");

core/src/test/java/net/sf/openrocket/file/motor/TestMotorLoader.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.file.motor;
 
 import static org.junit.Assert.assertEquals;
@@ -25,40 +24,30 @@ public class TestMotorLoader {
 	public void testGeneralMotorLoader() throws IOException {
 		MotorLoader loader = new GeneralMotorLoader();
 		
-// thzero - begin
 		test(loader, "/file/motor/test1.eng", DIGEST1);
 		test(loader, "/file/motor/test2.rse", DIGEST2);
 		test(loader, "/file/motor/test.zip", DIGEST2, DIGEST1);
 		test(loader, "/file/motor/test3.rse", DIGEST3);
-// thzero - end
 	}
 	
 	@Test
 	public void testRASPMotorLoader() throws IOException {
-// thzero - begin
 		test(new RASPMotorLoader(), "/file/motor/test1.eng", DIGEST1);
-// thzero - end
 	}
 	
 	@Test
 	public void testRockSimMotorLoader() throws IOException {
-// thzero - begin
 		test(new RockSimMotorLoader(), "/file/motor/test2.rse", DIGEST2);
-// thzero - end
 	}
 	
 	@Test
 	public void testRockSimMotorLoader3() throws IOException {
-// thzero - begin
 		test(new RockSimMotorLoader(), "/file/motor/test3.rse", DIGEST3);
-// thzero - end
 	}
 	
 	@Test
 	public void testZipMotorLoader() throws IOException {
-// thzero - begin
 		test(new ZipFileMotorLoader(), "/file/motor/test.zip", DIGEST2, DIGEST1);
-// thzero - end
 	}
 	
 	

core/src/test/java/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.file.openrocket;
 
 import static org.junit.Assert.assertEquals;
@@ -387,9 +386,7 @@ public class OpenRocketSaverTest {
 	
 	private static ThrustCurveMotor readMotor() {
 		GeneralMotorLoader loader = new GeneralMotorLoader();
-// thzero - begin
 		InputStream is = OpenRocketSaverTest.class.getResourceAsStream("/Estes_A8.rse");
-// thzero - end
 		assertNotNull("Problem in unit test, cannot find Estes_A8.rse", is);
 		try {
 			for (ThrustCurveMotor.Builder m : loader.load(is, "Estes_A8.rse")) {

core/src/test/java/net/sf/openrocket/file/openrocket/importt/DocumentConfigTest.java

@@ -1,11 +1,8 @@
-// thzero
 package net.sf.openrocket.file.openrocket.importt;
 
 import static org.junit.Assert.assertEquals;
 import net.sf.openrocket.file.openrocket.OpenRocketSaver;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/file/rasaero/export/RASAeroSaverTest.java

@@ -194,9 +194,7 @@ public class RASAeroSaverTest {
 
     private OpenRocketDocument loadRocket(String fileName) {
         GeneralRocketLoader loader = new GeneralRocketLoader(new File(fileName));
-// thzero - begin
         InputStream is = this.getClass().getResourceAsStream("/file/rasaero/export/" + fileName);
-// thzero - end
         String failMsg = String.format("Problem in unit test, cannot find %s", fileName);
         assertNotNull(failMsg, is);
 

core/src/test/java/net/sf/openrocket/file/rasaero/importt/RASAeroLoaderTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.file.rasaero.importt;
 
 import net.sf.openrocket.document.OpenRocketDocument;
@@ -15,9 +14,7 @@ import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.rocketcomponent.Transition;
 import net.sf.openrocket.rocketcomponent.TrapezoidFinSet;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -39,9 +36,7 @@ public class RASAeroLoaderTest extends BaseTestCase {
     @Test
     public void testThreeStageRocket() {
         RASAeroLoader loader = new RASAeroLoader();
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rasaero/importt/Three-stage rocket.CDX1");
-// thzero - end
         assertNotNull("Could not open Three-stage rocket.CDX1", stream);
         try {
             OpenRocketDocument doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -163,9 +158,7 @@ public class RASAeroLoaderTest extends BaseTestCase {
     @Test
     public void testShowRocket() {
         RASAeroLoader loader = new RASAeroLoader();
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rasaero/importt/Show-off.CDX1");
-// thzero - end
         assertNotNull("Could not open Show-off.CDX1", stream);
         try {
             OpenRocketDocument doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -189,9 +182,7 @@ public class RASAeroLoaderTest extends BaseTestCase {
     @Test
     public void testComplexTwoStageRocket() {
         RASAeroLoader loader = new RASAeroLoader();
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rasaero/importt/Complex.Two-Stage.CDX1");
-// thzero - end
         assertNotNull("Could not open Complex.Two-Stage.CDX1", stream);
         try {
             OpenRocketDocument doc = OpenRocketDocumentFactory.createEmptyRocket();

core/src/test/java/net/sf/openrocket/file/rocksim/importt/RockSimLoaderTest.java

@@ -1,4 +1,3 @@
-// thzero
 /*
  * RockSimLoaderTest.java
  *
@@ -34,9 +33,7 @@ import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.LaunchLug;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import org.junit.Test;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 /**
  * RockSimLoader Tester.
@@ -50,9 +47,7 @@ public class RockSimLoaderTest extends BaseTestCase {
     @org.junit.Test
     public void testFinsOnInnerTube() throws Exception {
         RockSimLoader loader = new RockSimLoader();
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rocksim/importt/PodFins.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open PodFins.rkt", stream);
         try {
             OpenRocketDocument doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -80,9 +75,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertEquals("FinsOnTransitions", doc.getRocket().getName());
         Assert.assertTrue(loader.getWarnings().isEmpty());
 
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rocksim/importt/FinsOnTransitions.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open FinsOnTransitions.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -171,9 +164,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertEquals("FooBar Test", doc.getRocket().getName());
         Assert.assertTrue(loader.getWarnings().isEmpty());
 
-// thzero - begin
         stream = this.getClass().getResourceAsStream("/file/rocksim/importt/rocksimTestRocket2.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open rocksimTestRocket2.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -201,9 +192,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertFalse(stage3.isMassOverridden());
         Assert.assertFalse(stage3.isCGOverridden());
 
-// thzero - begin
         stream = this.getClass().getResourceAsStream("/file/rocksim/importt/rocksimTestRocket3.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open rocksimTestRocket3.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -299,9 +288,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertEquals("Body Tube Children Test", doc.getRocket().getName());
         Assert.assertTrue(loader.getWarnings().isEmpty());
 
-// thzero - begin
         stream = this.getClass().getResourceAsStream("/file/rocksim/importt/BodyTubeChildrenTest.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open BodyTubeChildrenTest.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -342,9 +329,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertEquals("SubAssembly Test", doc.getRocket().getName());
         Assert.assertEquals(2, loader.getWarnings().size());    // can't add BodyTube to NoseCone, and can't add Transition to Transition
 
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rocksim/importt/SubAssemblyTest.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open SubAssemblyTest.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -409,9 +394,7 @@ public class RockSimLoaderTest extends BaseTestCase {
         Assert.assertEquals("Pod Test", doc.getRocket().getName());
         Assert.assertEquals(3, loader.getWarnings().size());
 
-// thzero - begin
         InputStream stream = this.getClass().getResourceAsStream("/file/rocksim/importt/PodTest.rkt");
-// thzero - end
         Assert.assertNotNull("Could not open PodTest.rkt", stream);
 
         doc = OpenRocketDocumentFactory.createEmptyRocket();
@@ -492,9 +475,7 @@ public class RockSimLoaderTest extends BaseTestCase {
     }
 
     public static OpenRocketDocument loadRockSimRocket(RockSimLoader theLoader, String fileName) throws IOException, RocketLoadException {
-// thzero - begin
         try (InputStream stream = RockSimLoaderTest.class.getResourceAsStream("/file/rocksim/importt/" + fileName)) {
-// thzero - end
             Assert.assertNotNull("Could not open " + fileName, stream);
             OpenRocketDocument doc = OpenRocketDocumentFactory.createEmptyRocket();
             DocumentLoadingContext context = new DocumentLoadingContext();

core/src/test/java/net/sf/openrocket/file/rocksim/importt/RockSimTestBase.java

@@ -1,4 +1,4 @@
-// thzero
+
 /*
  * BaseRocksimTest.java
  */
@@ -8,9 +8,7 @@ import java.lang.reflect.Field;
 import java.util.List;
 
 import net.sf.openrocket.rocketcomponent.RocketComponent;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Assert;
 

core/src/test/java/net/sf/openrocket/masscalc/MassCacheTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.masscalc;
 
 import static org.junit.Assert.assertTrue;
@@ -7,9 +6,7 @@ import org.junit.Test;
 
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class MassCacheTest extends BaseTestCase {
 	

core/src/test/java/net/sf/openrocket/masscalc/MassCalculatorTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.masscalc;
 
 import static org.junit.Assert.assertEquals;
@@ -19,9 +18,7 @@ import net.sf.openrocket.simulation.SimulationConditions;
 import net.sf.openrocket.simulation.SimulationStatus;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class MassCalculatorTest extends BaseTestCase {
 

core/src/test/java/net/sf/openrocket/masscalc/RigidBodyTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.masscalc;
 
 //import junit.framework.TestCase;
@@ -8,10 +7,7 @@ import org.junit.Test;
 
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
-
 
 public class RigidBodyTest extends BaseTestCase {
 	

core/src/test/java/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.optimization.rocketoptimization;
 
 import static org.junit.Assert.assertEquals;
@@ -21,10 +20,7 @@ import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.unit.Value;
 import net.sf.openrocket.util.Pair;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
-
 
 @RunWith(JMock.class)
 public class TestRocketOptimizationFunction extends BaseTestCase {

core/src/test/java/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.optimization.rocketoptimization.modifiers;
 
 import static net.sf.openrocket.util.MathUtil.EPSILON;
@@ -8,9 +7,7 @@ import net.sf.openrocket.optimization.general.OptimizationException;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.unit.UnitGroup;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Assert;
 import org.junit.Before;

core/src/test/java/net/sf/openrocket/plugin/PluginTester.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.plugin;
 
 import static org.junit.Assert.assertEquals;
@@ -21,10 +20,10 @@ public class PluginTester {
 	
 	
 	public void testPlugins() {
-// TODO: thzero.com
+// TODO - test fails, the JarPluginImpl does not test correctly.
 //		assertContains(examplePlugins, ExamplePluginImpl.class, MultiPluginImpl.class, JarPluginImpl.class);
 		assertContains(examplePlugins, ExamplePluginImpl.class, MultiPluginImpl.class);
-// TODO: thzero.com
+// TODO
 		assertContains(example2Plugins, MultiPluginImpl.class);
 	}
 	

core/src/test/java/net/sf/openrocket/preset/BodyTubeComponentTests.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
@@ -7,9 +6,7 @@ import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/preset/BodyTubePresetTests.java

@@ -202,7 +202,7 @@ public class BodyTubePresetTests {
 		assertEquals(0.5, preset.get(ComponentPreset.THICKNESS).doubleValue(), 0.0);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -229,7 +229,7 @@ public class BodyTubePresetTests {
 	}
 	*/
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testMaterial() throws Exception {
@@ -249,7 +249,7 @@ public class BodyTubePresetTests {
 	}
 	*/
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	
 	@Test

core/src/test/java/net/sf/openrocket/preset/BulkHeadComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Bulkhead;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +56,7 @@ public class BulkHeadComponentTests extends BaseTestCase {
 		assertEquals(100.0, bt.getMass(), 0.05);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLengthLeavesPreset() {

core/src/test/java/net/sf/openrocket/preset/BulkHeadPresetTests.java

@@ -107,7 +107,7 @@ public class BulkHeadPresetTests {
 		}
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -149,7 +149,7 @@ public class BulkHeadPresetTests {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/CenteringRingComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.CenteringRing;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,7 +58,7 @@ public class CenteringRingComponentTests extends BaseTestCase {
 		assertEquals(100.0, cr.getMass(), 0.05);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLengthLeavesPreset() {

core/src/test/java/net/sf/openrocket/preset/CenteringRingPresetTests.java

@@ -202,7 +202,7 @@ public class CenteringRingPresetTests {
 		assertEquals(0.5, preset.get(ComponentPreset.THICKNESS).doubleValue(), 0.0);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -246,7 +246,7 @@ public class CenteringRingPresetTests {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	/// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/EngineBlockComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.EngineBlock;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,7 +58,7 @@ public class EngineBlockComponentTests extends BaseTestCase {
 		assertEquals(100.0, eb.getMass(), 0.05);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLengthLeavesPreset() {

core/src/test/java/net/sf/openrocket/preset/EngineBlockPresetTests.java

@@ -202,7 +202,7 @@ public class EngineBlockPresetTests {
 		assertEquals(0.5, preset.get(ComponentPreset.THICKNESS).doubleValue(), 0.0);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -246,7 +246,7 @@ public class EngineBlockPresetTests {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/LaunchLugComponentTests.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
@@ -7,9 +6,7 @@ import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.LaunchLug;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/preset/LaunchLugPresetTests.java

@@ -202,7 +202,7 @@ public class LaunchLugPresetTests {
 		assertEquals(0.5, preset.get(ComponentPreset.THICKNESS).doubleValue(), 0.0);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -246,7 +246,7 @@ public class LaunchLugPresetTests {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/NoseConeComponentTests.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
@@ -8,9 +7,7 @@ import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.NoseCone;
 import net.sf.openrocket.rocketcomponent.Transition;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/preset/NoseConePresetTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.assertEquals;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Transition;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 
@@ -142,7 +139,7 @@ public class NoseConePresetTests extends BaseTestCase {
 		}
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -186,7 +183,7 @@ public class NoseConePresetTests extends BaseTestCase {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/ParachuterComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Parachute;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -95,7 +92,7 @@ public class ParachuterComponentTests extends BaseTestCase {
 		assertNull(cr.getPresetComponent());
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 /*
 	@Test
 	public void changeLineLengthLeavesPreset() {
@@ -120,7 +117,7 @@ public class ParachuterComponentTests extends BaseTestCase {
 		assertNull(cr.getPresetComponent());
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLineMaterialLeavesPreset() {

core/src/test/java/net/sf/openrocket/preset/StreamerComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Streamer;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +56,7 @@ public class StreamerComponentTests extends BaseTestCase {
 		assertEquals(80.0, cr.getMass(), 0.05);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLengthClearsPreset() {

core/src/test/java/net/sf/openrocket/preset/TransitionComponentTests.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
@@ -7,9 +6,7 @@ import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.Transition;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/preset/TransitionPresetTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.assertEquals;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.Transition;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 
@@ -145,7 +142,7 @@ public class TransitionPresetTests extends BaseTestCase {
 		}
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -193,7 +190,7 @@ public class TransitionPresetTests extends BaseTestCase {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/preset/TubeCouplerComponentTests.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.*;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.TubeCoupler;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Before;
 import org.junit.Test;
@@ -62,7 +59,7 @@ public class TubeCouplerComponentTests extends BaseTestCase {
 		assertEquals(100.0, tc.getMass(), 0.05);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void changeLengthLeavesPreset() {

core/src/test/java/net/sf/openrocket/preset/TubeCouplerPresetTests.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.preset;
 
 import static org.junit.Assert.assertEquals;
@@ -203,7 +202,7 @@ public class TubeCouplerPresetTests {
 		assertEquals(0.5, preset.get(ComponentPreset.THICKNESS).doubleValue(), 0.0);
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityNoMaterial() throws Exception {
@@ -247,7 +246,7 @@ public class TubeCouplerPresetTests {
 		
 	}
 
-	// TODO - test fails, could not find when running ant
+	// TODO - test fails, could not find when running Ant
 	/*
 	@Test
 	public void testComputeDensityWithMaterial() throws Exception {

core/src/test/java/net/sf/openrocket/rocketcomponent/AxialStageTest.java

@@ -1,9 +1,6 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/rocketcomponent/BoundingBoxTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import net.sf.openrocket.util.BoundingBox;
@@ -6,9 +5,7 @@ import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Test;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;

core/src/test/java/net/sf/openrocket/rocketcomponent/FinSetTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
@@ -9,9 +8,7 @@ import org.junit.Test;
 
 import net.sf.openrocket.rocketcomponent.position.*;
 import net.sf.openrocket.util.Coordinate;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class FinSetTest extends BaseTestCase {
 

core/src/test/java/net/sf/openrocket/rocketcomponent/FlightConfigurationTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -22,9 +21,7 @@ import org.junit.Test;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class FlightConfigurationTest extends BaseTestCase {
 	private final static double EPSILON = MathUtil.EPSILON*1E3;

core/src/test/java/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -28,9 +27,7 @@ import net.sf.openrocket.util.Color;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.LineStyle;
 import net.sf.openrocket.util.Transformation;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class FreeformFinSetTest extends BaseTestCase {
 

core/src/test/java/net/sf/openrocket/rocketcomponent/LaunchLugTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
@@ -8,9 +7,7 @@ import org.junit.Test;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class LaunchLugTest extends BaseTestCase {
 	protected final double EPSILON = MathUtil.EPSILON;

core/src/test/java/net/sf/openrocket/rocketcomponent/MassObjectTest.java

@@ -1,9 +1,6 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.MathUtil;
 import org.junit.Test;
 import org.junit.Assert;

core/src/test/java/net/sf/openrocket/rocketcomponent/NoseConeTest.java

@@ -1,10 +1,7 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import net.sf.openrocket.document.OpenRocketDocumentFactory;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.MathUtil;
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/rocketcomponent/OverrideTest.java

@@ -1,13 +1,10 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import net.sf.openrocket.aerodynamics.AerodynamicForces;
 import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
 import net.sf.openrocket.aerodynamics.FlightConditions;
 import net.sf.openrocket.logging.WarningSet;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/rocketcomponent/ParallelStageTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 //import junit.framework.TestCase;
@@ -11,9 +10,7 @@ import junit.framework.Assert;
 import net.sf.openrocket.rocketcomponent.position.*;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class ParallelStageTest extends BaseTestCase {
 	

core/src/test/java/net/sf/openrocket/rocketcomponent/ParameterSetTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 //import static org.hamcrest.CoreMatchers.equalTo;
@@ -17,10 +16,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import net.sf.openrocket.util.ArrayList;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
-
 
 public class ParameterSetTest extends BaseTestCase {
 		

core/src/test/java/net/sf/openrocket/rocketcomponent/RailButtonTest.java

@@ -1,12 +1,9 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
 import org.junit.Test;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import static org.junit.Assert.assertEquals;
 

core/src/test/java/net/sf/openrocket/rocketcomponent/RocketTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -19,9 +18,7 @@ import net.sf.openrocket.util.BoundingBox;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class RocketTest extends BaseTestCase {
 	final double EPSILON = MathUtil.EPSILON;

core/src/test/java/net/sf/openrocket/rocketcomponent/SymmetricComponentTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
@@ -6,9 +5,7 @@ import static org.junit.Assert.assertNull;
 import net.sf.openrocket.rocketcomponent.position.AxialMethod;
 import net.sf.openrocket.rocketcomponent.position.RadiusMethod;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java

@@ -1,12 +1,9 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.util.Coordinate;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/rocketcomponent/TransitionTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -9,9 +8,7 @@ import org.junit.Test;
 
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.TestRockets;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class TransitionTest extends BaseTestCase {
 	protected final double EPSILON = MathUtil.EPSILON*1000;

core/src/test/java/net/sf/openrocket/rocketcomponent/TrapezoidFinSetTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.rocketcomponent;
 
 import static org.junit.Assert.assertEquals;
@@ -9,9 +8,7 @@ import net.sf.openrocket.material.Material;
 import net.sf.openrocket.rocketcomponent.position.*;
 
 import net.sf.openrocket.util.Coordinate;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class TrapezoidFinSetTest extends BaseTestCase {
 

core/src/test/java/net/sf/openrocket/simulation/DisableStageTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.simulation;
 
 import net.sf.openrocket.document.Simulation;
@@ -7,9 +6,7 @@ import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.simulation.exception.MotorIgnitionException;
 import net.sf.openrocket.simulation.exception.SimulationException;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Assert;
 import org.junit.Test;

core/src/test/java/net/sf/openrocket/simulation/FlightEventsTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.simulation;
 
 import net.sf.openrocket.document.Simulation;
@@ -11,9 +10,7 @@ import net.sf.openrocket.rocketcomponent.ParallelStage;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.simulation.exception.SimulationException;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 import net.sf.openrocket.util.TestRockets;
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/simulation/customexpression/TestExpressions.java

@@ -1,11 +1,8 @@
-// thzero
 package net.sf.openrocket.simulation.customexpression;
 
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.OpenRocketDocumentFactory;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 import org.junit.Test;
 

core/src/test/java/net/sf/openrocket/thrustcurve/SearchResponseParserTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.thrustcurve;
 
 import static org.junit.Assert.assertEquals;
@@ -7,17 +6,13 @@ import java.io.InputStream;
 
 import org.junit.Test;
 
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class SearchResponseParserTest extends BaseTestCase {
 	
 	@Test
 	public void simpleParseTest() throws Exception {
-// thzero - begin
 		InputStream is = SearchResponseParserTest.class.getResourceAsStream("/thrustcurve/SampleSearchResponse.xml");
-// thzero - end
 		SearchResponse response = SearchResponseParser.parse(is);
 		assertEquals(252, response.getMatches());
 	}

core/src/test/java/net/sf/openrocket/util/BaseTestCase.java

@@ -1,6 +1,4 @@
-// thzero - begin
 package net.sf.openrocket.util;
-// thzero - end
 
 import net.sf.openrocket.ServicesForTesting;
 import net.sf.openrocket.l10n.DebugTranslator;

swing/src/main/java/net/sf/openrocket/gui/print/DesignReport.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.gui.print;
 
 import java.awt.Graphics2D;
@@ -20,9 +19,7 @@ import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Element;
 import com.itextpdf.text.Paragraph;
 import com.itextpdf.text.Rectangle;
-// thzero - begin
 import com.itextpdf.awt.DefaultFontMapper;
-// thzero - end
 import com.itextpdf.text.pdf.PdfContentByte;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;

swing/src/main/java/net/sf/openrocket/gui/print/ITextHelper.java

@@ -1,12 +1,9 @@
-// thzero
 /*
  * ITextHelper.java
  */
 package net.sf.openrocket.gui.print;
 
-// thzero - begin
 import com.itextpdf.awt.PdfGraphics2D;
-// thzero - end
 import com.itextpdf.text.Chunk;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
@@ -227,10 +224,8 @@ public final class ITextHelper {
         while (true) {
             BufferedImage subImage = ((BufferedImage) image).getSubimage((int) crop.getX(), (int) crop.getY(),
                                                                          (int) crop.getWidth(), (int) crop.getHeight());
-// thzero - begin
             // TODO: Deprecated (External Dependency)
             Graphics2D g2 = new PdfGraphics2D(content, pageSize.getWidth(), pageSize.getHeight());
-// thzero - end
             g2.drawImage(subImage, margin, ymargin, null);
             g2.dispose();
 

swing/src/main/java/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java

@@ -1,9 +1,6 @@
-// thzero
 package net.sf.openrocket.gui.print.visitor;
 
-// thzero - begin
 import com.itextpdf.awt.PdfGraphics2D;
-// thzero - end
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Rectangle;
@@ -110,10 +107,8 @@ public class FinMarkingGuideStrategy {
     private void printOnOnePage(final FinMarkingGuide theMarkingGuide) {
         Dimension d = getPageSize();
         PdfContentByte cb = writer.getDirectContent();
-// thzero - begin
         // TODO: Deprecated (External Dependency)
         Graphics2D g2 = new PdfGraphics2D(cb, d.width, d.height);
-// thzero - end
         theMarkingGuide.print(g2);
         g2.dispose();
         document.newPage();

swing/src/main/java/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java

@@ -1,4 +1,3 @@
-// thzero
 /*
  * PageFitPrintStrategy.java
  */
@@ -10,9 +9,7 @@ import java.util.Collections;
 import java.util.ListIterator;
 import java.util.Set;
 
-// thzero - begin
 import com.itextpdf.awt.PdfGraphics2D;
-// thzero - end
 import net.sf.openrocket.gui.print.PrintUnit;
 import net.sf.openrocket.gui.print.PrintableComponent;
 
@@ -144,10 +141,8 @@ public class PageFitPrintStrategy {
      * @return a Graphics2D instance
      */
     Graphics2D createGraphics(final float theWPage, final float theHPage, final PdfContentByte theCb) {
-// thzero - begin
         // TODO: Deprecated (External Dependency)
         return new PdfGraphics2D(theCb, theWPage, theHPage);
-// thzero - end
     }
 
     /**

swing/src/main/java/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java

@@ -1,4 +1,3 @@
-// thzero
 /*
  * PartsDetailVisitorStrategy.java
  */
@@ -626,11 +625,9 @@ public class PartsDetailVisitorStrategy {
         para.setLeading(12f, 0);
         Chunk c = new Chunk();
         c.setFont(PrintUtilities.NORMAL);
-// thzero - begin
         // TODO: Deprecated (External Dependency)
         // TODO: Needs a lot more work as "Note that separator chunks can't be used in combination with tab chunks!"
         Chunk tab1 = new Chunk(new VerticalPositionMark(), (level - 2) * 10, true);
-// thzero - end
 
         if (withIndent) {
             para.add(new Chunk(tab1));

swing/src/test/java/net/sf/openrocket/IntegrationTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket;
 
 import static org.junit.Assert.assertEquals;
@@ -109,9 +108,7 @@ public class IntegrationTest {
 	public void testSimpleRocket() throws SimulationException {
 		System.setProperty("openrocket.unittest", "true");
 
-// thzero - begin
 		document = loadRocket("/simplerocket.ork");
-// thzero - end
 
 		undoAction = UndoRedoAction.newUndoAction(document);
 		redoAction = UndoRedoAction.newRedoAction(document);
@@ -266,9 +263,7 @@ public class IntegrationTest {
 	
 	private static ThrustCurveMotor readMotor() {
 		GeneralMotorLoader loader = new GeneralMotorLoader();
-// thzero - begin
 		InputStream is = IntegrationTest.class.getResourceAsStream("/Estes_A8.rse");
-// thzero - end
 		assertNotNull("Problem in unit test, cannot find Estes_A8.rse", is);
 		try {
 			for (ThrustCurveMotor.Builder m : loader.load(is, "Estes_A8.rse")) {

swing/src/test/java/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java

@@ -1,4 +1,3 @@
-// thzero
 package net.sf.openrocket.gui.configdialog;
 
 import java.lang.reflect.Method;
@@ -14,9 +13,7 @@ import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.CenteringRing;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.rocketcomponent.position.AxialMethod;
-// thzero - begin
 import net.sf.openrocket.util.BaseTestCase;
-// thzero - end
 
 public class FinSetConfigTest extends BaseTestCase {