From 97e3cdc10201e0f9d152e1b5ec2be08690ccccb6 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Tue, 16 Dec 2014 15:27:41 +0100
Subject: [PATCH] Added some comparators; Renamed some files
---
.../gui/view/AggregatedTracesSubView.java | 18 +++++++++-
.../java/kieker/gui/view/RecordsSubView.java | 10 +++---
.../java/kieker/gui/view/TracesSubView.java | 20 +++++------
...regatedExecutionAvgDurationComparator.java | 35 +++++++++++++++++++
.../AggregatedExecutionCallComparator.java | 35 +++++++++++++++++++
...regatedExecutionMaxDurationComparator.java | 35 +++++++++++++++++++
...regatedExecutionMinDurationComparator.java | 35 +++++++++++++++++++
...java => ExecutionComponentComparator.java} | 9 +++--
...java => ExecutionContainerComparator.java} | 9 +++--
....java => ExecutionDurationComparator.java} | 2 +-
...java => ExecutionOperationComparator.java} | 9 +++--
...r.java => ExecutionTraceIDComparator.java} | 2 +-
...or.java => RecordTimestampComparator.java} | 2 +-
...parator.java => RecordTypeComparator.java} | 2 +-
14 files changed, 188 insertions(+), 35 deletions(-)
create mode 100644 src/main/java/kieker/gui/view/util/AggregatedExecutionAvgDurationComparator.java
create mode 100644 src/main/java/kieker/gui/view/util/AggregatedExecutionCallComparator.java
create mode 100644 src/main/java/kieker/gui/view/util/AggregatedExecutionMaxDurationComparator.java
create mode 100644 src/main/java/kieker/gui/view/util/AggregatedExecutionMinDurationComparator.java
rename src/main/java/kieker/gui/view/util/{ExecutionEntryComponentComparator.java => ExecutionComponentComparator.java} (75%)
rename src/main/java/kieker/gui/view/util/{ExecutionEntryContainerComparator.java => ExecutionContainerComparator.java} (75%)
rename src/main/java/kieker/gui/view/util/{ExecutionEntryDurationComparator.java => ExecutionDurationComparator.java} (92%)
rename src/main/java/kieker/gui/view/util/{ExecutionEntryOperationComparator.java => ExecutionOperationComparator.java} (75%)
rename src/main/java/kieker/gui/view/util/{ExecutionEntryTraceIDComparator.java => ExecutionTraceIDComparator.java} (92%)
rename src/main/java/kieker/gui/view/util/{RecordEntryTimestampComparator.java => RecordTimestampComparator.java} (92%)
rename src/main/java/kieker/gui/view/util/{RecordEntryTypeComparator.java => RecordTypeComparator.java} (92%)
diff --git a/src/main/java/kieker/gui/view/AggregatedTracesSubView.java b/src/main/java/kieker/gui/view/AggregatedTracesSubView.java
index 0ffb1b15..08f0c25e 100644
--- a/src/main/java/kieker/gui/view/AggregatedTracesSubView.java
+++ b/src/main/java/kieker/gui/view/AggregatedTracesSubView.java
@@ -25,6 +25,14 @@ import kieker.gui.model.AggregatedTracesSubViewModel;
import kieker.gui.model.DataModel;
import kieker.gui.model.PropertiesModel;
import kieker.gui.model.domain.AggregatedExecution;
+import kieker.gui.view.util.AggregatedExecutionAvgDurationComparator;
+import kieker.gui.view.util.AggregatedExecutionCallComparator;
+import kieker.gui.view.util.AggregatedExecutionMaxDurationComparator;
+import kieker.gui.view.util.AggregatedExecutionMinDurationComparator;
+import kieker.gui.view.util.ExecutionComponentComparator;
+import kieker.gui.view.util.ExecutionContainerComparator;
+import kieker.gui.view.util.ExecutionOperationComparator;
+import kieker.gui.view.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
@@ -206,6 +214,14 @@ public class AggregatedTracesSubView implements Observer, ISubView {
this.tree.addSelectionListener(this.controller);
this.tree.addListener(SWT.SetData, new DataProvider());
+
+ trclmnExecutionContainer.addSelectionListener(new TreeColumnSortListener<>(new ExecutionContainerComparator()));
+ trclmnComponent.addSelectionListener(new TreeColumnSortListener<>(new ExecutionComponentComparator()));
+ trclmnOperation.addSelectionListener(new TreeColumnSortListener<>(new ExecutionOperationComparator()));
+ trclmnMinimalDuration.addSelectionListener(new TreeColumnSortListener<>(new AggregatedExecutionMinDurationComparator()));
+ trclmnMaximalDuration.addSelectionListener(new TreeColumnSortListener<>(new AggregatedExecutionMaxDurationComparator()));
+ trclmnAverageDuration.addSelectionListener(new TreeColumnSortListener<>(new AggregatedExecutionAvgDurationComparator()));
+ trclmnCalls.addSelectionListener(new TreeColumnSortListener<>(new AggregatedExecutionCallComparator()));
}
@Override
@@ -314,7 +330,7 @@ public class AggregatedTracesSubView implements Observer, ISubView {
item.setText(new String[] { executionEntry.getContainer(), componentName, operationString, "", minDuration, avgDuration, maxDuration });
} else {
item.setText(new String[] { executionEntry.getContainer(), componentName, operationString, Integer.toString(executionEntry.getCalls()), minDuration, avgDuration,
- maxDuration });
+ maxDuration });
}
if (executionEntry.isFailed()) {
diff --git a/src/main/java/kieker/gui/view/RecordsSubView.java b/src/main/java/kieker/gui/view/RecordsSubView.java
index b216ab6f..b9904e5a 100644
--- a/src/main/java/kieker/gui/view/RecordsSubView.java
+++ b/src/main/java/kieker/gui/view/RecordsSubView.java
@@ -23,8 +23,8 @@ import java.util.Observer;
import kieker.gui.controller.RecordsSubViewController;
import kieker.gui.model.DataModel;
import kieker.gui.model.domain.Record;
-import kieker.gui.view.util.RecordEntryTimestampComparator;
-import kieker.gui.view.util.RecordEntryTypeComparator;
+import kieker.gui.view.util.RecordTimestampComparator;
+import kieker.gui.view.util.RecordTypeComparator;
import kieker.gui.view.util.TableColumnSortListener;
import org.eclipse.jface.viewers.TableViewer;
@@ -80,9 +80,9 @@ public final class RecordsSubView implements Observer, ISubView {
this.table.addListener(SWT.SetData, new DataProvider());
- tblclmnTimestamp.addSelectionListener(new TableColumnSortListener<>(new RecordEntryTimestampComparator()));
- tblclmnRecordType.addSelectionListener(new TableColumnSortListener<>(new RecordEntryTypeComparator()));
- tblclmnRecordContent.addSelectionListener(new TableColumnSortListener<>(new RecordEntryTimestampComparator()));
+ tblclmnTimestamp.addSelectionListener(new TableColumnSortListener<>(new RecordTimestampComparator()));
+ tblclmnRecordType.addSelectionListener(new TableColumnSortListener<>(new RecordTypeComparator()));
+ tblclmnRecordContent.addSelectionListener(new TableColumnSortListener<>(new RecordTimestampComparator()));
}
public Table getTable() {
diff --git a/src/main/java/kieker/gui/view/TracesSubView.java b/src/main/java/kieker/gui/view/TracesSubView.java
index 565d79a4..6183c75d 100644
--- a/src/main/java/kieker/gui/view/TracesSubView.java
+++ b/src/main/java/kieker/gui/view/TracesSubView.java
@@ -24,11 +24,11 @@ import kieker.gui.model.DataModel;
import kieker.gui.model.PropertiesModel;
import kieker.gui.model.TracesSubViewModel;
import kieker.gui.model.domain.Execution;
-import kieker.gui.view.util.ExecutionEntryComponentComparator;
-import kieker.gui.view.util.ExecutionEntryContainerComparator;
-import kieker.gui.view.util.ExecutionEntryDurationComparator;
-import kieker.gui.view.util.ExecutionEntryOperationComparator;
-import kieker.gui.view.util.ExecutionEntryTraceIDComparator;
+import kieker.gui.view.util.ExecutionComponentComparator;
+import kieker.gui.view.util.ExecutionContainerComparator;
+import kieker.gui.view.util.ExecutionDurationComparator;
+import kieker.gui.view.util.ExecutionOperationComparator;
+import kieker.gui.view.util.ExecutionTraceIDComparator;
import kieker.gui.view.util.TreeColumnSortListener;
import org.eclipse.swt.SWT;
@@ -196,11 +196,11 @@ public class TracesSubView implements Observer, ISubView {
this.tree.addSelectionListener(this.controller);
this.tree.addListener(SWT.SetData, new DataProvider());
- trclmnExecutionContainer.addSelectionListener(new TreeColumnSortListener<>(new ExecutionEntryContainerComparator()));
- trclmnComponent.addSelectionListener(new TreeColumnSortListener<>(new ExecutionEntryComponentComparator()));
- trclmnOperation.addSelectionListener(new TreeColumnSortListener<>(new ExecutionEntryOperationComparator()));
- trclmnDuration.addSelectionListener(new TreeColumnSortListener<>(new ExecutionEntryDurationComparator()));
- trclmnTraceId.addSelectionListener(new TreeColumnSortListener<>(new ExecutionEntryTraceIDComparator()));
+ trclmnExecutionContainer.addSelectionListener(new TreeColumnSortListener<>(new ExecutionContainerComparator()));
+ trclmnComponent.addSelectionListener(new TreeColumnSortListener<>(new ExecutionComponentComparator()));
+ trclmnOperation.addSelectionListener(new TreeColumnSortListener<>(new ExecutionOperationComparator()));
+ trclmnDuration.addSelectionListener(new TreeColumnSortListener<>(new ExecutionDurationComparator()));
+ trclmnTraceId.addSelectionListener(new TreeColumnSortListener<>(new ExecutionTraceIDComparator()));
}
public Tree getTree() {
diff --git a/src/main/java/kieker/gui/view/util/AggregatedExecutionAvgDurationComparator.java b/src/main/java/kieker/gui/view/util/AggregatedExecutionAvgDurationComparator.java
new file mode 100644
index 00000000..4ad8a57c
--- /dev/null
+++ b/src/main/java/kieker/gui/view/util/AggregatedExecutionAvgDurationComparator.java
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.gui.view.util;
+
+import kieker.gui.model.domain.AggregatedExecution;
+
+import org.eclipse.swt.SWT;
+
+public class AggregatedExecutionAvgDurationComparator extends AbstractDirectedComparator<AggregatedExecution> {
+
+ @Override
+ public int compare(final AggregatedExecution arg0, final AggregatedExecution arg1) {
+ int result = Long.compare(arg0.getAvgDuration(), arg1.getAvgDuration());
+ if (this.getDirection() == SWT.UP) {
+ result = -result;
+ }
+ return result;
+
+ }
+
+}
diff --git a/src/main/java/kieker/gui/view/util/AggregatedExecutionCallComparator.java b/src/main/java/kieker/gui/view/util/AggregatedExecutionCallComparator.java
new file mode 100644
index 00000000..74a4a0bc
--- /dev/null
+++ b/src/main/java/kieker/gui/view/util/AggregatedExecutionCallComparator.java
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.gui.view.util;
+
+import kieker.gui.model.domain.AggregatedExecution;
+
+import org.eclipse.swt.SWT;
+
+public class AggregatedExecutionCallComparator extends AbstractDirectedComparator<AggregatedExecution> {
+
+ @Override
+ public int compare(final AggregatedExecution arg0, final AggregatedExecution arg1) {
+ int result = Long.compare(arg0.getCalls(), arg1.getCalls());
+ if (this.getDirection() == SWT.UP) {
+ result = -result;
+ }
+ return result;
+
+ }
+
+}
diff --git a/src/main/java/kieker/gui/view/util/AggregatedExecutionMaxDurationComparator.java b/src/main/java/kieker/gui/view/util/AggregatedExecutionMaxDurationComparator.java
new file mode 100644
index 00000000..8b3a4825
--- /dev/null
+++ b/src/main/java/kieker/gui/view/util/AggregatedExecutionMaxDurationComparator.java
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.gui.view.util;
+
+import kieker.gui.model.domain.AggregatedExecution;
+
+import org.eclipse.swt.SWT;
+
+public class AggregatedExecutionMaxDurationComparator extends AbstractDirectedComparator<AggregatedExecution> {
+
+ @Override
+ public int compare(final AggregatedExecution arg0, final AggregatedExecution arg1) {
+ int result = Long.compare(arg0.getMaxDuration(), arg1.getMaxDuration());
+ if (this.getDirection() == SWT.UP) {
+ result = -result;
+ }
+ return result;
+
+ }
+
+}
diff --git a/src/main/java/kieker/gui/view/util/AggregatedExecutionMinDurationComparator.java b/src/main/java/kieker/gui/view/util/AggregatedExecutionMinDurationComparator.java
new file mode 100644
index 00000000..3f2bf7a4
--- /dev/null
+++ b/src/main/java/kieker/gui/view/util/AggregatedExecutionMinDurationComparator.java
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright 2014 Kieker Project (http://kieker-monitoring.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ***************************************************************************/
+
+package kieker.gui.view.util;
+
+import kieker.gui.model.domain.AggregatedExecution;
+
+import org.eclipse.swt.SWT;
+
+public class AggregatedExecutionMinDurationComparator extends AbstractDirectedComparator<AggregatedExecution> {
+
+ @Override
+ public int compare(final AggregatedExecution arg0, final AggregatedExecution arg1) {
+ int result = Long.compare(arg0.getMinDuration(), arg1.getMinDuration());
+ if (this.getDirection() == SWT.UP) {
+ result = -result;
+ }
+ return result;
+
+ }
+
+}
diff --git a/src/main/java/kieker/gui/view/util/ExecutionEntryComponentComparator.java b/src/main/java/kieker/gui/view/util/ExecutionComponentComparator.java
similarity index 75%
rename from src/main/java/kieker/gui/view/util/ExecutionEntryComponentComparator.java
rename to src/main/java/kieker/gui/view/util/ExecutionComponentComparator.java
index 26916ebd..b308ed1a 100644
--- a/src/main/java/kieker/gui/view/util/ExecutionEntryComponentComparator.java
+++ b/src/main/java/kieker/gui/view/util/ExecutionComponentComparator.java
@@ -16,20 +16,19 @@
package kieker.gui.view.util;
-import kieker.gui.model.domain.Execution;
+import kieker.gui.model.domain.AbstractExecution;
import org.eclipse.swt.SWT;
-public class ExecutionEntryComponentComparator extends AbstractDirectedComparator<Execution> {
+public class ExecutionComponentComparator extends AbstractDirectedComparator<AbstractExecution<?>> {
@Override
- public int compare(final Execution arg0, final Execution arg1) {
- int result = arg0.getComponent().compareTo(arg1.getOperation());
+ public int compare(final AbstractExecution<?> fst, final AbstractExecution<?> snd) {
+ int result = fst.getComponent().compareTo(snd.getComponent());
if (this.getDirection() == SWT.UP) {
result = -result;
}
return result;
-
}
}
diff --git a/src/main/java/kieker/gui/view/util/ExecutionEntryContainerComparator.java b/src/main/java/kieker/gui/view/util/ExecutionContainerComparator.java
similarity index 75%
rename from src/main/java/kieker/gui/view/util/ExecutionEntryContainerComparator.java
rename to src/main/java/kieker/gui/view/util/ExecutionContainerComparator.java
index 12b175e5..c1b0516a 100644
--- a/src/main/java/kieker/gui/view/util/ExecutionEntryContainerComparator.java
+++ b/src/main/java/kieker/gui/view/util/ExecutionContainerComparator.java
@@ -16,20 +16,19 @@
package kieker.gui.view.util;
-import kieker.gui.model.domain.Execution;
+import kieker.gui.model.domain.AbstractExecution;
import org.eclipse.swt.SWT;
-public class ExecutionEntryContainerComparator extends AbstractDirectedComparator<Execution> {
+public class ExecutionContainerComparator extends AbstractDirectedComparator<AbstractExecution<?>> {
@Override
- public int compare(final Execution arg0, final Execution arg1) {
- int result = arg0.getContainer().compareTo(arg1.getContainer());
+ public int compare(final AbstractExecution<?> fst, final AbstractExecution<?> snd) {
+ int result = fst.getContainer().compareTo(snd.getContainer());
if (this.getDirection() == SWT.UP) {
result = -result;
}
return result;
-
}
}
diff --git a/src/main/java/kieker/gui/view/util/ExecutionEntryDurationComparator.java b/src/main/java/kieker/gui/view/util/ExecutionDurationComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/view/util/ExecutionEntryDurationComparator.java
rename to src/main/java/kieker/gui/view/util/ExecutionDurationComparator.java
index 34c739f7..2e566209 100644
--- a/src/main/java/kieker/gui/view/util/ExecutionEntryDurationComparator.java
+++ b/src/main/java/kieker/gui/view/util/ExecutionDurationComparator.java
@@ -20,7 +20,7 @@ import kieker.gui.model.domain.Execution;
import org.eclipse.swt.SWT;
-public class ExecutionEntryDurationComparator extends AbstractDirectedComparator<Execution> {
+public class ExecutionDurationComparator extends AbstractDirectedComparator<Execution> {
@Override
public int compare(final Execution arg0, final Execution arg1) {
diff --git a/src/main/java/kieker/gui/view/util/ExecutionEntryOperationComparator.java b/src/main/java/kieker/gui/view/util/ExecutionOperationComparator.java
similarity index 75%
rename from src/main/java/kieker/gui/view/util/ExecutionEntryOperationComparator.java
rename to src/main/java/kieker/gui/view/util/ExecutionOperationComparator.java
index 40990707..1a0f2e66 100644
--- a/src/main/java/kieker/gui/view/util/ExecutionEntryOperationComparator.java
+++ b/src/main/java/kieker/gui/view/util/ExecutionOperationComparator.java
@@ -16,20 +16,19 @@
package kieker.gui.view.util;
-import kieker.gui.model.domain.Execution;
+import kieker.gui.model.domain.AbstractExecution;
import org.eclipse.swt.SWT;
-public class ExecutionEntryOperationComparator extends AbstractDirectedComparator<Execution> {
+public class ExecutionOperationComparator extends AbstractDirectedComparator<AbstractExecution<?>> {
@Override
- public int compare(final Execution arg0, final Execution arg1) {
- int result = arg0.getOperation().compareTo(arg1.getOperation());
+ public int compare(final AbstractExecution<?> fst, final AbstractExecution<?> snd) {
+ int result = fst.getOperation().compareTo(snd.getOperation());
if (this.getDirection() == SWT.UP) {
result = -result;
}
return result;
-
}
}
diff --git a/src/main/java/kieker/gui/view/util/ExecutionEntryTraceIDComparator.java b/src/main/java/kieker/gui/view/util/ExecutionTraceIDComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/view/util/ExecutionEntryTraceIDComparator.java
rename to src/main/java/kieker/gui/view/util/ExecutionTraceIDComparator.java
index 24ec256e..ea31cb39 100644
--- a/src/main/java/kieker/gui/view/util/ExecutionEntryTraceIDComparator.java
+++ b/src/main/java/kieker/gui/view/util/ExecutionTraceIDComparator.java
@@ -20,7 +20,7 @@ import kieker.gui.model.domain.Execution;
import org.eclipse.swt.SWT;
-public class ExecutionEntryTraceIDComparator extends AbstractDirectedComparator<Execution> {
+public class ExecutionTraceIDComparator extends AbstractDirectedComparator<Execution> {
@Override
public int compare(final Execution arg0, final Execution arg1) {
diff --git a/src/main/java/kieker/gui/view/util/RecordEntryTimestampComparator.java b/src/main/java/kieker/gui/view/util/RecordTimestampComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/view/util/RecordEntryTimestampComparator.java
rename to src/main/java/kieker/gui/view/util/RecordTimestampComparator.java
index 8abeb9ef..36e10c0d 100644
--- a/src/main/java/kieker/gui/view/util/RecordEntryTimestampComparator.java
+++ b/src/main/java/kieker/gui/view/util/RecordTimestampComparator.java
@@ -20,7 +20,7 @@ import kieker.gui.model.domain.Record;
import org.eclipse.swt.SWT;
-public class RecordEntryTimestampComparator extends AbstractDirectedComparator<Record> {
+public class RecordTimestampComparator extends AbstractDirectedComparator<Record> {
@Override
public int compare(final Record o1, final Record o2) {
diff --git a/src/main/java/kieker/gui/view/util/RecordEntryTypeComparator.java b/src/main/java/kieker/gui/view/util/RecordTypeComparator.java
similarity index 92%
rename from src/main/java/kieker/gui/view/util/RecordEntryTypeComparator.java
rename to src/main/java/kieker/gui/view/util/RecordTypeComparator.java
index efa3cd16..92055188 100644
--- a/src/main/java/kieker/gui/view/util/RecordEntryTypeComparator.java
+++ b/src/main/java/kieker/gui/view/util/RecordTypeComparator.java
@@ -20,7 +20,7 @@ import kieker.gui.model.domain.Record;
import org.eclipse.swt.SWT;
-public class RecordEntryTypeComparator extends AbstractDirectedComparator<Record> {
+public class RecordTypeComparator extends AbstractDirectedComparator<Record> {
@Override
public int compare(final Record o1, final Record o2) {
--
GitLab