--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Mon Oct 17 15:53:59 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Mon Oct 17 16:04:14 2011 +0000
@@ -766,7 +766,7 @@
     /**
      * Inner class to structure/order the themes of a chart.
      */
-    private class ThemeList {
+    private static class ThemeList {
         private Logger logger = Logger.getLogger(ThemeList.class);
         protected Map<Integer, ManagedFacet> themes;
 
@@ -796,12 +796,12 @@
                 Element theme = (Element) themeList.item(i);
 
                 ManagedDomFacet facet = new ManagedDomFacet(theme);
-                themes.put(new Integer(facet.getPosition()-1), facet);
+                themes.put(Integer.valueOf(facet.getPosition()-1), facet);
             }
         }
 
         public ManagedFacet get(int idx) {
-            return themes.get(new Integer(idx));
+            return themes.get(Integer.valueOf(idx));
         }
 
         public int size() {