From a2f1675c73f70c1727e34c14d25e6fc207b7c7ba Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 17 Dec 2014 16:46:27 +0100
Subject: [PATCH] Refactoring
---
src/main/java/kieker/gui/Main.java | 4 +--
.../AbstractDirectedComparator.java | 2 +-
.../{ => util}/TableColumnSortListener.java | 2 +-
.../{ => util}/TreeColumnSortListener.java | 2 +-
...ainViewController.java => Controller.java} | 35 ++++++++-----------
.../{MainViewModel.java => Model.java} | 2 +-
.../gui/mainview/{MainView.java => View.java} | 8 ++---
...ontroller.java => AbstractController.java} | 10 +++---
...SubViewController.java => Controller.java} | 4 +--
...wController.java => FailedController.java} | 4 +--
...Controller.java => FailureController.java} | 4 +--
...atedTracesSubViewModel.java => Model.java} | 2 +-
...AggregatedTracesSubView.java => View.java} | 22 ++++++------
...regatedExecutionAvgDurationComparator.java | 2 +-
.../AggregatedExecutionCallComparator.java | 2 +-
...regatedExecutionMaxDurationComparator.java | 2 +-
...regatedExecutionMinDurationComparator.java | 2 +-
...gatedExecutionTotalDurationComparator.java | 2 +-
...SubViewController.java => Controller.java} | 6 ++--
.../{RecordsSubView.java => View.java} | 6 ++--
.../util/RecordTimestampComparator.java | 2 +-
.../records/util/RecordTypeComparator.java | 2 +-
...ontroller.java => AbstractController.java} | 10 +++---
...SubViewController.java => Controller.java} | 4 +--
...wController.java => FailedController.java} | 4 +--
...Controller.java => FailureController.java} | 4 +--
.../{TracesSubViewModel.java => Model.java} | 2 +-
.../traces/{TracesSubView.java => View.java} | 14 ++++----
.../util/ExecutionComponentComparator.java | 2 +-
.../util/ExecutionContainerComparator.java | 2 +-
.../util/ExecutionDurationComparator.java | 2 +-
.../util/ExecutionOperationComparator.java | 2 +-
.../util/ExecutionTraceIDComparator.java | 2 +-
33 files changed, 84 insertions(+), 91 deletions(-)
rename src/main/java/kieker/gui/common/{ => util}/AbstractDirectedComparator.java (97%)
rename src/main/java/kieker/gui/common/{ => util}/TableColumnSortListener.java (98%)
rename src/main/java/kieker/gui/common/{ => util}/TreeColumnSortListener.java (98%)
rename src/main/java/kieker/gui/mainview/{MainViewController.java => Controller.java} (72%)
rename src/main/java/kieker/gui/mainview/{MainViewModel.java => Model.java} (96%)
rename src/main/java/kieker/gui/mainview/{MainView.java => View.java} (96%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{AbstractAggregatedTracesController.java => AbstractController.java} (69%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{AggregatedTracesSubViewController.java => Controller.java} (89%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{AggregatedFailedTracesSubViewController.java => FailedController.java} (88%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{FailureContainingAggregatedTracesSubViewController.java => FailureController.java} (87%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{AggregatedTracesSubViewModel.java => Model.java} (94%)
rename src/main/java/kieker/gui/subview/aggregatedtraces/{AggregatedTracesSubView.java => View.java} (94%)
rename src/main/java/kieker/gui/subview/records/{RecordsSubViewController.java => Controller.java} (89%)
rename src/main/java/kieker/gui/subview/records/{RecordsSubView.java => View.java} (95%)
rename src/main/java/kieker/gui/subview/traces/{AbstractTracesController.java => AbstractController.java} (71%)
rename src/main/java/kieker/gui/subview/traces/{TracesSubViewController.java => Controller.java} (89%)
rename src/main/java/kieker/gui/subview/traces/{FailedTracesSubViewController.java => FailedController.java} (89%)
rename src/main/java/kieker/gui/subview/traces/{FailureContainingTracesSubViewController.java => FailureController.java} (88%)
rename src/main/java/kieker/gui/subview/traces/{TracesSubViewModel.java => Model.java} (95%)
rename src/main/java/kieker/gui/subview/traces/{TracesSubView.java => View.java} (95%)
diff --git a/src/main/java/kieker/gui/Main.java b/src/main/java/kieker/gui/Main.java
index 95c43610..48048b68 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 9f0f10e9..a7d31f93 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 29e81abc..60dd5ed6 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 76a318cc..bff0ec61 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 c265b005..d7e9273b 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 f79ee70d..9d9751d0 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 64c72819..1b8f03e1 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 41f5a7ca..f34ee28b 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 a4300265..31875aed 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 4dc1e290..851e51f4 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 6f052238..3cb98455 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 d505a8ed..d00c6fdc 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 58d2570d..76f6081d 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 85ea757c..a1aaf992 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 3efcedbc..a396ead2 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 d8fb4520..77173fa4 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 5e7635ad..e2e3418c 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 6e1662a9..5e659300 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 8181f620..e1083a78 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 5c6ce782..6ad7cb2e 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 0d6da9d3..8ace9bde 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 bd9989af..62767844 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 0dc369cf..81a8776f 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 9d70c158..365437e5 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 afe316b7..c9006a30 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 f93a6625..daa855d1 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 2a00dc1c..b51b9997 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 49c391d1..6f73f2ee 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 7717cfa7..a5e6cab9 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 9e1c1b00..ba1c5fbe 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 a9d00945..2a4f4484 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 8898978c..90b199cd 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 58b83111..7f46022d 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;
--
GitLab