diff --git a/Kieker.WebGUI/bin/data/Timer-Counter-Example/Timer-Counter-Example.kax b/Kieker.WebGUI/bin/data/Timer-Counter-Example/Timer-Counter-Example.kax
index 79c0ac2ce3f5a8bc16847b4cc2bbb48c7d8432b2..4430926057a278957a0981ffdba4f98ccb88c87f 100644
--- a/Kieker.WebGUI/bin/data/Timer-Counter-Example/Timer-Counter-Example.kax
+++ b/Kieker.WebGUI/bin/data/Timer-Counter-Example/Timer-Counter-Example.kax
@@ -4,20 +4,8 @@
<properties name="updateIntervalNS" value="2000000000"/>
<properties name="delayNS" value="0"/>
<properties name="blockingRead" value="true"/>
- <outputPorts name="timestamps" subscribers="//@plugins.1/@inputPorts.0"/>
- <outputPorts name="timestampRecords" subscribers="//@plugins.2/@inputPorts.0"/>
- </plugins>
- <plugins xsi:type="Filter" name="CountingFilter" classname="kieker.analysis.plugin.filter.forward.CountingFilter">
- <outputPorts name="relayedEvents" subscribers="//@plugins.4/@inputPorts.0"/>
- <outputPorts name="currentEventCount"/>
- <displays name="Counter Display"/>
- <inputPorts name="inputEvents"/>
- </plugins>
- <plugins xsi:type="Filter" name="CountingFilter" classname="kieker.analysis.plugin.filter.forward.CountingFilter">
- <outputPorts name="relayedEvents" subscribers="//@plugins.3/@inputPorts.0"/>
- <outputPorts name="currentEventCount"/>
- <displays name="Counter Display"/>
- <inputPorts name="inputEvents"/>
+ <outputPorts name="timestamps" subscribers="//@plugins.4/@inputPorts.0"/>
+ <outputPorts name="timestampRecords" subscribers="//@plugins.3/@inputPorts.0"/>
</plugins>
<plugins xsi:type="Filter" name="TeeFilter" classname="kieker.analysis.plugin.filter.forward.TeeFilter">
<properties name="stream" value="STDOUT"/>
@@ -31,9 +19,26 @@
<outputPorts name="relayedEvents"/>
<inputPorts name="receivedEvents"/>
</plugins>
+ <plugins xsi:type="Filter" name="CountingFilter" classname="kieker.analysis.plugin.filter.forward.CountingFilter">
+ <outputPorts name="relayedEvents" subscribers="//@plugins.2/@inputPorts.0"/>
+ <outputPorts name="currentEventCount"/>
+ <displays name="Visual Counter Display"/>
+ <displays name="Counter Display"/>
+ <displays name="Plot Counter Display"/>
+ <inputPorts name="inputEvents"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="CountingFilter" classname="kieker.analysis.plugin.filter.forward.CountingFilter">
+ <outputPorts name="relayedEvents" subscribers="//@plugins.1/@inputPorts.0"/>
+ <outputPorts name="currentEventCount"/>
+ <displays name="Visual Counter Display"/>
+ <displays name="Counter Display"/>
+ <displays name="Plot Counter Display"/>
+ <inputPorts name="inputEvents"/>
+ </plugins>
<views name="Counter View" description="No description available.">
- <displayConnectors name="Display 0" display="//@plugins.1/@displays.0"/>
- <displayConnectors name="Display 1" display="//@plugins.2/@displays.0"/>
+ <displayConnectors name="Visual Display" display="//@plugins.3/@displays.0"/>
+ <displayConnectors name="Text Display" display="//@plugins.3/@displays.1"/>
+ <displayConnectors name="Plot Display" display="//@plugins.3/@displays.2"/>
</views>
<properties name="recordsTimeUnit" value="NANOSECONDS"/>
<properties name="projectName" value="AnalysisProject"/>
diff --git a/Kieker.WebGUI/bin/data/Timer-Counter-Example/meta.dat b/Kieker.WebGUI/bin/data/Timer-Counter-Example/meta.dat
index a1d9d7c5a042c3f05ec5b8eb4797ee5111c669fd..4641d7d01381126aadc5d85bcc3b6e428230a1a0 100644
--- a/Kieker.WebGUI/bin/data/Timer-Counter-Example/meta.dat
+++ b/Kieker.WebGUI/bin/data/Timer-Counter-Example/meta.dat
@@ -1,5 +1,5 @@
#
-#Sun May 19 16:38:48 CEST 2013
+#Wed May 22 14:54:55 CEST 2013
owner=admin
last\ user=admin
-analysis\ layout=id0 -593 -253 348 72;id1 -659 29 216 84;id2 -355 -93 264 84;id3 -355 41 264 84;id4 -57 29 204 72;id5 -57 -101 204 72;\#id1.0 id2.2 -519.5 29 -519.5 -81;id2.3 id5.10 -191.5 -93 -191.5 -89;
+analysis\ layout=id0 -615 -260 336 72;id1 -675 22 216 84;id2 -73 -108 204 72;id3 -73 22 204 72;id7 -371 34 264 84;id9 -371 -100 264 84;\#id1.0 id9.21 -535.5 21.5 -535.5 -88.5;id9.22 id2.2 -207.5 -100.5 -207.5 -96.5;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorBean.java
index f6ee5a48a6ac6377af6514fedb8879829e12aeb3..6e2cef4a7997d1663232ca1bed17af020c989639 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorBean.java
@@ -18,6 +18,7 @@ package kieker.webgui.web.beans.view;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,6 +31,7 @@ import kieker.analysis.AnalysisController;
import kieker.analysis.model.analysisMetaModel.MIAnalysisComponent;
import kieker.analysis.model.analysisMetaModel.MIAnalysisMetaModelFactory;
import kieker.analysis.model.analysisMetaModel.MIDependency;
+import kieker.analysis.model.analysisMetaModel.MIDisplayConnector;
import kieker.analysis.model.analysisMetaModel.MIFilter;
import kieker.analysis.model.analysisMetaModel.MIInputPort;
import kieker.analysis.model.analysisMetaModel.MIOutputPort;
@@ -39,6 +41,7 @@ import kieker.analysis.model.analysisMetaModel.MIProperty;
import kieker.analysis.model.analysisMetaModel.MIReader;
import kieker.analysis.model.analysisMetaModel.MIRepository;
import kieker.analysis.model.analysisMetaModel.MIRepositoryConnector;
+import kieker.analysis.model.analysisMetaModel.MIView;
import kieker.analysis.model.analysisMetaModel.impl.MAnalysisMetaModelFactory;
import kieker.analysis.plugin.annotation.Property;
import kieker.common.logging.Log;
@@ -494,6 +497,17 @@ public class CurrentAnalysisEditorBean {
}
}
+ // Remove the corresponding displays from the views
+ for (final MIView view : this.project.getViews()) {
+ final Collection<MIDisplayConnector> toBeRemoved = new ArrayList<MIDisplayConnector>();
+ for (final MIDisplayConnector connector : view.getDisplayConnectors()) {
+ if (connector.getDisplay().getParent() == node) {
+ toBeRemoved.add(connector);
+ }
+ }
+ view.getDisplayConnectors().removeAll(toBeRemoved);
+ }
+
// Deselect the currently selected node if it is the one which has just been removed
if (this.selectedComponent == node) {
this.selectedComponent = null; // NOPMD
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentCockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentCockpitEditorBean.java
index bea534ce25093d941133db0891a323517edef5a3..b473990d1287b0d6a44fbda1e8fc048bb6135030 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentCockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentCockpitEditorBean.java
@@ -170,7 +170,7 @@ public class CurrentCockpitEditorBean {
final DashboardColumn column = this.dashboard.getModel().getColumn(0);
column.addWidget(panel.getId());
final HtmlOutputText text = new HtmlOutputText();
- text.setValue("N/A");
+ text.setValue(connector.getDisplay().getName());
panel.getChildren().add(text);
this.currId++;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentControllerBean.java
index 05ea569377258531bab783b48b6eb5f7b7ffcb4c..75a198e479b1172e66e28aa943aa81362b6f1226 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentControllerBean.java
@@ -49,9 +49,10 @@ import org.springframework.stereotype.Component;
public class CurrentControllerBean {
private static final Log LOG = LogFactory.getLog(CurrentControllerBean.class);
+
+ private final List<String> logEntries = new ArrayList<String>();
@Autowired
private IProjectService projectService;
- private final List<String> logEntries = new ArrayList<String>();
private String projectName;