diff --git a/src/main/java/kieker/gui/Main.java b/src/main/java/kieker/gui/Main.java
index 95c4361080af86cd5ef9758db3965a3e14ad73e7..48048b687e969a295790f9bab327581af1b20112 100644
--- a/src/main/java/kieker/gui/Main.java
+++ b/src/main/java/kieker/gui/Main.java
@@ -16,7 +16,7 @@
package kieker.gui;
-import kieker.gui.mainview.MainViewController;
+import kieker.gui.mainview.Controller;
/**
* Contains the main method of this application.
@@ -32,7 +32,7 @@ public class Main {
* The command line arguments. They have no effect.
*/
public static void main(final String[] args) {
- final MainViewController controller = new MainViewController();
+ final Controller controller = new Controller();
controller.showView();
}
diff --git a/src/main/java/kieker/gui/common/AbstractDirectedComparator.java b/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
similarity index 97%
rename from src/main/java/kieker/gui/common/AbstractDirectedComparator.java
rename to src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
index 9f0f10e9c872a736b16e63268c6324e9f7f5bd5b..a7d31f93171fde56cb4cbfc411868c46ac1689ed 100644
--- a/src/main/java/kieker/gui/common/AbstractDirectedComparator.java
+++ b/src/main/java/kieker/gui/common/util/AbstractDirectedComparator.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.util;
import java.util.Comparator;
diff --git a/src/main/java/kieker/gui/common/TableColumnSortListener.java b/src/main/java/kieker/gui/common/util/TableColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/TableColumnSortListener.java
rename to src/main/java/kieker/gui/common/util/TableColumnSortListener.java
index 29e81abc6b3383dc1a2e36706f0719bdca8a2a8f..60dd5ed65182fdaa3da52ffd0771f0fe95be8ceb 100644
--- a/src/main/java/kieker/gui/common/TableColumnSortListener.java
+++ b/src/main/java/kieker/gui/common/util/TableColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.util;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/kieker/gui/common/TreeColumnSortListener.java b/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
similarity index 98%
rename from src/main/java/kieker/gui/common/TreeColumnSortListener.java
rename to src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
index 76a318ccf42b0132892f2338d74e762cc093284a..bff0ec61f11090e23533e95b7ebe8db132c2efa9 100644
--- a/src/main/java/kieker/gui/common/TreeColumnSortListener.java
+++ b/src/main/java/kieker/gui/common/util/TreeColumnSortListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
***************************************************************************/
-package kieker.gui.common;
+package kieker.gui.common.util;
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/kieker/gui/mainview/MainViewController.java b/src/main/java/kieker/gui/mainview/Controller.java
similarity index 72%
rename from src/main/java/kieker/gui/mainview/MainViewController.java
rename to src/main/java/kieker/gui/mainview/Controller.java
index c265b00546f60a6ce76e5eeecc3fc8b46aaa4556..d7e9273b7db29b5a39a8ea3a1a67bd920d2f99fb 100644
--- a/src/main/java/kieker/gui/mainview/MainViewController.java
+++ b/src/main/java/kieker/gui/mainview/Controller.java
@@ -20,14 +20,7 @@ import kieker.gui.common.DataModel;
import kieker.gui.common.ISubController;
import kieker.gui.common.ISubView;
import kieker.gui.common.PropertiesModel;
-import kieker.gui.mainview.MainViewModel.SubView;
-import kieker.gui.subview.aggregatedtraces.AggregatedFailedTracesSubViewController;
-import kieker.gui.subview.aggregatedtraces.AggregatedTracesSubViewController;
-import kieker.gui.subview.aggregatedtraces.FailureContainingAggregatedTracesSubViewController;
-import kieker.gui.subview.records.RecordsSubViewController;
-import kieker.gui.subview.traces.FailedTracesSubViewController;
-import kieker.gui.subview.traces.FailureContainingTracesSubViewController;
-import kieker.gui.subview.traces.TracesSubViewController;
+import kieker.gui.mainview.Model.SubView;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -38,26 +31,26 @@ import org.eclipse.swt.events.SelectionListener;
*
* @author Nils Christian Ehmke
*/
-public final class MainViewController implements SelectionListener {
+public final class Controller implements SelectionListener {
- private final MainView mainView;
+ private final View mainView;
private final DataModel dataModel;
- private final MainViewModel mainViewModel;
+ private final Model mainViewModel;
private final PropertiesModel propertiesModel;
- public MainViewController() {
+ public Controller() {
// Create the top models
this.dataModel = new DataModel();
this.propertiesModel = new PropertiesModel();
// Create the sub-controllers
- final ISubController subViewController1 = new RecordsSubViewController(this.dataModel);
- final ISubController subViewController2 = new TracesSubViewController(this.dataModel, this.propertiesModel);
- final ISubController subViewController3 = new FailedTracesSubViewController(this.dataModel, this.propertiesModel);
- final ISubController subViewController4 = new AggregatedTracesSubViewController(this.dataModel, this.propertiesModel);
- final ISubController subViewController5 = new FailureContainingTracesSubViewController(this.dataModel, this.propertiesModel);
- final ISubController subViewController6 = new AggregatedFailedTracesSubViewController(this.dataModel, this.propertiesModel);
- final ISubController subViewController7 = new FailureContainingAggregatedTracesSubViewController(this.dataModel, this.propertiesModel);
+ final ISubController subViewController1 = new kieker.gui.subview.records.Controller(this.dataModel);
+ final ISubController subViewController2 = new kieker.gui.subview.aggregatedtraces.Controller(this.dataModel, this.propertiesModel);
+ final ISubController subViewController3 = new kieker.gui.subview.traces.FailedController(this.dataModel, this.propertiesModel);
+ final ISubController subViewController4 = new kieker.gui.subview.traces.Controller(this.dataModel, this.propertiesModel);
+ final ISubController subViewController5 = new kieker.gui.subview.traces.FailureController(this.dataModel, this.propertiesModel);
+ final ISubController subViewController6 = new kieker.gui.subview.aggregatedtraces.FailedController(this.dataModel, this.propertiesModel);
+ final ISubController subViewController7 = new kieker.gui.subview.aggregatedtraces.FailureController(this.dataModel, this.propertiesModel);
// Get the sub-views from the controllers
final ISubView subView1 = subViewController1.getView();
@@ -69,8 +62,8 @@ public final class MainViewController implements SelectionListener {
final ISubView subView7 = subViewController7.getView();
// Create the main model and the main view
- this.mainViewModel = new MainViewModel();
- this.mainView = new MainView(this.dataModel, this.mainViewModel, this, subView1, subView2, subView3, subView4, subView5, subView6, subView7);
+ this.mainViewModel = new Model();
+ this.mainView = new View(this.dataModel, this.mainViewModel, this, subView1, subView2, subView3, subView4, subView5, subView6, subView7);
}
public void showView() {
diff --git a/src/main/java/kieker/gui/mainview/MainViewModel.java b/src/main/java/kieker/gui/mainview/Model.java
similarity index 96%
rename from src/main/java/kieker/gui/mainview/MainViewModel.java
rename to src/main/java/kieker/gui/mainview/Model.java
index f79ee70d1444e06aa2d088b3ed0cc72f7a1692bb..9d9751d0ce5b88a626a0ea9198921e2a673ac114 100644
--- a/src/main/java/kieker/gui/mainview/MainViewModel.java
+++ b/src/main/java/kieker/gui/mainview/Model.java
@@ -18,7 +18,7 @@ package kieker.gui.mainview;
import java.util.Observable;
-public final class MainViewModel extends Observable {
+public final class Model extends Observable {
private SubView currentActiveSubView = SubView.NONE;
diff --git a/src/main/java/kieker/gui/mainview/MainView.java b/src/main/java/kieker/gui/mainview/View.java
similarity index 96%
rename from src/main/java/kieker/gui/mainview/MainView.java
rename to src/main/java/kieker/gui/mainview/View.java
index 64c72819eb5124c0ebfa016cc010cb1ffbc952ac..1b8f03e168900248b79ac46ea085bd6ca93e06a6 100644
--- a/src/main/java/kieker/gui/mainview/MainView.java
+++ b/src/main/java/kieker/gui/mainview/View.java
@@ -35,10 +35,10 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-public class MainView implements Observer {
+public class View implements Observer {
private final DataModel dataModel;
- private final MainViewModel mainViewModel;
+ private final Model mainViewModel;
private final ISubView recordsSubView;
private final ISubView tracesSubView;
private final ISubView failedTracesSubView;
@@ -46,7 +46,7 @@ public class MainView implements Observer {
private final ISubView failureContainingTracesSubView;
private final ISubView subView6;
private final ISubView subView7;
- private final MainViewController controller;
+ private final Controller controller;
private Shell shell;
private Composite subViewComposite;
@@ -69,7 +69,7 @@ public class MainView implements Observer {
private TreeItem trtmJustFailedAggTraces;
private TreeItem trtmJustAggTracesContaining;
- public MainView(final DataModel dataModel, final MainViewModel mainViewModel, final MainViewController controller, final ISubView recordsSubView, final ISubView tracesSubView,
+ public View(final DataModel dataModel, final Model mainViewModel, final Controller controller, final ISubView recordsSubView, final ISubView tracesSubView,
final ISubView failedTracesSubView, final ISubView aggregatedTracesSubView, final ISubView failureContainingTracesSubView, final ISubView subView6,
final ISubView subView7) {
this.dataModel = dataModel;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractAggregatedTracesController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
similarity index 69%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/AbstractAggregatedTracesController.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
index 41f5a7ca16f13e863dc14f11a83feb00eb5de424..f34ee28b28f214e9983b8930a9da2a232de439a9 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractAggregatedTracesController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/AbstractController.java
@@ -10,16 +10,16 @@ import kieker.gui.common.domain.AggregatedExecution;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-public abstract class AbstractAggregatedTracesController implements ISubController, SelectionListener {
+public abstract class AbstractController implements ISubController, SelectionListener {
private final ISubView view;
- private final AggregatedTracesSubViewModel model;
+ private final Model model;
- public AbstractAggregatedTracesController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public AbstractController(final DataModel dataModel, final PropertiesModel propertiesModel) {
final IModel<AggregatedExecution> modelProxy = this.createModelProxy(dataModel);
- this.model = new AggregatedTracesSubViewModel();
+ this.model = new Model();
- this.view = new AggregatedTracesSubView(modelProxy, this.model, propertiesModel, this);
+ this.view = new View(modelProxy, this.model, propertiesModel, this);
}
@Override
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
similarity index 89%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewController.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
index a430026506406c3af3c68a3f8c7fb415954c6ed3..31875aed934c192cc9a01c661b3c47b0f5c0a53e 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/Controller.java
@@ -31,9 +31,9 @@ import org.eclipse.swt.events.SelectionEvent;
*
* @author Nils Christian Ehmke
*/
-public final class AggregatedTracesSubViewController extends AbstractAggregatedTracesController {
+public final class Controller extends AbstractController {
- public AggregatedTracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public Controller(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedFailedTracesSubViewController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
similarity index 88%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedFailedTracesSubViewController.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
index 4dc1e290c9c8af91a104df587b27ad9c468a73ff..851e51f471acf7c436ab91de801ec9d85630cad5 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedFailedTracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailedController.java
@@ -29,9 +29,9 @@ import kieker.gui.common.domain.AggregatedExecution;
*
* @author Nils Christian Ehmke
*/
-public final class AggregatedFailedTracesSubViewController extends AbstractAggregatedTracesController {
+public final class FailedController extends AbstractController {
- public AggregatedFailedTracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public FailedController(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureContainingAggregatedTracesSubViewController.java b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
similarity index 87%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/FailureContainingAggregatedTracesSubViewController.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
index 6f05223865882ebee1470306b8ccd68d60c660e4..3cb98455601bcd447c2f0eecd9c0cd30ac17b320 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/FailureContainingAggregatedTracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/FailureController.java
@@ -29,9 +29,9 @@ import kieker.gui.common.domain.AggregatedExecution;
*
* @author Nils Christian Ehmke
*/
-public final class FailureContainingAggregatedTracesSubViewController extends AbstractAggregatedTracesController {
+public final class FailureController extends AbstractController {
- public FailureContainingAggregatedTracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public FailureController(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewModel.java b/src/main/java/kieker/gui/subview/aggregatedtraces/Model.java
similarity index 94%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewModel.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/Model.java
index d505a8ed3dc75f3dc1ede4464151205bc58fce97..d00c6fdc588afe9996003309877b81c5f3248cca 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubViewModel.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/Model.java
@@ -22,7 +22,7 @@ import java.util.Observable;
import kieker.gui.common.domain.AggregatedExecution;
-public final class AggregatedTracesSubViewModel extends Observable {
+public final class Model extends Observable {
private AggregatedExecution currentActiveTrace;
diff --git a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubView.java b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
similarity index 94%
rename from src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubView.java
rename to src/main/java/kieker/gui/subview/aggregatedtraces/View.java
index 58d2570d00b61514f402ea03e7909b21a4903958..76f6081dff534f82ade2d913cdf0e38e1563d08a 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/AggregatedTracesSubView.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/View.java
@@ -23,8 +23,8 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
import kieker.gui.common.PropertiesModel;
-import kieker.gui.common.TreeColumnSortListener;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.util.TreeColumnSortListener;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionAvgDurationComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionCallComparator;
import kieker.gui.subview.aggregatedtraces.util.AggregatedExecutionMaxDurationComparator;
@@ -50,9 +50,9 @@ import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wb.swt.SWTResourceManager;
-public class AggregatedTracesSubView implements Observer, ISubView {
+public final class View implements Observer, ISubView {
- private final AggregatedTracesSubViewModel aggregatedTracesSubViewModel;
+ private final Model aggregatedTracesSubViewModel;
private final SelectionListener controller;
private final IModel<AggregatedExecution> model;
private Composite composite;
@@ -72,7 +72,7 @@ public class AggregatedTracesSubView implements Observer, ISubView {
private final PropertiesModel propertiesModel;
private Label lblTotalDurationDisplay;
- public AggregatedTracesSubView(final IModel<AggregatedExecution> model, final AggregatedTracesSubViewModel aggregatedTracesSubViewModel, final PropertiesModel propertiesModel,
+ public View(final IModel<AggregatedExecution> model, final Model aggregatedTracesSubViewModel, final PropertiesModel propertiesModel,
final SelectionListener controller) {
this.controller = controller;
this.model = model;
@@ -327,28 +327,28 @@ public class AggregatedTracesSubView implements Observer, ISubView {
}
String componentName = executionEntry.getComponent();
- if (AggregatedTracesSubView.this.propertiesModel.isShortComponentNames()) {
+ if (View.this.propertiesModel.isShortComponentNames()) {
final int lastPointPos = componentName.lastIndexOf('.');
componentName = componentName.substring(lastPointPos + 1);
}
String operationString = executionEntry.getOperation();
- if (AggregatedTracesSubView.this.propertiesModel.isShortOperationNames()) {
+ if (View.this.propertiesModel.isShortOperationNames()) {
operationString = operationString.replaceAll("\\(..*\\)", "(...)");
final int lastPointPos = operationString.lastIndexOf('.', operationString.length() - 5);
operationString = operationString.substring(lastPointPos + 1);
}
- final String minDuration = (Long.toString(executionEntry.getMinDuration()) + " " + AggregatedTracesSubView.this.model.getShortTimeUnit()).trim();
- final String maxDuration = (Long.toString(executionEntry.getMaxDuration()) + " " + AggregatedTracesSubView.this.model.getShortTimeUnit()).trim();
- final String avgDuration = (Long.toString(executionEntry.getAvgDuration()) + " " + AggregatedTracesSubView.this.model.getShortTimeUnit()).trim();
- final String totalDuration = (Long.toString(executionEntry.getTotalDuration()) + " " + AggregatedTracesSubView.this.model.getShortTimeUnit()).trim();
+ final String minDuration = (Long.toString(executionEntry.getMinDuration()) + " " + View.this.model.getShortTimeUnit()).trim();
+ final String maxDuration = (Long.toString(executionEntry.getMaxDuration()) + " " + View.this.model.getShortTimeUnit()).trim();
+ final String avgDuration = (Long.toString(executionEntry.getAvgDuration()) + " " + View.this.model.getShortTimeUnit()).trim();
+ final String totalDuration = (Long.toString(executionEntry.getTotalDuration()) + " " + View.this.model.getShortTimeUnit()).trim();
if (parent != null) {
item.setText(new String[] { executionEntry.getContainer(), componentName, operationString, "", minDuration, avgDuration, maxDuration, totalDuration });
} else {
item.setText(new String[] { executionEntry.getContainer(), componentName, operationString, Integer.toString(executionEntry.getCalls()), minDuration, avgDuration,
- maxDuration, totalDuration });
+ maxDuration, totalDuration });
}
if (executionEntry.isFailed()) {
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 85ea757c9ad79c07c2500fb65a530937462fcb84..a1aaf9922118819db2679dd2ace9ef3e03aa0ff1 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionAvgDurationComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.aggregatedtraces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.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 3efcedbc77a0840b14785dfe1633147cfee1ce02..a396ead27ca8de31b1c2215567edc8b845dab4da 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionCallComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.aggregatedtraces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.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 d8fb45203237a0ec53a26f4641807f77a20b862a..77173fa4692de10af4469efac61547f71ea3f352 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMaxDurationComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.aggregatedtraces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.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 5e7635ad44c187478d24e93748380f88934bbeea..e2e3418ca8f2f42fbbc02f3f450f855cb6382bdd 100644
--- a/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/aggregatedtraces/util/AggregatedExecutionMinDurationComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.aggregatedtraces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.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 6e1662a9c5a5b59d72760d6bfa0ed4401c966bad..5e659300a412a2b5cd10980fff4acc96c2ce87a6 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.AbstractDirectedComparator;
import kieker.gui.common.domain.AggregatedExecution;
+import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/records/RecordsSubViewController.java b/src/main/java/kieker/gui/subview/records/Controller.java
similarity index 89%
rename from src/main/java/kieker/gui/subview/records/RecordsSubViewController.java
rename to src/main/java/kieker/gui/subview/records/Controller.java
index 8181f62071a2fa9efeb80d975f73575c752fdeff..e1083a78a1b4230e697f04a34dec616fbc2e6528 100644
--- a/src/main/java/kieker/gui/subview/records/RecordsSubViewController.java
+++ b/src/main/java/kieker/gui/subview/records/Controller.java
@@ -30,14 +30,14 @@ import kieker.gui.common.domain.Record;
*
* @author Nils Christian Ehmke
*/
-public final class RecordsSubViewController implements ISubController {
+public final class Controller implements ISubController {
private final ISubView view;
- public RecordsSubViewController(final DataModel dataModel) {
+ public Controller(final DataModel dataModel) {
final IModel<Record> modelProxy = new RecordsModelProxy(dataModel);
- this.view = new RecordsSubView(modelProxy, this);
+ this.view = new View(modelProxy, this);
}
@Override
diff --git a/src/main/java/kieker/gui/subview/records/RecordsSubView.java b/src/main/java/kieker/gui/subview/records/View.java
similarity index 95%
rename from src/main/java/kieker/gui/subview/records/RecordsSubView.java
rename to src/main/java/kieker/gui/subview/records/View.java
index 5c6ce782563cd09916c9561c92f21d4a04149fe1..6ad7cb2e8ff3a0a80b0a329833c02dd88ccbf44d 100644
--- a/src/main/java/kieker/gui/subview/records/RecordsSubView.java
+++ b/src/main/java/kieker/gui/subview/records/View.java
@@ -22,8 +22,8 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
-import kieker.gui.common.TableColumnSortListener;
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;
@@ -37,13 +37,13 @@ import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
-public final class RecordsSubView implements Observer, ISubView {
+public final class View implements Observer, ISubView {
private final IModel<Record> model;
private Composite composite;
private Table table;
- public RecordsSubView(final IModel<Record> model, final RecordsSubViewController controller) {
+ public View(final IModel<Record> model, final Controller controller) {
this.model = model;
model.addObserver(this);
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 0d6da9d35bf25434d62f8c7f1464b32ac50a869d..8ace9bdefa2d3e29d7b389a684cf84f6c9e30995 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTimestampComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.records.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.Record;
+import kieker.gui.common.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 bd9989aff679ec6dfaf3ee0d01a9cdbf8e9fed8e..62767844b8b38ff2a244749e002f4fa9b4ce40d3 100644
--- a/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
+++ b/src/main/java/kieker/gui/subview/records/util/RecordTypeComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.records.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.Record;
+import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;
diff --git a/src/main/java/kieker/gui/subview/traces/AbstractTracesController.java b/src/main/java/kieker/gui/subview/traces/AbstractController.java
similarity index 71%
rename from src/main/java/kieker/gui/subview/traces/AbstractTracesController.java
rename to src/main/java/kieker/gui/subview/traces/AbstractController.java
index 0dc369cf763314bdb4383cff49fa9ae2528297e3..81a8776f988f355af63a36a6898d88b6c74cafe3 100644
--- a/src/main/java/kieker/gui/subview/traces/AbstractTracesController.java
+++ b/src/main/java/kieker/gui/subview/traces/AbstractController.java
@@ -10,16 +10,16 @@ import kieker.gui.common.domain.Execution;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-public abstract class AbstractTracesController implements ISubController, SelectionListener {
+public abstract class AbstractController implements ISubController, SelectionListener {
private final ISubView view;
- private final TracesSubViewModel model;
+ private final Model model;
- public AbstractTracesController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public AbstractController(final DataModel dataModel, final PropertiesModel propertiesModel) {
final IModel<Execution> modelProxy = this.createModelProxy(dataModel);
- this.model = new TracesSubViewModel();
+ this.model = new Model();
- this.view = new TracesSubView(modelProxy, this.model, propertiesModel, this);
+ this.view = new View(modelProxy, this.model, propertiesModel, this);
}
@Override
diff --git a/src/main/java/kieker/gui/subview/traces/TracesSubViewController.java b/src/main/java/kieker/gui/subview/traces/Controller.java
similarity index 89%
rename from src/main/java/kieker/gui/subview/traces/TracesSubViewController.java
rename to src/main/java/kieker/gui/subview/traces/Controller.java
index 9d70c15875dea51c19a63d19314d75226938e136..365437e558e72a2915ded46e8c3cc862c17a1119 100644
--- a/src/main/java/kieker/gui/subview/traces/TracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/traces/Controller.java
@@ -29,9 +29,9 @@ import kieker.gui.common.domain.Execution;
*
* @author Nils Christian Ehmke
*/
-public final class TracesSubViewController extends AbstractTracesController {
+public final class Controller extends AbstractController {
- public TracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public Controller(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/traces/FailedTracesSubViewController.java b/src/main/java/kieker/gui/subview/traces/FailedController.java
similarity index 89%
rename from src/main/java/kieker/gui/subview/traces/FailedTracesSubViewController.java
rename to src/main/java/kieker/gui/subview/traces/FailedController.java
index afe316b79e9a5a6dfd23f743a6b5a6361c23c4ab..c9006a30056d91b2da6f798620cfac79edd2f47e 100644
--- a/src/main/java/kieker/gui/subview/traces/FailedTracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailedController.java
@@ -29,9 +29,9 @@ import kieker.gui.common.domain.Execution;
*
* @author Nils Christian Ehmke
*/
-public final class FailedTracesSubViewController extends AbstractTracesController {
+public final class FailedController extends AbstractController {
- public FailedTracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public FailedController(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/traces/FailureContainingTracesSubViewController.java b/src/main/java/kieker/gui/subview/traces/FailureController.java
similarity index 88%
rename from src/main/java/kieker/gui/subview/traces/FailureContainingTracesSubViewController.java
rename to src/main/java/kieker/gui/subview/traces/FailureController.java
index f93a66256c64ab34ab770f3e63da4f79986911d1..daa855d18ae0d736dfb6abf50a93e0cadb24616c 100644
--- a/src/main/java/kieker/gui/subview/traces/FailureContainingTracesSubViewController.java
+++ b/src/main/java/kieker/gui/subview/traces/FailureController.java
@@ -29,9 +29,9 @@ import kieker.gui.common.domain.Execution;
*
* @author Nils Christian Ehmke
*/
-public final class FailureContainingTracesSubViewController extends AbstractTracesController {
+public final class FailureController extends AbstractController {
- public FailureContainingTracesSubViewController(final DataModel dataModel, final PropertiesModel propertiesModel) {
+ public FailureController(final DataModel dataModel, final PropertiesModel propertiesModel) {
super(dataModel, propertiesModel);
}
diff --git a/src/main/java/kieker/gui/subview/traces/TracesSubViewModel.java b/src/main/java/kieker/gui/subview/traces/Model.java
similarity index 95%
rename from src/main/java/kieker/gui/subview/traces/TracesSubViewModel.java
rename to src/main/java/kieker/gui/subview/traces/Model.java
index 2a00dc1c50348f8cb7c796e9f512f11a05145ce1..b51b9997a5a9c37359cdd6503a29057cde958946 100644
--- a/src/main/java/kieker/gui/subview/traces/TracesSubViewModel.java
+++ b/src/main/java/kieker/gui/subview/traces/Model.java
@@ -20,7 +20,7 @@ import java.util.Observable;
import kieker.gui.common.domain.Execution;
-public final class TracesSubViewModel extends Observable {
+public final class Model extends Observable {
private Execution currentActiveTrace;
diff --git a/src/main/java/kieker/gui/subview/traces/TracesSubView.java b/src/main/java/kieker/gui/subview/traces/View.java
similarity index 95%
rename from src/main/java/kieker/gui/subview/traces/TracesSubView.java
rename to src/main/java/kieker/gui/subview/traces/View.java
index 49c391d1f4a4ded297ab2d50dada252ea8b2436f..6f73f2ee4d19afc21ac31e33f9d3d9a8b147e2f7 100644
--- a/src/main/java/kieker/gui/subview/traces/TracesSubView.java
+++ b/src/main/java/kieker/gui/subview/traces/View.java
@@ -23,8 +23,8 @@ import java.util.Observer;
import kieker.gui.common.IModel;
import kieker.gui.common.ISubView;
import kieker.gui.common.PropertiesModel;
-import kieker.gui.common.TreeColumnSortListener;
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.subview.traces.util.ExecutionDurationComparator;
@@ -47,10 +47,10 @@ import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wb.swt.SWTResourceManager;
-public class TracesSubView implements Observer, ISubView {
+public class View implements Observer, ISubView {
private final IModel<Execution> model;
- private final TracesSubViewModel tracesSubViewModel;
+ private final Model tracesSubViewModel;
private final SelectionListener controller;
private Composite composite;
private Tree tree;
@@ -66,7 +66,7 @@ public class TracesSubView implements Observer, ISubView {
private Label lblFailed;
private final PropertiesModel propertiesModel;
- public TracesSubView(final IModel<Execution> model, final TracesSubViewModel tracesSubViewModel, final PropertiesModel propertiesModel, final SelectionListener controller) {
+ public View(final IModel<Execution> model, final Model tracesSubViewModel, final PropertiesModel propertiesModel, final SelectionListener controller) {
this.model = model;
this.propertiesModel = propertiesModel;
this.tracesSubViewModel = tracesSubViewModel;
@@ -289,18 +289,18 @@ public class TracesSubView implements Observer, ISubView {
}
String componentName = executionEntry.getComponent();
- if (TracesSubView.this.propertiesModel.isShortComponentNames()) {
+ if (View.this.propertiesModel.isShortComponentNames()) {
final int lastPointPos = componentName.lastIndexOf('.');
componentName = componentName.substring(lastPointPos + 1);
}
String operationString = executionEntry.getOperation();
- if (TracesSubView.this.propertiesModel.isShortOperationNames()) {
+ if (View.this.propertiesModel.isShortOperationNames()) {
operationString = operationString.replaceAll("\\(..*\\)", "(...)");
final int lastPointPos = operationString.lastIndexOf('.', operationString.length() - 5);
operationString = operationString.substring(lastPointPos + 1);
}
- final String duration = (Long.toString(executionEntry.getDuration()) + " " + TracesSubView.this.model.getShortTimeUnit()).trim();
+ final String duration = (Long.toString(executionEntry.getDuration()) + " " + View.this.model.getShortTimeUnit()).trim();
item.setText(new String[] { executionEntry.getContainer(), componentName, operationString, duration, String.format("%.1f%%", executionEntry.getPercent()), traceID });
if (executionEntry.isFailed()) {
diff --git a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
index 7717cfa71df62aeaf061dfa53342c3d32be1f7c0..a5e6cab9b3639105b708033bc9060b6f33a0fc2c 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionComponentComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.traces.util;
-import kieker.gui.common.AbstractDirectedComparator;
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/traces/util/ExecutionContainerComparator.java
index 9e1c1b00ad89daeb738a2671fd15e518a6320f69..ba1c5fbe0a39f74486bc343f6f6546902dfcb066 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionContainerComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.traces.util;
-import kieker.gui.common.AbstractDirectedComparator;
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/ExecutionDurationComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
index a9d00945958ba9e17f0e92377aea723247657136..2a4f44845621ae1bdf391669b152fad10d2f6142 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionDurationComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.traces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.Execution;
+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/traces/util/ExecutionOperationComparator.java
index 8898978c6df34c183fbba5ee24544cf287b5982f..90b199cda670eed9048447131afc05a276a0a6cf 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionOperationComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.traces.util;
-import kieker.gui.common.AbstractDirectedComparator;
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/ExecutionTraceIDComparator.java b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
index 58b83111de1a72caf73c99c05ef62d226db2c6e8..7f46022dc45f28c374faba3794de786ba428ee3e 100644
--- a/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
+++ b/src/main/java/kieker/gui/subview/traces/util/ExecutionTraceIDComparator.java
@@ -16,8 +16,8 @@
package kieker.gui.subview.traces.util;
-import kieker.gui.common.AbstractDirectedComparator;
import kieker.gui.common.domain.Execution;
+import kieker.gui.common.util.AbstractDirectedComparator;
import org.eclipse.swt.SWT;