Refactoring

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;

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;

src/main/java/kieker/gui/common/ISubController.java → 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.

src/main/java/kieker/gui/common/ISubView.java → 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;
 

src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java

 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;

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;
 

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.

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.

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;

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.

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;

src/main/java/kieker/gui/subview/traces/AbstractController.java

 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;

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.

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.

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.

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;

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 {

src/main/java/kieker/gui/common/IModel.java → src/main/java/kieker/gui/subview/util/IModel.java

-package kieker.gui.common;
+package kieker.gui.subview.util;
 
 import java.util.List;
 import java.util.Observer;