fixed some syntax errors

.settings/edu.umd.cs.findbugs.core.prefs

 #FindBugs User Preferences
-#Thu Apr 30 18:24:06 CEST 2015
+#Mon May 04 12:49:29 CEST 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true

src/performancetest/java/teetime/examples/ChwHomeComparisonMethodcallWithPorts.java

@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 public class ChwHomeComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
 
@@ -33,7 +33,7 @@ public class ChwHomeComparisonMethodcallWithPorts extends AbstractProfiledPerfor
 
 	@Override
 	public void check() {
-		Map<String, PerformanceResult> performanceResults = PerformanceTest.measurementRepository.performanceResults;
+		Map<String, PerformanceResult> performanceResults = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults;
 		for (Entry<String, PerformanceResult> entry : performanceResults.entrySet()) {
 			System.out.println("---> " + entry.getKey() + "\n" + entry.getValue());
 		}

src/performancetest/java/teetime/examples/ChwWorkComparisonMethodcallWithPorts.java

@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
 
@@ -33,7 +33,7 @@ public class ChwWorkComparisonMethodcallWithPorts extends AbstractProfiledPerfor
 
 	@Override
 	public void check() {
-		Map<String, PerformanceResult> performanceResults = PerformanceTest.measurementRepository.performanceResults;
+		Map<String, PerformanceResult> performanceResults = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults;
 		for (Entry<String, PerformanceResult> entry : performanceResults.entrySet()) {
 			System.out.println("---> " + entry.getKey() + "\n" + entry.getValue());
 		}

src/performancetest/java/teetime/examples/ComparisonMethodcallWithPorts.java

@@ -27,8 +27,8 @@ import teetime.examples.experiment11.MethodCallThoughputTimestampAnalysis11Test;
 import teetime.examples.experiment15.MethodCallThoughputTimestampAnalysis15Test;
 import teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test;
 import teetime.examples.experiment19.MethodCallThoughputTimestampAnalysis19Test;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceCheckProfileRepository;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceCheckProfileRepository;
 
 @RunWith(Suite.class)
 @SuiteClasses({

src/performancetest/java/teetime/examples/NieWorkComparisonMethodcallWithPorts.java

@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 public class NieWorkComparisonMethodcallWithPorts extends AbstractProfiledPerformanceAssertion {
 
@@ -33,7 +33,7 @@ public class NieWorkComparisonMethodcallWithPorts extends AbstractProfiledPerfor
 
 	@Override
 	public void check() {
-		Map<String, PerformanceResult> performanceResults = PerformanceTest.measurementRepository.performanceResults;
+		Map<String, PerformanceResult> performanceResults = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults;
 		for (Entry<String, PerformanceResult> entry : performanceResults.entrySet()) {
 			System.out.println("---> " + entry.getKey() + "\n" + entry.getValue());
 		}

src/performancetest/java/teetime/examples/experiment01/ChwHomePerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment01;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,7 +30,7 @@ class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test01 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test01 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test)");
 
 		assertEquals(292, test01.quantiles.get(0.5), 1);

src/performancetest/java/teetime/examples/experiment01/ChwWorkPerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment01;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,7 +30,7 @@ class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test01 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test01 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test)");
 
 		assertEquals(410, test01.quantiles.get(0.5), 1);

src/performancetest/java/teetime/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java

@@ -21,9 +21,9 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.test.PerformanceCheckProfileRepository;
-import util.test.PerformanceTest;
-import util.test.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceCheckProfileRepository;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf
@@ -40,7 +40,8 @@ public class MethodCallThoughputTimestampAnalysis1Test extends PerformanceTest {
 
 	@AfterClass
 	public static void afterClass() {
-		AbstractProfiledPerformanceAssertion performanceCheckProfile = PerformanceCheckProfileRepository.INSTANCE.get(MethodCallThoughputTimestampAnalysis1Test.class);
+		AbstractProfiledPerformanceAssertion performanceCheckProfile = PerformanceCheckProfileRepository.INSTANCE
+				.get(MethodCallThoughputTimestampAnalysis1Test.class);
 		performanceCheckProfile.check();
 	};
 

src/performancetest/java/teetime/examples/experiment09pipeimpls/AbstractPerformanceCheck.java

@@ -17,9 +17,9 @@ package teetime.examples.experiment09pipeimpls;
 
 import teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.MeasurementRepository;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.MeasurementRepository;
+import teetime.util.test.framework.PerformanceTest;
 
 abstract class AbstractPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -31,16 +31,16 @@ abstract class AbstractPerformanceCheck extends AbstractProfiledPerformanceAsser
 	@Override
 	public void check() {
 		String testMethodIdentifier = MeasurementRepository.buildTestMethodIdentifier(MethodCallThoughputTimestampAnalysis1Test.class, "testWithManyObjects");
-		test01 = PerformanceTest.measurementRepository.performanceResults.get(testMethodIdentifier);
+		test01 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults.get(testMethodIdentifier);
 
 		testMethodIdentifier = MeasurementRepository.buildTestMethodIdentifier(MethodCallThoughputTimestampAnalysis9Test.class, "testCommittablePipes");
-		test09CommittablePipes = PerformanceTest.measurementRepository.performanceResults.get(testMethodIdentifier);
+		test09CommittablePipes = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults.get(testMethodIdentifier);
 
 		testMethodIdentifier = MeasurementRepository.buildTestMethodIdentifier(MethodCallThoughputTimestampAnalysis9Test.class, "testSingleElementPipes");
-		test09SingleElementPipes = PerformanceTest.measurementRepository.performanceResults.get(testMethodIdentifier);
+		test09SingleElementPipes = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults.get(testMethodIdentifier);
 
 		testMethodIdentifier = MeasurementRepository.buildTestMethodIdentifier(MethodCallThoughputTimestampAnalysis9Test.class, "testOrderedGrowableArrayPipes");
-		test09OrderedGrowableArrayPipes = PerformanceTest.measurementRepository.performanceResults.get(testMethodIdentifier);
+		test09OrderedGrowableArrayPipes = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults.get(testMethodIdentifier);
 	}
 
 }

src/performancetest/java/teetime/examples/experiment09pipeimpls/MethodCallThoughputTimestampAnalysis9Test.java

@@ -27,8 +27,8 @@ import teetime.framework.pipe.SingleElementPipeFactory;
 import teetime.framework.pipe.UnorderedGrowablePipeFactory;
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf

src/performancetest/java/teetime/examples/experiment11/ChwHomePerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment11;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,9 +30,9 @@ class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test01 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test01 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test)");
-		PerformanceResult test11 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test11 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment11.MethodCallThoughputTimestampAnalysis11Test)");
 
 		double medianSpeedup = (double) test11.quantiles.get(0.5) / test01.quantiles.get(0.5);

src/performancetest/java/teetime/examples/experiment11/ChwWorkPerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment11;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,9 +30,9 @@ class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test01 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test01 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test)");
-		PerformanceResult test11 = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test11 = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjects(teetime.examples.experiment11.MethodCallThoughputTimestampAnalysis11Test)");
 
 		double medianSpeedup = (double) test11.quantiles.get(0.5) / test01.quantiles.get(0.5);

src/performancetest/java/teetime/examples/experiment11/MethodCallThoughputTimestampAnalysis11Test.java

@@ -21,8 +21,8 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.test.PerformanceTest;
-import util.test.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf

src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java

@@ -20,7 +20,6 @@ import java.util.List;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableProducerStage;
 import teetime.framework.Stage;
-import teetime.framework.pipe.UnorderedGrowablePipe;
 import teetime.stage.CollectorSink;
 import teetime.stage.NoopFilter;
 import teetime.stage.ObjectProducer;

src/performancetest/java/teetime/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java

@@ -19,7 +19,7 @@ import org.junit.Test;
 
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf

src/performancetest/java/teetime/examples/experiment16/AnalysisConfiguration16.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 import teetime.framework.AnalysisConfiguration;
 import teetime.framework.OldHeadPipeline;
-import teetime.framework.pipe.SpScPipe;
+import teetime.framework.pipe.SpScPipeFactory;
 import teetime.stage.CollectorSink;
 import teetime.stage.NoopFilter;
 import teetime.stage.ObjectProducer;
@@ -109,7 +109,7 @@ class AnalysisConfiguration16 extends AnalysisConfiguration {
 		pipeline.setFirstStage(relay);
 		pipeline.setLastStage(collectorSink);
 
-		SpScPipe.connect(previousStage.getLastStage().getNewOutputPort(), relay.getInputPort(), SPSC_INITIAL_CAPACITY);
+		new SpScPipeFactory().create(previousStage.getLastStage().getNewOutputPort(), relay.getInputPort(), SPSC_INITIAL_CAPACITY);
 
 		connectIntraThreads(relay.getOutputPort(), startTimestampFilter.getInputPort());
 

src/performancetest/java/teetime/examples/experiment16/ChwHomePerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment16;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,11 +30,11 @@ class ChwHomePerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test16a = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16a = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd1Thread(" + MethodCallThoughputTimestampAnalysis16Test.class.getName() + ")");
-		PerformanceResult test16b = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16b = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd2Threads(" + MethodCallThoughputTimestampAnalysis16Test.class.getName() + ")");
-		PerformanceResult test16c = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16c = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd4Threads(" + MethodCallThoughputTimestampAnalysis16Test.class.getName() + ")");
 		// check speedup
 		double speedupA2B = (double) test16a.overallDurationInNs / test16b.overallDurationInNs;

src/performancetest/java/teetime/examples/experiment16/ChwWorkPerformanceCheck.java

@@ -18,8 +18,8 @@ package teetime.examples.experiment16;
 import static org.junit.Assert.assertEquals;
 import teetime.examples.HostName;
 import teetime.util.test.eval.PerformanceResult;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceTest;
 
 class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
@@ -30,11 +30,11 @@ class ChwWorkPerformanceCheck extends AbstractProfiledPerformanceAssertion {
 
 	@Override
 	public void check() {
-		PerformanceResult test16a = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16a = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd1Thread(teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test)");
-		PerformanceResult test16b = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16b = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd2Threads(teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test)");
-		PerformanceResult test16c = PerformanceTest.measurementRepository.performanceResults
+		PerformanceResult test16c = PerformanceTest.MEASUREMENT_REPOSITORY.performanceResults
 				.get("testWithManyObjectsAnd4Threads(teetime.examples.experiment16.MethodCallThoughputTimestampAnalysis16Test)");
 		// check speedup
 		double speedupB = (double) test16a.overallDurationInNs / test16b.overallDurationInNs;

src/performancetest/java/teetime/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java

@@ -25,9 +25,9 @@ import teetime.framework.Analysis;
 import teetime.util.ConstructorClosure;
 import teetime.util.ListUtil;
 import teetime.util.TimestampObject;
-import util.test.AbstractProfiledPerformanceAssertion;
-import util.test.PerformanceCheckProfileRepository;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.AbstractProfiledPerformanceAssertion;
+import teetime.util.test.framework.PerformanceCheckProfileRepository;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf

src/performancetest/java/teetime/examples/experiment19/MethodCallThoughputTimestampAnalysis19Test.java

@@ -23,7 +23,7 @@ import teetime.framework.Analysis;
 import teetime.util.ConstructorClosure;
 import teetime.util.ListUtil;
 import teetime.util.TimestampObject;
-import util.test.PerformanceTest;
+import teetime.util.test.framework.PerformanceTest;
 
 /**
  * @author Christian Wulf