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 5ba3705aed12366a70c809a5f7fe0f106e06c72f..868468ba7a65b585096bbc580a7ee372c6e608cf 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 a48a002e1f59ee3cbcaf1060388d9e5776da3cdb..860c94afa0cbfb2fb58bb55a3870cb0fd559c0d1 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 2fd50aba101c6116506853793a691f0c005b8dff..0d93faa54cce667f45b3c377a61cd1cb68f2446e 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 7394dce75bd073b9f8b36c21c053763c10c8b1c3..c4c6d2aab86736b43910bc108dd2374c12a6da02 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 a0aea148dbdd7b2518eb4f6e8a62e79b5511e35a..74b709d0d5ed2176818ea46f57aca4cdad31ba18 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));