From bf7914a2d7724ec0c76dff2c150c805daeb905a4 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 4 Aug 2012 14:37:19 +0200
Subject: [PATCH] Some minor modifications for quality reasons
---
.../webgui/beans/view/CurrentCockpitBean.java | 21 ++++++++++++++++---
.../beans/view/CurrentControllerBean.java | 11 ++++++++++
.../converter/MIPluginStringConverter.java | 19 +++++++++++++++--
.../converter/MIPortStringConverter.java | 19 +++++++++++++++--
.../MIRepositoryStringConverter.java | 19 +++++++++++++++--
5 files changed, 80 insertions(+), 9 deletions(-)
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index 5ba3705a..868468ba 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -82,12 +82,27 @@ public class CurrentCockpitBean {
}
}
+ /**
+ * The getter for the {@link #projectsBean}-property.
+ *
+ * @return {@link #projectsBean}
+ */
public ProjectsBean getProjectsBean() {
- return this.projectsBean;
+ synchronized (this) {
+ return this.projectsBean;
+ }
}
+ /**
+ * The setter for the {@link #projectsBean}-property.
+ *
+ * @param projectsBean
+ * The new value for {@link #projectsBean}.
+ */
public void setProjectsBean(final ProjectsBean projectsBean) {
- this.projectsBean = projectsBean;
+ synchronized (this) {
+ this.projectsBean = projectsBean;
+ }
}
/**
@@ -110,7 +125,7 @@ public class CurrentCockpitBean {
public void initalize() {
synchronized (this) {
// Make sure that the initialization will only be done for the init request.
- if (!FacesContext.getCurrentInstance().isPostback()) {
+ if (!FacesContext.getCurrentInstance().isPostback() && (this.projectsBean != null)) {
// Remember the given parameters
this.project = this.projectsBean.openProject(this.projectName);
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
index a48a002e..860c94af 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
@@ -76,10 +76,21 @@ public class CurrentControllerBean {
// No code necessary
}
+ /**
+ * The getter for the {@link #projectsBean}-property.
+ *
+ * @return {@link #projectsBean}
+ */
public ProjectsBean getProjectsBean() {
return this.projectsBean;
}
+ /**
+ * The setter for the {@link #projectsBean}-property.
+ *
+ * @param projectsBean
+ * The new value for {@link #projectsBean}.
+ */
public void setProjectsBean(final ProjectsBean projectsBean) {
this.projectsBean = projectsBean;
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
index 2fd50aba..0d93faa5 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPluginStringConverter.java
@@ -56,22 +56,37 @@ public class MIPluginStringConverter implements Converter {
/* No code necessary. */
}
+ /**
+ * The getter for the {@link #bean}-property.
+ *
+ * @return {@link #bean}
+ */
public CurrentAnalysisEditorBean getBean() {
return this.bean;
}
+ /**
+ * The setter for the {@link #bean}-property.
+ *
+ * @param bean
+ * The new value for {@link #bean}.
+ */
public void setBean(final CurrentAnalysisEditorBean bean) {
this.bean = bean;
}
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
- return this.bean.getPluginByID(string);
+ if (this.bean != null) {
+ return this.bean.getPluginByID(string);
+ } else {
+ return null;
+ }
}
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
- if (o == null) {
+ if ((this.bean == null) || (o == null)) {
return "";
} else {
return Integer.toString(this.bean.getPluginID((MIPlugin) o));
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
index 7394dce7..c4c6d2aa 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIPortStringConverter.java
@@ -56,22 +56,37 @@ public class MIPortStringConverter implements Converter {
/* No code necessary. */
}
+ /**
+ * The getter for the {@link #bean}-property.
+ *
+ * @return {@link #bean}
+ */
public CurrentAnalysisEditorBean getBean() {
return this.bean;
}
+ /**
+ * The setter for the {@link #bean}-property.
+ *
+ * @param bean
+ * The new value for {@link #bean}.
+ */
public void setBean(final CurrentAnalysisEditorBean bean) {
this.bean = bean;
}
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
- return this.bean.getPortByID(string);
+ if (this.bean != null) {
+ return this.bean.getPortByID(string);
+ } else {
+ return null;
+ }
}
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
- if (o == null) {
+ if ((o == null) || (this.bean == null)) {
return "";
} else {
return Integer.toString(this.bean.getPortID((MIPort) o));
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
index a0aea148..74b709d0 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/converter/MIRepositoryStringConverter.java
@@ -56,22 +56,37 @@ public class MIRepositoryStringConverter implements Converter {
/* No code necessary. */
}
+ /**
+ * The getter for the {@link #bean}-property.
+ *
+ * @return {@link #bean}
+ */
public CurrentAnalysisEditorBean getBean() {
return this.bean;
}
+ /**
+ * The setter for the {@link #bean}-property.
+ *
+ * @param bean
+ * The new value for {@link #bean}.
+ */
public void setBean(final CurrentAnalysisEditorBean bean) {
this.bean = bean;
}
@Override
public Object getAsObject(final FacesContext fc, final UIComponent uic, final String string) {
- return this.bean.getRepositoryByID(string);
+ if (this.bean != null) {
+ return this.bean.getRepositoryByID(string);
+ } else {
+ return null;
+ }
}
@Override
public String getAsString(final FacesContext fc, final UIComponent uic, final Object o) {
- if (o == null) {
+ if ((o == null) || (this.bean == null)) {
return "";
} else {
return Integer.toString(this.bean.getRepositoryID((MIRepository) o));
--
GitLab