From ccb943950fbc9b04fdee5c60de80ebd88aaa0c17 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 17 Dec 2014 16:56:50 +0100
Subject: [PATCH] Refactoring
---
src/main/java/kieker/gui/common/ISubController.java | 1 -
.../java/kieker/gui/common/{ => model}/DataModel.java | 2 +-
.../kieker/gui/common/{ => model}/PropertiesModel.java | 2 +-
src/main/java/kieker/gui/mainview/Controller.java | 4 ++--
src/main/java/kieker/gui/mainview/View.java | 2 +-
.../subview/aggregatedtraces/AbstractController.java | 4 ++--
.../gui/subview/aggregatedtraces/Controller.java | 6 +++---
.../gui/subview/aggregatedtraces/FailedController.java | 6 +++---
.../subview/aggregatedtraces/FailureController.java | 6 +++---
.../java/kieker/gui/subview/aggregatedtraces/View.java | 10 +++++-----
.../util/AggregatedExecutionAvgDurationComparator.java | 2 +-
.../util/AggregatedExecutionCallComparator.java | 2 +-
.../util/AggregatedExecutionMaxDurationComparator.java | 2 +-
.../util/AggregatedExecutionMinDurationComparator.java | 2 +-
.../AggregatedExecutionTotalDurationComparator.java | 2 +-
.../java/kieker/gui/subview/records/Controller.java | 4 ++--
src/main/java/kieker/gui/subview/records/View.java | 2 +-
.../records/util/RecordTimestampComparator.java | 2 +-
.../gui/subview/records/util/RecordTypeComparator.java | 2 +-
.../kieker/gui/subview/traces/AbstractController.java | 4 ++--
.../java/kieker/gui/subview/traces/Controller.java | 6 +++---
.../kieker/gui/subview/traces/FailedController.java | 6 +++---
.../kieker/gui/subview/traces/FailureController.java | 6 +++---
src/main/java/kieker/gui/subview/traces/View.java | 10 +++++-----
.../traces/util/ExecutionDurationComparator.java | 2 +-
.../traces/util/ExecutionTraceIDComparator.java | 2 +-
.../util}/AbstractDataModelProxy.java | 5 ++++-
.../util/AbstractDirectedComparator.java | 2 +-
.../util/ExecutionComponentComparator.java | 3 +--
.../util/ExecutionContainerComparator.java | 3 +--
.../util/ExecutionOperationComparator.java | 3 +--
.../util/TableColumnSortListener.java | 2 +-
.../util/TreeColumnSortListener.java | 2 +-
33 files changed, 59 insertions(+), 60 deletions(-)
rename src/main/java/kieker/gui/common/{ => model}/DataModel.java (99%)
rename src/main/java/kieker/gui/common/{ => model}/PropertiesModel.java (97%)
rename src/main/java/kieker/gui/{common => subview/util}/AbstractDataModelProxy.java (83%)
rename src/main/java/kieker/gui/{common => subview}/util/AbstractDirectedComparator.java (96%)
rename src/main/java/kieker/gui/subview/{traces => }/util/ExecutionComponentComparator.java (92%)
rename src/main/java/kieker/gui/subview/{traces => }/util/ExecutionContainerComparator.java (92%)
rename src/main/java/kieker/gui/subview/{traces => }/util/ExecutionOperationComparator.java (92%)
rename src/main/java/kieker/gui/{common => subview}/util/TableColumnSortListener.java (98%)
rename src/main/java/kieker/gui/{common => subview}/util/TreeColumnSortListener.java (98%)
diff --git a/src/main/java/kieker/gui/common/ISubController.java b/src/main/java/kieker/gui/common/ISubController.java
index a3a66da5..89bb1d89 100644
--- a/src/main/java/kieker/gui/common/ISubController.java
+++ b/src/main/java/kieker/gui/common/ISubController.java
@@ -16,7 +16,6 @@
package kieker.gui.common;
-
/**
* A commons interface for all sub-controllers to reduce dependencies.
*
diff --git a/src/main/java/kieker/gui/common/DataModel.java b/src/main/java/kieker/gui/common/model/DataModel.java
similarity index 99%
rename from src/main/java/kieker/gui/common/DataModel.java
rename to src/main/java/kieker/gui/common/model/DataModel.java
index 08e5c348..152c4cab 100644
--- a/src/main/java/kieker/gui/common/DataModel.java
+++ b/src/main/java/kieker/gui/common/model/DataModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.model;
import java.io.File;
import java.util.ArrayList;
diff --git a/src/main/java/kieker/gui/common/PropertiesModel.java b/src/main/java/kieker/gui/common/model/PropertiesModel.java
similarity index 97%
rename from src/main/java/kieker/gui/common/PropertiesModel.java
rename to src/main/java/kieker/gui/common/model/PropertiesModel.java
index 56400c6f..9e5972f7 100644
--- a/src/main/java/kieker/gui/common/PropertiesModel.java
+++ b/src/main/java/kieker/gui/common/model/PropertiesModel.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.model;
import java.util.Observable;
diff --git a/src/main/java/kieker/gui/mainview/Controller.java b/src/main/java/kieker/gui/mainview/Controller.java
index d7e9273b..86a9dae0 100644
--- a/src/main/java/kieker/gui/mainview/Controller.java
+++ b/src/main/java/kieker/gui/mainview/Controller.java
@@ -16,10 +16,10 @@
package kieker.gui.mainview;
-import kieker.gui.common.DataModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.mainview.Model.SubView;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/src/main/java/kieker/gui/mainview/View.java b/src/main/java/kieker/gui/mainview/View.java
index 1b8f03e1..177c8d4e 100644
--- a/src/main/java/kieker/gui/mainview/View.java
+++ b/src/main/java/kieker/gui/mainview/View.java
@@ -19,8 +19,8 @@ package kieker.gui.mainview;
import java.util.Observable;
import java.util.Observer;
-import kieker.gui.common.DataModel;
import kieker.gui.common.ISubView;
+import kieker.gui.common.model.DataModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
index f34ee28b..824452ed 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
@@ -1,11 +1,11 @@
package kieker.gui.subview.aggregatedtraces;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
index 31875aed..6f459d3a 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
import org.eclipse.swt.events.SelectionEvent;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
index 851e51f4..00968d5e 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available aggregated traces.
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
index 3cb98455..a863991d 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.aggregatedtraces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available aggregated traces.
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
index 76f6081d..38e9811a 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
@@ -22,17 +22,17 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.TreeColumnSortListener;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionAvgDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionCallComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMaxDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMinDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionTotalDurationComparator;
-import kieker.gui.subview.traces.util.ExecutionComponentComparator;
-import kieker.gui.subview.traces.util.ExecutionContainerComparator;
-import kieker.gui.subview.traces.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.ExecutionComponentComparator;
+import kieker.gui.subview.util.ExecutionContainerComparator;
+import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
index a1aaf992..6646cadf 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
index a396ead2..a399d3ba 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
index 77173fa4..f6be97f5 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
index e2e3418c..bd94cb8a 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
index 5e659300..b9c46911 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionTotalDurationComparator.java
@@ -1,7 +1,7 @@
package kieker.gui.subview.aggregatedtraces.util;
import kieker.gui.common.domain.AggregatedExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/Controller.java b/src/main/java/kieker/gui/subview/records/Controller.java
index e1083a78..f435c36d 100644
--- a/src/main/java/kieker/gui/subview/records/Controller.java
+++ b/src/main/java/kieker/gui/subview/records/Controller.java
@@ -18,12 +18,12 @@ package kieker.gui.subview.records;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Record;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available records.
diff --git a/src/main/java/kieker/gui/subview/records/View.java b/src/main/java/kieker/gui/subview/records/View.java
index 6ad7cb2e..a27b51a4 100644
--- a/src/main/java/kieker/gui/subview/records/View.java
+++ b/src/main/java/kieker/gui/subview/records/View.java
@@ -23,9 +23,9 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.TableColumnSortListener;
import kieker.gui.subview.records.util.RecordTimestampComparator;
import kieker.gui.subview.records.util.RecordTypeComparator;
+import kieker.gui.subview.util.TableColumnSortListener;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java b/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
index 8ace9bde..9427b38c 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.records.util;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java b/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
index 62767844..8c9b5c15 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.records.util;
import kieker.gui.common.domain.Record;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/AbstractController.java b/src/main/java/kieker/gui/subview/traces/AbstractController.java
index 81a8776f..1f260a22 100644
--- a/src/main/java/kieker/gui/subview/traces/AbstractController.java
+++ b/src/main/java/kieker/gui/subview/traces/AbstractController.java
@@ -1,11 +1,11 @@
package kieker.gui.subview.traces;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/subview/traces/Controller.java b/src/main/java/kieker/gui/subview/traces/Controller.java
index 365437e5..325ef2e4 100644
--- a/src/main/java/kieker/gui/subview/traces/Controller.java
+++ b/src/main/java/kieker/gui/subview/traces/Controller.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available traces.
diff --git a/src/main/java/kieker/gui/subview/traces/FailedController.java b/src/main/java/kieker/gui/subview/traces/FailedController.java
index c9006a30..c440e78c 100644
--- a/src/main/java/kieker/gui/subview/traces/FailedController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailedController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available failed traces.
diff --git a/src/main/java/kieker/gui/subview/traces/FailureController.java b/src/main/java/kieker/gui/subview/traces/FailureController.java
index daa855d1..1ccf1f9d 100644
--- a/src/main/java/kieker/gui/subview/traces/FailureController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailureController.java
@@ -18,11 +18,11 @@ package kieker.gui.subview.traces;
import java.util.List;
-import kieker.gui.common.AbstractDataModelProxy;
-import kieker.gui.common.DataModel;
import kieker.gui.common.IModel;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.model.DataModel;
+import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.util.AbstractDataModelProxy;
/**
* The sub-controller responsible for the sub-view presenting the available failure-containing traces.
diff --git a/src/main/java/kieker/gui/subview/traces/View.java b/src/main/java/kieker/gui/subview/traces/View.java
index 6f73f2ee..c17e9c3a 100644
--- a/src/main/java/kieker/gui/subview/traces/View.java
+++ b/src/main/java/kieker/gui/subview/traces/View.java
@@ -22,14 +22,14 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
-import kieker.gui.common.PropertiesModel;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.TreeColumnSortListener;
-import kieker.gui.subview.traces.util.ExecutionComponentComparator;
-import kieker.gui.subview.traces.util.ExecutionContainerComparator;
+import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.traces.util.ExecutionDurationComparator;
-import kieker.gui.subview.traces.util.ExecutionOperationComparator;
import kieker.gui.subview.traces.util.ExecutionTraceIDComparator;
+import kieker.gui.subview.util.ExecutionComponentComparator;
+import kieker.gui.subview.util.ExecutionContainerComparator;
+import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
index 2a4f4484..475ced2a 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.traces.util;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
index 7f46022d..cc2c1564 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
@@ -17,7 +17,7 @@
package kieker.gui.subview.traces.util;
import kieker.gui.common.domain.Execution;
-import kieker.gui.common.util.AbstractDirectedComparator;
+import kieker.gui.subview.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/common/AbstractDataModelProxy.java b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
similarity index 83%
rename from src/main/java/kieker/gui/common/AbstractDataModelProxy.java
rename to src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
index cbbcc5b3..18f6181a 100644
--- a/src/main/java/kieker/gui/common/AbstractDataModelProxy.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
@@ -1,8 +1,11 @@
-package kieker.gui.common;
+package kieker.gui.subview.util;
import java.util.Observable;
import java.util.Observer;
+import kieker.gui.common.IModel;
+import kieker.gui.common.model.DataModel;
+
public abstract class AbstractDataModelProxy<T> extends Observable implements IModel<T>, Observer {
protected final DataModel dataModel;
diff --git a/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java b/src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
similarity index 96%
rename from src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
rename to src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
index a7d31f93..02749c57 100644
--- a/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDirectedComparator.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Comparator;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
index a5e6cab9..0b77c6ee 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionComponentComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
index ba1c5fbe..10e1a049 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionContainerComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java b/src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
rename to src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
index 90b199cd..72b27604 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
+++ b/src/main/java/kieker/gui/subview/util/ExecutionOperationComparator.java
@@ -14,10 +14,9 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.subview.traces.util;
+package kieker.gui.subview.util;
import kieker.gui.common.domain.AbstractExecution;
-import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/common/util/TableColumnSortListener.java b/src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/util/TableColumnSortListener.java
rename to src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
index 60dd5ed6..006f5f9c 100644
--- a/src/main/java/kieker/gui/common/util/TableColumnSortListener.java
+++ b/src/main/java/kieker/gui/subview/util/TableColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java b/src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
rename to src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
index bff0ec61..4107418c 100644
--- a/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
+++ b/src/main/java/kieker/gui/subview/util/TreeColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common.util;
+package kieker.gui.subview.util;
import java.util.Collections;
import java.util.List;
--
GitLab