From 11b93a1ac6d132fdb3391526b2f769dd513669fe Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Mon, 5 Mar 2012 18:26:54 +0100
Subject: [PATCH] Minor corrections and modifications.
---
.../main/java/kieker/webgui/common/FileManager.java | 13 ++++++++-----
Kieker.WebGUI/src/main/webapp/main.xhtml | 6 +++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FileManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FileManager.java
index ef2b968a..401e351b 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/FileManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/FileManager.java
@@ -26,6 +26,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
import kieker.analysis.AnalysisController;
import kieker.analysis.model.analysisMetaModel.MIDependency;
@@ -135,9 +137,7 @@ public final class FileManager {
/*
* Make sure that the directory for the project exists.
*/
- if (!dirProject.exists()) {
- return false;
- } else {
+ if (dirProject.exists()) {
/*
* Try to save the project.
*/
@@ -145,12 +145,15 @@ public final class FileManager {
try {
// TODO Copy before saving as the controller destroys at least the dependencies.
final AnalysisController controller = new AnalysisController(project);
- return controller.saveToFile(fileProject);
+ if (controller.saveToFile(fileProject)) {
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "", "Project saved: " + project.getName()));
+ return true;
+ }
} catch (final NullPointerException ex) {
FileManager.LOG.error("Could not save project '" + projectName + "'.", ex);
- return false;
}
}
+ return false;
}
/**
diff --git a/Kieker.WebGUI/src/main/webapp/main.xhtml b/Kieker.WebGUI/src/main/webapp/main.xhtml
index a828cae4..3c32c824 100644
--- a/Kieker.WebGUI/src/main/webapp/main.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/main.xhtml
@@ -32,11 +32,11 @@
<!-- This is the submenu for the current project, for example if someone doesn't want to use the context menu within the browser. -->
<p:submenu label="Current Project">
- <p:menuitem value="Save Project" ajax="true" action="#{availableProjectsBean.saveProject(selectedProjectBean.getSelectedProject)}" update=":projectsForm" />
+ <p:menuitem value="Save Project" ajax="true" action="#{availableProjectsBean.saveProject(selectedProjectBean.getSelectedProject())}" update=":projectsForm" />
<p:menuitem value="Set as Main Project" ajax="true" action="#{selectedProjectBean.setMainProject(selectedProjectBean.getSelectedProject())}" update=":projectsForm" />
<p:separator />
- <p:menuitem value="Delete Project" ajax="true" action="#{availableProjectsBean.deleteProject(selectedProjectBean.getSelectedProject)}" update=":projectsForm" />
- <p:menuitem value="Reset Project" ajax="true" action="#{availableProjectsBean.resetProject(selectedProjectBean.getSelectedProject)}" update=":projectsForm" />
+ <p:menuitem value="Delete Project" ajax="true" action="#{availableProjectsBean.deleteProject(selectedProjectBean.getSelectedProject())}" update=":projectsForm" />
+ <p:menuitem value="Reset Project" ajax="true" action="#{availableProjectsBean.resetProject(selectedProjectBean.getSelectedProject())}" update=":projectsForm" />
<p:separator />
<p:menuitem value="Configure Dependencies" ajax="false" url="/Kieker.WebGUI/projectDependencies" />
</p:submenu>
--
GitLab