From d4b7a2f24f15ffc266c2afef2847653484760862 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 17 Dec 2014 16:59:50 +0100
Subject: [PATCH] Refactoring
---
src/main/java/kieker/gui/mainview/Controller.java | 4 ++--
src/main/java/kieker/gui/mainview/View.java | 2 +-
.../java/kieker/gui/{common => subview}/ISubController.java | 3 ++-
src/main/java/kieker/gui/{common => subview}/ISubView.java | 2 +-
.../gui/subview/aggregatedtraces/AbstractController.java | 6 +++---
.../kieker/gui/subview/aggregatedtraces/Controller.java | 2 +-
.../gui/subview/aggregatedtraces/FailedController.java | 2 +-
.../gui/subview/aggregatedtraces/FailureController.java | 2 +-
src/main/java/kieker/gui/subview/aggregatedtraces/View.java | 4 ++--
src/main/java/kieker/gui/subview/records/Controller.java | 6 +++---
src/main/java/kieker/gui/subview/records/View.java | 4 ++--
.../java/kieker/gui/subview/traces/AbstractController.java | 6 +++---
src/main/java/kieker/gui/subview/traces/Controller.java | 2 +-
.../java/kieker/gui/subview/traces/FailedController.java | 2 +-
.../java/kieker/gui/subview/traces/FailureController.java | 2 +-
src/main/java/kieker/gui/subview/traces/View.java | 4 ++--
.../kieker/gui/subview/util/AbstractDataModelProxy.java | 1 -
.../java/kieker/gui/{common => subview/util}/IModel.java | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
rename src/main/java/kieker/gui/{common => subview}/ISubController.java (97%)
rename src/main/java/kieker/gui/{common => subview}/ISubView.java (97%)
rename src/main/java/kieker/gui/{common => subview/util}/IModel.java (85%)
diff --git a/src/main/java/kieker/gui/mainview/Controller.java b/src/main/java/kieker/gui/mainview/Controller.java
index 86a9dae0..0b0a9279 100644
--- a/src/main/java/kieker/gui/mainview/Controller.java
+++ b/src/main/java/kieker/gui/mainview/Controller.java
@@ -16,11 +16,11 @@
package kieker.gui.mainview;
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
import kieker.gui.mainview.Model.SubView;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
diff --git a/src/main/java/kieker/gui/mainview/View.java b/src/main/java/kieker/gui/mainview/View.java
index 177c8d4e..b8aa552a 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.ISubView;
import kieker.gui.common.model.DataModel;
+import kieker.gui.subview.ISubView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
diff --git a/src/main/java/kieker/gui/common/ISubController.java b/src/main/java/kieker/gui/subview/ISubController.java
similarity index 97%
rename from src/main/java/kieker/gui/common/ISubController.java
rename to src/main/java/kieker/gui/subview/ISubController.java
index 89bb1d89..f5d51194 100644
--- a/src/main/java/kieker/gui/common/ISubController.java
+++ b/src/main/java/kieker/gui/subview/ISubController.java
@@ -14,7 +14,8 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.subview;
+
/**
* A commons interface for all sub-controllers to reduce dependencies.
diff --git a/src/main/java/kieker/gui/common/ISubView.java b/src/main/java/kieker/gui/subview/ISubView.java
similarity index 97%
rename from src/main/java/kieker/gui/common/ISubView.java
rename to src/main/java/kieker/gui/subview/ISubView.java
index 7d7c76e5..f3962248 100644
--- a/src/main/java/kieker/gui/common/ISubView.java
+++ b/src/main/java/kieker/gui/subview/ISubView.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.subview;
import org.eclipse.swt.widgets.Composite;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
index 824452ed..cd0eab52 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.IModel;
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
import kieker.gui.common.domain.AggregatedExecution;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
+import kieker.gui.subview.util.IModel;
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 6f459d3a..8a0f312f 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.IModel;
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 kieker.gui.subview.util.IModel;
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 00968d5e..2f55b7e6 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.IModel;
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 kieker.gui.subview.util.IModel;
/**
* 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 a863991d..d4effffa 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.IModel;
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 kieker.gui.subview.util.IModel;
/**
* 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 38e9811a..489d2fac 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
@@ -20,10 +20,9 @@ import java.util.List;
import java.util.Observable;
import java.util.Observer;
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
import kieker.gui.common.domain.AggregatedExecution;
import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubView;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionAvgDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionCallComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMaxDurationComparator;
@@ -32,6 +31,7 @@ import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionTotalDuration
import kieker.gui.subview.util.ExecutionComponentComparator;
import kieker.gui.subview.util.ExecutionContainerComparator;
import kieker.gui.subview.util.ExecutionOperationComparator;
+import kieker.gui.subview.util.IModel;
import kieker.gui.subview.util.TreeColumnSortListener;
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 f435c36d..811230bd 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.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.ISubController;
+import kieker.gui.subview.ISubView;
import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
/**
* 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 a27b51a4..f33e06b2 100644
--- a/src/main/java/kieker/gui/subview/records/View.java
+++ b/src/main/java/kieker/gui/subview/records/View.java
@@ -20,11 +20,11 @@ import java.util.List;
import java.util.Observable;
import java.util.Observer;
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Record;
+import kieker.gui.subview.ISubView;
import kieker.gui.subview.records.util.RecordTimestampComparator;
import kieker.gui.subview.records.util.RecordTypeComparator;
+import kieker.gui.subview.util.IModel;
import kieker.gui.subview.util.TableColumnSortListener;
import org.eclipse.jface.viewers.TableViewer;
diff --git a/src/main/java/kieker/gui/subview/traces/AbstractController.java b/src/main/java/kieker/gui/subview/traces/AbstractController.java
index 1f260a22..be95a30a 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.IModel;
-import kieker.gui.common.ISubController;
-import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Execution;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubController;
+import kieker.gui.subview.ISubView;
+import kieker.gui.subview.util.IModel;
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 325ef2e4..6c6b76ba 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.IModel;
import kieker.gui.common.domain.Execution;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
/**
* 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 c440e78c..4bd6798c 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.IModel;
import kieker.gui.common.domain.Execution;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
/**
* 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 1ccf1f9d..2864ac4b 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.IModel;
import kieker.gui.common.domain.Execution;
import kieker.gui.common.model.DataModel;
import kieker.gui.common.model.PropertiesModel;
import kieker.gui.subview.util.AbstractDataModelProxy;
+import kieker.gui.subview.util.IModel;
/**
* 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 c17e9c3a..f793e7c8 100644
--- a/src/main/java/kieker/gui/subview/traces/View.java
+++ b/src/main/java/kieker/gui/subview/traces/View.java
@@ -20,15 +20,15 @@ import java.util.List;
import java.util.Observable;
import java.util.Observer;
-import kieker.gui.common.IModel;
-import kieker.gui.common.ISubView;
import kieker.gui.common.domain.Execution;
import kieker.gui.common.model.PropertiesModel;
+import kieker.gui.subview.ISubView;
import kieker.gui.subview.traces.util.ExecutionDurationComparator;
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.IModel;
import kieker.gui.subview.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
index 18f6181a..3b1d6b26 100644
--- a/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
+++ b/src/main/java/kieker/gui/subview/util/AbstractDataModelProxy.java
@@ -3,7 +3,6 @@ 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 {
diff --git a/src/main/java/kieker/gui/common/IModel.java b/src/main/java/kieker/gui/subview/util/IModel.java
similarity index 85%
rename from src/main/java/kieker/gui/common/IModel.java
rename to src/main/java/kieker/gui/subview/util/IModel.java
index 2510980d..cb4defde 100644
--- a/src/main/java/kieker/gui/common/IModel.java
+++ b/src/main/java/kieker/gui/subview/util/IModel.java
@@ -1,4 +1,4 @@
-package kieker.gui.common;
+package kieker.gui.subview.util;
import java.util.List;
import java.util.Observer;
--
GitLab