diff --git a/.gitignore b/.gitignore index 929d53bf21e45076aa534bbcb3b875eed49086a1..077661508ab0ed479ff5b9affc2b09b3ab1a9322 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /.project /.settings/org.eclipse.jdt.core.prefs /bin/ +/build diff --git a/testdata/kieker-20141008-101258830-UTC-000-Thread-1.dat b/example monitoring logs/kieker-20141008-101258830-UTC-000-Thread-1.dat similarity index 100% rename from testdata/kieker-20141008-101258830-UTC-000-Thread-1.dat rename to example monitoring logs/kieker-20141008-101258830-UTC-000-Thread-1.dat diff --git a/testdata/kieker.map b/example monitoring logs/kieker.map similarity index 100% rename from testdata/kieker.map rename to example monitoring logs/kieker.map diff --git a/src/main/java/kieker/gui/model/domain/ExecutionEntry.java b/src/main/java/kieker/gui/model/domain/ExecutionEntry.java index e3fb7e1e4a79a0fe09c17ce2ab9262aea4315ad2..ff5de283e4d5196c4ab1d60af525079d12383d46 100644 --- a/src/main/java/kieker/gui/model/domain/ExecutionEntry.java +++ b/src/main/java/kieker/gui/model/domain/ExecutionEntry.java @@ -67,8 +67,6 @@ public final class ExecutionEntry { public void setDuration(final long duration) { this.duration = duration; - - this.updatePercent(); } public boolean isFailed() { @@ -106,23 +104,22 @@ public final class ExecutionEntry { public void addExecutionEntry(final ExecutionEntry entry) { this.children.add(entry); entry.parent = this; - - this.updatePercent(); } public ExecutionEntry getParent() { return this.parent; } + public void recalculateValues() { + this.updatePercent(); + } + private void updatePercent() { if (this.parent != null) { this.percent = (this.duration * 100.0f) / this.parent.duration; } else { this.percent = 100.0f; } - for (final ExecutionEntry child : this.children) { - child.updatePercent(); - } } @Override diff --git a/src/main/java/kieker/gui/model/importer/filter/TraceReconstructor.java b/src/main/java/kieker/gui/model/importer/filter/TraceReconstructor.java index c7058aafe344c14ffcf4124f3d6661b067a31ce4..815b79fb2f2df96f305e36c94607f4959a0a14df 100644 --- a/src/main/java/kieker/gui/model/importer/filter/TraceReconstructor.java +++ b/src/main/java/kieker/gui/model/importer/filter/TraceReconstructor.java @@ -117,6 +117,7 @@ public final class TraceReconstructor extends AbstractConsumerStage<IFlowRecord> } public ExecutionEntry reconstructTrace() { + this.root.recalculateValues(); return this.root; } diff --git a/src/main/java/kieker/gui/view/MainWindow.java b/src/main/java/kieker/gui/view/MainWindow.java index 87206fca54c892245eaf797a4c90738f209c58e5..a092d254e73993c49b862e4abd4b35639b78e8b9 100644 --- a/src/main/java/kieker/gui/view/MainWindow.java +++ b/src/main/java/kieker/gui/view/MainWindow.java @@ -120,7 +120,6 @@ public final class MainWindow { final Display display = Display.getDefault(); this.createContents(); this.addLogic(); - DataSource.getInstance().loadMonitoringLogFromFS("testdata"); this.shell.open(); this.shell.layout(); while (!this.shell.isDisposed()) {