clean up

tools.descartes.pmx.builder/META-INF/MANIFEST.MF

@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.emf.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: tools.descartes.pmx.builder,
- tools.descartes.pmx.filter.controlflow
+ tools.descartes.pmx.util

tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java

@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.EObject;
 
 import kieker.common.util.signature.Signature;
 import kieker.tools.traceAnalysis.systemModel.ComponentType;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
+import tools.descartes.pmx.util.ExternalCall;
 
 public interface IModelBuilder {
 	

tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java

@@ -37,8 +37,8 @@ import org.eclipse.emf.ecore.EObject;
 
 import kieker.common.util.signature.Signature;
 import kieker.tools.traceAnalysis.systemModel.ComponentType;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
-import tools.descartes.pmx.filter.util.Util;
+import tools.descartes.pmx.util.ExternalCall;
+import tools.descartes.pmx.util.Util;
 
 public abstract class ModelBuilder implements IModelBuilder{
 	private static final Logger log = Logger

tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java → tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java

-package tools.descartes.pmx.filter.controlflow;
+package tools.descartes.pmx.util;
 
 /**
  * ==============================================

tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java → tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java

@@ -24,7 +24,7 @@
  * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  */
-package tools.descartes.pmx.filter.util;
+package tools.descartes.pmx.util;
 
 import kieker.analysis.plugin.AbstractPlugin;
 

tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java → tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java

@@ -24,7 +24,7 @@
  * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
  * in the United States and other countries.]
  */
-package tools.descartes.pmx.filter.util;
+package tools.descartes.pmx.util;
 
 import org.apache.log4j.Logger;
 
@@ -42,8 +42,8 @@ import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstruc
 import kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter;
 import kieker.tools.traceAnalysis.systemModel.ExecutionTraceBasedSession;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
-import tools.descartes.pmx.filter.util.Util;
+import tools.descartes.pmx.util.FilterPortTuple;
+import tools.descartes.pmx.util.Util;
 
 public class Util {
 	private static final Logger log = Logger.getLogger(Util.class);

tools.descartes.pmx/META-INF/MANIFEST.MF

@@ -10,6 +10,6 @@ Require-Bundle: tools.descartes.librede.estimation;visibility:=reexport,
  org.apache.log4j,
  tools.descartes.pmx.builder
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: tools.descartes.pmx, tools.descartes.pmx.filter.controlflow
+Export-Package: tools.descartes.pmx
 Import-Package: tools.descartes.pmx.builder,
- tools.descartes.pmx.filter.controlflow
+ tools.descartes.pmx.util

tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java

@@ -54,8 +54,8 @@ import tools.descartes.pmx.builder.CSVBuilder;
 import tools.descartes.pmx.builder.IModelBuilder;
 import tools.descartes.pmx.builder.ModelBuilder;
 import tools.descartes.pmx.filter.controlflow.CallDecoration;
-import tools.descartes.pmx.filter.controlflow.ExternalCall;
 import tools.descartes.pmx.filter.util.PerformanceModelCreator;
+import tools.descartes.pmx.util.ExternalCall;
 
 @Plugin(description = "Transforms the contents of a Kieker SystemModelRepository + graph + resource demands to the model of the builder ", repositoryPorts = { @RepositoryPort(name = AbstractTraceAnalysisFilter.REPOSITORY_PORT_NAME_SYSTEM_MODEL, repositoryType = SystemModelRepository.class) })
 public class PerformanceModelFilter extends AbstractFilterPlugin{ 	//extends AbstractTraceAnalysisFilter {

tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java

@@ -58,7 +58,7 @@ import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
 import tools.descartes.pmx.filter.controlflow.CallNodeDecorator;
 import tools.descartes.pmx.filter.resourcedemands.CPUFilter;
 import tools.descartes.pmx.filter.resourcedemands.ResourceDemandFilter;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class PerformanceModelFilterAppender {
 	private static final Logger log = Logger.getLogger(PerformanceModelFilterAppender.class);

tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java

@@ -40,7 +40,7 @@ import kieker.tools.traceAnalysis.filter.visualization.dependencyGraph.Component
 import kieker.tools.traceAnalysis.filter.visualization.dependencyGraph.OperationDependencyGraphAllocationFilter;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
 import tools.descartes.pmx.builder.IModelBuilder;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class ControlFlowFilterAppender {
 

tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java

@@ -32,7 +32,7 @@ import kieker.analysis.IAnalysisController;
 import kieker.analysis.exception.AnalysisConfigurationException;
 import kieker.common.configuration.Configuration;
 import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstructionFilter;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class UsageFilterAppender {
 	

tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java

@@ -41,7 +41,7 @@ import kieker.tools.traceAnalysis.filter.flow.TraceEventRecords2ExecutionAndMess
 import kieker.tools.traceAnalysis.filter.sessionReconstruction.SessionReconstructionFilter;
 import kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter;
 import kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository;
-import tools.descartes.pmx.filter.util.FilterPortTuple;
+import tools.descartes.pmx.util.FilterPortTuple;
 
 public class KiekerFilterAppender {