Made PoolQueuePlotData enum compatible with java 8.

dCache · Oct 16, 2014 · 35c97d2 · 35c97d2
1 parent d64ce31
commit 35c97d2
Showing 1 changed file with 2 additions and 26 deletions.
diff --git a/...e-webadmin/src/main/java/org/dcache/webadmin/model/businessobjects/PoolQueuePlotData.java b/...e-webadmin/src/main/java/org/dcache/webadmin/model/businessobjects/PoolQueuePlotData.java
@@ -86,10 +86,6 @@ public class PoolQueuePlotData {
 
     public enum PoolQueueHistogram implements RoundRobinDatabaseDatasource {
         AMOVER {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "active mover";
             }
@@ -99,10 +95,6 @@ public Color getColor() {
             }
         },
         QMOVER {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "queued mover";
             }
@@ -112,10 +104,6 @@ public Color getColor() {
             }
         },
         ASTORE {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "active store";
             }
@@ -125,10 +113,6 @@ public Color getColor() {
             }
         },
         QSTORE {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "queued store";
             }
@@ -138,10 +122,6 @@ public Color getColor() {
             }
         },
         ARESTORE {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "active restore";
             }
@@ -151,10 +131,6 @@ public Color getColor() {
             }
         },
         QRESTORE {
-            public String getSourceName() {
-                return getSourceName(this);
-            }
-
             public String getLabel() {
                 return "queued restore";
             }
@@ -164,12 +140,12 @@ public Color getColor() {
             }
         };
 
-        private static String getSourceName(PoolQueueHistogram histogram) {
+        public String getSourceName() {
             /*
              * "!" appended to the datasource name is the Rrd4j convention
              * for storing unknown values as 0.0 rather than as NaN.
              */
-            return histogram.toString() + "!";
+            return toString() + "!";
         }
     }