From 95a505b9c32da8f01d956c7b280de37608b046cd Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 14 Sep 2013 12:42:16 +0200
Subject: [PATCH] Bugfixing
---
.../webgui/web/beans/view/CockpitEditorBean.java | 16 +++++++++-------
.../src/main/webapp/pages/CockpitPage.xhtml | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
index 7c11ac09..250bc1cf 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CockpitEditorBean.java
@@ -134,7 +134,7 @@ public final class CockpitEditorBean {
this.loadProject();
if (this.project != null) {
- this.resetTimeStamp();
+ this.resetTimeStampFromLastSaving();
this.reloadAvailableComponents();
this.createDashboardComponent();
@@ -181,11 +181,13 @@ public final class CockpitEditorBean {
return Collections.nCopies(3, null);
}
- /**
- * This method sets the time stamp to the current system time.
- */
- public void resetTimeStamp() {
- this.timeStampSinceLastSaving = System.currentTimeMillis();
+ private void resetTimeStampFromLastSaving() {
+ // TODO Handle exceptions correctly
+ try {
+ this.timeStampSinceLastSaving = this.projectService.getCurrTimeStamp(this.projectName);
+ } catch (final ProjectNotExistingException ex) {
+ ex.printStackTrace();
+ }
}
public MIView getSelectedView() {
@@ -426,7 +428,7 @@ public final class CockpitEditorBean {
this.cockpitLayout.serializeToString());
GlobalPropertiesBean.showMessage(FacesMessage.SEVERITY_INFO, this.globalPropertiesBean.getMsgProjectSaved());
// Update the time stamp!
- this.resetTimeStamp();
+ this.resetTimeStampFromLastSaving();
this.clearModificationsFlag();
} catch (final IOException ex) {
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index fd01f88c..d8f08dce 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -56,7 +56,7 @@
title="#{display.name}" value="#{cockpitBean.getXYPlotUpdate(display.name)}" rendered="#{cockpitBean.getDisplayType(display.name) == XY_PLOT}"/>
<p:meterGaugeChart title="#{display.name}" value="#{cockpitBean.getMeterGaugeUpdate(display.name)}" rendered="#{cockpitBean.getDisplayType(display.name) == METER_GAUGE}"/>
<h:outputText value="#{cockpitBean.getPlainTextUpdate(display.name)}" rendered="#{cockpitBean.getDisplayType(display.name) == PLAIN_TEXT}"/>
- <h:outputText value="N/A" rendered="#{empty cockpitBean.getDisplayType(display.name)}"/>
+ <h:outputText value="N/A" rendered="#{cockpitBean.getDisplayType(display.name) == UNKNOWN}"/>
<p:pieChart fill="#{cockpitBean.getPieChartDisplaySettings(display.name).usingFilledChart}"
shadow="#{cockpitBean.getPieChartDisplaySettings(display.name).usingShadows}"
showDataLabels="#{cockpitBean.getPieChartDisplaySettings(display.name).usingVisibleDataLabels}"
--
GitLab