diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelState.java @ 6510:1e6bd2831280

artifacts: Desktop-FLYS conform official line messages in error reports.
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 28 Jun 2013 20:20:14 +0200
parents 7cb247824ed1
children 12d9c5a430c5
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelState.java	Fri Jun 28 19:24:46 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelState.java	Fri Jun 28 20:20:14 2013 +0200
@@ -8,6 +8,7 @@
 
 package org.dive4elements.river.artifacts.states;
 
+import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -125,8 +126,8 @@
                 report.addProblem(Resources.format(
                     cc.getMeta(),
                     "official.line.found",
-                    "Found official line for {0}.",
-                    ol.getName()));
+                    "Found official line for {0} from year {1,date,yyyy} from {2}.",
+                    ol.getName(), nn(ol.getDate()), nn(ol.getSource())));
             }
         }
 
@@ -137,6 +138,13 @@
         return res;
     }
 
+    private static final String nn(String s) {
+        return s != null ? s : "";
+    }
+
+    private static final Date nn(Date d) {
+        return d != null ? d : new Date();
+    }
 
     /**
      * @param context Ignored.

http://dive4elements.wald.intevation.org