diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java index aea64a1a6dfe38f243fc9383a0cc66dfe2ad9001..030d67cfc3d0ee518c9b5047ae8acfc1ff754ad5 100644 --- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java +++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java @@ -360,6 +360,10 @@ public final class CurrentWorkSpaceProjectBean { this.projectName = null; // NOPMD this.classLoader = null; // NOPMD this.selectedPlugin = null; // NOPMD + this.selectedRepository = null; // NOPMD + this.availableFilters.clear(); + this.availableReaders.clear(); + this.availableRepositories.clear(); this.timeStamp = 0; this.pluginMap.clear(); this.filter2filterConnections.clear(); diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisCockpit.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisCockpit.xhtml index 48ea6efc68316923094afa0b93daac5283f0ddad..75ee48e22f40d1abedacc1bfdd172c16c2affeeb 100644 --- a/Kieker.WebGUI/src/main/webapp/AnalysisCockpit.xhtml +++ b/Kieker.WebGUI/src/main/webapp/AnalysisCockpit.xhtml @@ -28,7 +28,7 @@ </p:submenu> <p:submenu label="Help"> - <p:menuitem value="User Guide" ajax="true"/> + <p:menuitem value="User Guide" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/> </p:submenu> diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisController.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisController.xhtml index 2104c21fa6ff47ac510f69a7cdcffac509dc2286..3ffe0eb4b726592e40d9eb44452ac1598484f267 100644 --- a/Kieker.WebGUI/src/main/webapp/AnalysisController.xhtml +++ b/Kieker.WebGUI/src/main/webapp/AnalysisController.xhtml @@ -28,7 +28,7 @@ </p:submenu> <p:submenu label="Help"> - <p:menuitem value="User Guide" ajax="true"/> + <p:menuitem value="User Guide" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/> </p:submenu> diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisViewWorkSpace.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisViewWorkSpace.xhtml index 306b5b4ea8c947a715f826e8c109a3bf136b2087..bdac71bdbe5723f220c1d39b67b8dd57e88341fd 100644 --- a/Kieker.WebGUI/src/main/webapp/AnalysisViewWorkSpace.xhtml +++ b/Kieker.WebGUI/src/main/webapp/AnalysisViewWorkSpace.xhtml @@ -24,9 +24,9 @@ <p:menuitem value="Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:menuitem styleClass="Force-Save-Project-Button" value="Force Save Project" update=":messages" ajax="true" action="#{currentWorkSpaceProjectBean.saveProject(true)}" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:separator/> - <p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> + <p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project or true}"/> <p:separator/> - <p:menuitem value="New View" ajax="true"/> + <p:menuitem value="New View" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="Close Project" action="#{currentWorkSpaceProjectBean.clearProject()}" ajax="false"/> <p:separator/> @@ -34,7 +34,7 @@ </p:submenu> <p:submenu label="Help"> - <p:menuitem value="User Guide" ajax="true"/> + <p:menuitem value="User Guide" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/> </p:submenu> diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml index df9c2a9fe00632bf335953054a4ed90eaacbf50f..b8ad8b4f44fbe68b45f9de96dba29150ef7a5280 100644 --- a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml +++ b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml @@ -20,7 +20,7 @@ <p:menubar> <p:submenu label="File"> <p:menuitem value="New Project" onclick="newProjectDialog.show()" ajax="true"/> - <p:menuitem value="Import Project" ajax="true"/> + <p:menuitem value="Import Project" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="Refresh Projects List" update=":projectsListForm" ajax="true"/> <p:separator/> @@ -28,7 +28,7 @@ </p:submenu> <p:submenu label="Help"> - <p:menuitem value="User Guide" ajax="true"/> + <p:menuitem value="User Guide" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/> </p:submenu> @@ -46,9 +46,9 @@ <p:menu overlay="true" trigger="dynaButton" my="left top" at="left bottom" style="width:180px"> <p:menuitem id="openButton" value="Open Project" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(projectsBean.openProject(project), project)}"/> - <p:menuitem id="copyButton" value="Copy Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()"/> - <p:menuitem id="renameButton" value="Rename Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()"/> - <p:menuitem id="deleteButton" value="Delete Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="deleteProjectDialog.show()"/> + <p:menuitem id="copyButton" value="Copy Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()" disabled="true"/> + <p:menuitem id="renameButton" value="Rename Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()" disabled="true"/> + <p:menuitem id="deleteButton" value="Delete Project" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="deleteProjectDialog.show()" disabled="true"/> <p:separator/> <p:menuitem id="controlAnalysis" value="Open Analysis Control" ajax="false" action="#{currentAnalysisControllerProjectBean.setProject(project)}" /> <p:menuitem id="editAnalysisViews" value="Edit Analysis Views" ajax="false" action="#{currentAnalysisViewWorkSpaceProjectBean.setProject(project)}" /> diff --git a/Kieker.WebGUI/src/main/webapp/ProjectWorkSpace.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectWorkSpace.xhtml index b09d4b804b1df87c92aa55bd733d105f10d85d02..3593d93abea536269bfc6681eee711a2623bc508 100644 --- a/Kieker.WebGUI/src/main/webapp/ProjectWorkSpace.xhtml +++ b/Kieker.WebGUI/src/main/webapp/ProjectWorkSpace.xhtml @@ -34,10 +34,10 @@ <p:menuitem value="Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:menuitem styleClass="Force-Save-Project-Button" value="Force Save Project" update=":messages" ajax="true" action="#{currentWorkSpaceProjectBean.saveProject(true)}" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:separator/> - <p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> + <p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project or true}" /> <p:separator/> <p:menuitem value="Manage Libraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> - <p:menuitem ajax="true" value="Edit Connections" update=":connectionDialogForm" onclick="connectionDialog.show();"/> + <p:menuitem ajax="true" value="Edit Connections" update=":connectionDialogForm" onclick="connectionDialog.show();" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:separator/> <p:menuitem value="Close Project" action="#{currentWorkSpaceProjectBean.clearProject()}" ajax="false"/> <p:separator/> @@ -45,7 +45,7 @@ </p:submenu> <p:submenu label="Help"> - <p:menuitem value="User Guide" ajax="true"/> + <p:menuitem value="User Guide" ajax="true" disabled="true"/> <p:separator/> <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/> </p:submenu> @@ -86,7 +86,7 @@ <p:layoutUnit position="south" size="150" header="Properties" resizable="true" collapsible="true"> <h:form id="propertiesForm" > - <p:dataTable value="#{currentWorkSpaceProjectBean.advancedPluginProperties}" var="property" emptyMessage="No properties available" rendered="#{not empty currentWorkSpaceProjectBean.selectedPlugin}"> + <p:dataTable editable="true" value="#{currentWorkSpaceProjectBean.advancedPluginProperties}" var="property" emptyMessage="No properties available" rendered="#{not empty currentWorkSpaceProjectBean.selectedPlugin}"> <p:column headerText="Key" style="width:125px"> <h:outputText value="#{property.name}" rendered="#{not stringBean.checkString(property)}"/> <h:outputText value="Name" rendered="#{stringBean.checkString(property)}"/> diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/connectionDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/connectionDialog.xhtml index c8b59297b6bba64e59aa1863734ce36ddbbad1ab..970c6b4d217cd0ec98624f0602282dcbd617a4e6 100644 --- a/Kieker.WebGUI/src/main/webapp/dialogs/connectionDialog.xhtml +++ b/Kieker.WebGUI/src/main/webapp/dialogs/connectionDialog.xhtml @@ -17,7 +17,8 @@ update=":connectionDialogForm" /> <br /> <br /> - <p:dataTable value="#{currentWorkSpaceProjectBean.filterConnections}" + <p:dataTable editable="true" + value="#{currentWorkSpaceProjectBean.filterConnections}" var="connection" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"> @@ -112,7 +113,8 @@ </p:tab> <p:tab title="Plugin -> Repository Connections"> - <p:dataTable value="#{currentWorkSpaceProjectBean.repoConnections}" + <p:dataTable editable="true" + value="#{currentWorkSpaceProjectBean.repoConnections}" var="connection" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">