From 48f29d8984416d90c5df3d300fbd54d70eff0613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Walter?= <juergen.walter@uni-wuerzburg.de>
Date: Fri, 17 Feb 2017 10:30:58 +0100
Subject: [PATCH] clean up

---
 tools.descartes.pmx.builder/META-INF/MANIFEST.MF            | 2 +-
 .../src/tools/descartes/pmx/builder/IModelBuilder.java      | 2 +-
 .../src/tools/descartes/pmx/builder/ModelBuilder.java       | 4 ++--
 .../pmx/{filter/controlflow => util}/ExternalCall.java      | 2 +-
 .../descartes/pmx/{filter => }/util/FilterPortTuple.java    | 2 +-
 .../src/tools/descartes/pmx/{filter => }/util/Util.java     | 6 +++---
 tools.descartes.pmx/META-INF/MANIFEST.MF                    | 4 ++--
 .../tools/descartes/pmx/filter/PerformanceModelFilter.java  | 2 +-
 .../pmx/filter/PerformanceModelFilterAppender.java          | 2 +-
 .../pmx/filter/controlflow/ControlFlowFilterAppender.java   | 2 +-
 .../descartes/pmx/filter/usage/UsageFilterAppender.java     | 2 +-
 .../descartes/pmx/filter/util/KiekerFilterAppender.java     | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)
 rename tools.descartes.pmx.builder/src/tools/descartes/pmx/{filter/controlflow => util}/ExternalCall.java (97%)
 rename tools.descartes.pmx.builder/src/tools/descartes/pmx/{filter => }/util/FilterPortTuple.java (97%)
 rename tools.descartes.pmx.builder/src/tools/descartes/pmx/{filter => }/util/Util.java (98%)

diff --git a/tools.descartes.pmx.builder/META-INF/MANIFEST.MF b/tools.descartes.pmx.builder/META-INF/MANIFEST.MF
index 04ba2604..0e82642b 100644
--- a/tools.descartes.pmx.builder/META-INF/MANIFEST.MF
+++ b/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
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java
index 6ef2e83b..60745fe0 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/IModelBuilder.java
+++ b/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 {
 	
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
index 07014208..b9cbc2ba 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/builder/ModelBuilder.java
+++ b/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
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
similarity index 97%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
index a9a17106..9530f6dc 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/controlflow/ExternalCall.java
+++ b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/ExternalCall.java
@@ -1,4 +1,4 @@
-package tools.descartes.pmx.filter.controlflow;
+package tools.descartes.pmx.util;
 
 /**
  * ==============================================
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java
similarity index 97%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/FilterPortTuple.java
index 98bf0acd..3dfe150f 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/FilterPortTuple.java
+++ b/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;
 
diff --git a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java b/tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java
similarity index 98%
rename from tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java
rename to tools.descartes.pmx.builder/src/tools/descartes/pmx/util/Util.java
index 802f180b..6d607c12 100644
--- a/tools.descartes.pmx.builder/src/tools/descartes/pmx/filter/util/Util.java
+++ b/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);
diff --git a/tools.descartes.pmx/META-INF/MANIFEST.MF b/tools.descartes.pmx/META-INF/MANIFEST.MF
index c9248e7d..3721ef9f 100644
--- a/tools.descartes.pmx/META-INF/MANIFEST.MF
+++ b/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
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java
index a01a7066..0f4c2876 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilter.java
+++ b/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 {
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java
index 7d566589..e278ab47 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/PerformanceModelFilterAppender.java
+++ b/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);
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java
index 044925bf..48456639 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/controlflow/ControlFlowFilterAppender.java
+++ b/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 {
 
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java
index 20b493c6..160a9e2e 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/usage/UsageFilterAppender.java
+++ b/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 {
 	
diff --git a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java b/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java
index 1c560819..1100bc02 100644
--- a/tools.descartes.pmx/src/tools/descartes/pmx/filter/util/KiekerFilterAppender.java
+++ b/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 {
 
-- 
GitLab