Skip to content
Snippets Groups Projects
Commit 29deefe7 authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Solved some minor bugs.

parent da42fbc0
No related branches found
No related tags found
No related merge requests found
...@@ -159,10 +159,10 @@ public final class ProjectsBean { ...@@ -159,10 +159,10 @@ public final class ProjectsBean {
/** /**
* This method delivers all available projects as a list of string. * This method delivers all available projects as a list of string.
* *
* @return All currently available projects. The list can not be modified. * @return All currently available projects. Do not modify this list with add, remove etc. (It still has to be sortable for Primefaces though)
*/ */
public List<String> getProjects() { public List<String> getProjects() {
return Collections.unmodifiableList(this.projects); return this.projects;
} }
/** /**
......
...@@ -360,6 +360,7 @@ public final class ACManager { ...@@ -360,6 +360,7 @@ public final class ACManager {
this.displayObjects.put(view.getName(), viewMap); this.displayObjects.put(view.getName(), viewMap);
for (final MIDisplay display : view.getDisplays()) { for (final MIDisplay display : view.getDisplays()) {
final Method displayMethod = UpdateDisplaysThread.getDisplayMethod(this.myPluginMap.get(display.getParent()).getClass(), display.getName()); final Method displayMethod = UpdateDisplaysThread.getDisplayMethod(this.myPluginMap.get(display.getParent()).getClass(), display.getName());
// Make sure that the method really exists and that is has the correct parameters // Make sure that the method really exists and that is has the correct parameters
if ((displayMethod != null) && (displayMethod.getParameterTypes().length == 1)) { if ((displayMethod != null) && (displayMethod.getParameterTypes().length == 1)) {
final Class<?> parameterType = displayMethod.getParameterTypes()[0]; final Class<?> parameterType = displayMethod.getParameterTypes()[0];
...@@ -380,6 +381,7 @@ public final class ACManager { ...@@ -380,6 +381,7 @@ public final class ACManager {
} }
if (displayObject != null) { if (displayObject != null) {
viewMap.put(display.getName(), displayObject); viewMap.put(display.getName(), displayObject);
this.methodMap.put(displayObject, displayMethod);
} }
} }
} }
...@@ -445,6 +447,8 @@ public final class ACManager { ...@@ -445,6 +447,8 @@ public final class ACManager {
ACManager.LOG.error("An error occured while updating the display.", ex); ACManager.LOG.error("An error occured while updating the display.", ex);
} catch (final InvocationTargetException ex) { } catch (final InvocationTargetException ex) {
ACManager.LOG.error("An error occured while updating the display.", ex); ACManager.LOG.error("An error occured while updating the display.", ex);
} catch (final NullPointerException ex) {
ACManager.LOG.error("An error occured while updating the display.", ex);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment