From 3f18c31d28abba2b8bf11f88df808569b5d53b1e Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Mon, 8 Oct 2012 21:01:23 +0200
Subject: [PATCH] #628
---
.../src/main/resources/messages_de.properties | 12 ++++++++++
.../src/main/resources/messages_en.properties | 14 ++++++++++-
.../src/main/webapp/Controller.xhtml | 24 +++++++++----------
.../dialogs/manageLibrariesDialog.xhtml | 2 +-
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/Kieker.WebGUI/src/main/resources/messages_de.properties b/Kieker.WebGUI/src/main/resources/messages_de.properties
index 4c09a04c..fa6d9e46 100644
--- a/Kieker.WebGUI/src/main/resources/messages_de.properties
+++ b/Kieker.WebGUI/src/main/resources/messages_de.properties
@@ -8,6 +8,8 @@ yes=Ja
ok=Ok
cancel=Abbrechen
+choose=Durchsuchen
+
file=Datei
newProject=Neues Project
importProject=Projekt Importieren
@@ -117,6 +119,16 @@ msgOnlyJar=Zur Zeit k\u00f6nnen lediglich *.jar-Abh\u00e4ngigkeiten hochgeladen
#
#------------------------------------------------------------------------------
+analysisControllerInstantiateAnalysisController = Analyse Instanziieren
+analysisControllerCleaAnalysisController = Analyse Bereinigen
+analysisControllerStartAnalysis = Analyse Starten
+analysisControllerStopAnalysis = Analyse Stoppen
+
+analysisControllerMsgNotInstantiated = Zeigt an, dass der AnalysisController noch nicht instanziiert wurde.
+analysisControllerMsgReady = Zeigt an, dass der AnalysisController zwar instanziiert, jedoch noch nicht gestartet wurde.
+analysisControllerMsgRunning = Zeigt an, dass der AnalysisController gestartet wurde und zur Zeit läuft.
+analysisControllerMsgFailed = Zeigt an, dass der AnalysisController terminiert oder abgestürzt ist.
+
#------------------------------------------------------------------------------
#
# These are the messages for the cockpit editor page.
diff --git a/Kieker.WebGUI/src/main/resources/messages_en.properties b/Kieker.WebGUI/src/main/resources/messages_en.properties
index fa9be852..d1c6a90e 100644
--- a/Kieker.WebGUI/src/main/resources/messages_en.properties
+++ b/Kieker.WebGUI/src/main/resources/messages_en.properties
@@ -8,6 +8,8 @@ yes=Yes
ok=Ok
cancel=Cancel
+choose=Choose
+
file=File
newProject=New Project
importProject=Import Project
@@ -71,7 +73,7 @@ manageLibraries=Manage Libraries
closeProject=Close Project
graph=Graph
-scaleToFit=Scale To Fit
+analysisEditorScaleToFit=Scale To Fit
grid=Grid
snap=Snap
autoLayout=Auto-Layout
@@ -117,6 +119,16 @@ msgOnlyJar=Currently only *.jar-Dependencies can be uploaded. The maximal file s
#
#------------------------------------------------------------------------------
+analysisControllerInstantiateAnalysisController = Instantiate Analysis
+analysisControllerCleaAnalysisController = Clean Analysis
+analysisControllerStartAnalysis = Start Analysis
+analysisControllerStopAnalysis = Stop Analysis
+
+analysisControllerMsgNotInstantiated = Indicates that the AnalysisController has not been instantiated yet.
+analysisControllerMsgReady = Indicates that the AnalysisController has been instantiated, but not yet started.
+analysisControllerMsgRunning = Indicates that the AnalysisController has been started and is running.
+analysisControllerMsgFailed = Indicates that the AnalysisController has been terminated or has failed.
+
#------------------------------------------------------------------------------
#
# These are the messages for the cockpit editor page.
diff --git a/Kieker.WebGUI/src/main/webapp/Controller.xhtml b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
index bff0f0b0..2aea82f2 100644
--- a/Kieker.WebGUI/src/main/webapp/Controller.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
@@ -75,10 +75,10 @@
<p:layoutUnit position="south" header="Control" resizable="true" collapsible="true">
<h:form id="controllerForm">
- <p:commandButton value="Instantiate Analysis Controller" action="#{currentControllerBean.instantiateAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
- <p:commandButton value="Clean Analysis" action="#{currentControllerBean.cleanAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
- <p:commandButton value="Start Analysis" action="#{currentControllerBean.startAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
- <p:commandButton value="Stop Analysis" action="#{currentControllerBean.stopAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
+ <p:commandButton value="#{localizedMessages.analysisControllerInstantiateAnalysisController}" action="#{currentControllerBean.instantiateAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
+ <p:commandButton value="#{localizedMessages.analysisControllerCleaAnalysisController}" action="#{currentControllerBean.cleanAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
+ <p:commandButton value="#{localizedMessages.analysisControllerStartAnalysis}" action="#{currentControllerBean.startAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
+ <p:commandButton value="#{localizedMessages.analysisControllerStopAnalysis}" action="#{currentControllerBean.stopAnalysis()}" update=":messages :logList" disabled="#{empty currentControllerBean.projectName}"/>
<p:poll interval="1" update=":ledsForm"/>
</h:form>
<hr/>
@@ -96,14 +96,14 @@
<h:graphicImage id="iconLEDRed2" url="../img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed()}"/>
<h:graphicImage id="iconLEDRed2_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not (currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed())}"/>
- <p:tooltip for="iconLEDRed1" value="Indicates that the AnalysisController has not been instantiated yet."/>
- <p:tooltip for="iconLEDYellow" value="Indicates that the AnalysisController has been instantiated, but not yet started."/>
- <p:tooltip for="iconLEDGreen" value="Indicates that the AnalysisController has been started and is running."/>
- <p:tooltip for="iconLEDRed2" value="Indicates that the AnalysisController has been terminated or has failed."/>
- <p:tooltip for="iconLEDRed1_2" value="Indicates that the AnalysisController has not been instantiated yet."/>
- <p:tooltip for="iconLEDYellow_2" value="Indicates that the AnalysisController has been instantiated, but not yet started."/>
- <p:tooltip for="iconLEDGreen_2" value="Indicates that the AnalysisController has been started and is running."/>
- <p:tooltip for="iconLEDRed2_2" value="Indicates that the AnalysisController has been terminated or has failed."/>
+ <p:tooltip for="iconLEDRed1" value="#{localizedMessages.analysisControllerMsgNotInstantiated}"/>
+ <p:tooltip for="iconLEDYellow" value="#{localizedMessages.analysisControllerMsgReady}"/>
+ <p:tooltip for="iconLEDGreen" value="#{localizedMessages.analysisControllerMsgRunning}"/>
+ <p:tooltip for="iconLEDRed2" value="#{localizedMessages.analysisControllerMsgFailed}"/>
+ <p:tooltip for="iconLEDRed1_2" value="#{localizedMessages.analysisControllerMsgNotInstantiated}"/>
+ <p:tooltip for="iconLEDYellow_2" value="#{localizedMessages.analysisControllerMsgReady}"/>
+ <p:tooltip for="iconLEDGreen_2" value="#{localizedMessages.analysisControllerMsgRunning}"/>
+ <p:tooltip for="iconLEDRed2_2" value="#{localizedMessages.analysisControllerMsgFailed}"/>
</div>
</h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/manageLibrariesDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/manageLibrariesDialog.xhtml
index a88d652e..c2f854dc 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/manageLibrariesDialog.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/manageLibrariesDialog.xhtml
@@ -33,7 +33,7 @@
<br />
<br />
<h:form enctype="multipart/form-data">
- <p:fileUpload auto="true" allowTypes="/(\.|\/)(jar)$/" sizeLimit="104857600" mode="advanced" fileUploadListener="#{currentAnalysisEditorBean.handleFileUpload}" update=":dependenciesForm :messages :toolpalette"/>
+ <p:fileUpload label="#{localizedMessages.choose}" cancelLabel="#{localizedMessages.cancel}" auto="true" allowTypes="/(\.|\/)(jar)$/" sizeLimit="104857600" mode="advanced" fileUploadListener="#{currentAnalysisEditorBean.handleFileUpload}" update=":dependenciesForm :messages :toolpalette"/>
</h:form>
</div>
<hr/>
--
GitLab