[PATCH 3 of 3] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1411658707 -7200
# Node ID f0b78f7498aec29b041e872ed2924ea1b1909a73
# Parent  1e4e5ff44aa936183cbc07f509734d9f771fcfa9
# Parent  02782ed6c8de804455b7eabf77ae6df45a18d55e
merged.

diff -r 1e4e5ff44aa9 -r f0b78f7498ae artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java
--- a/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java	Thu Sep 25 17:24:35 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java	Thu Sep 25 17:25:07 2014 +0200
@@ -142,13 +142,6 @@
     ) {
         List<String> compatFacets = this.compatibilities.get(outputName);
 
-        if (log.isDebugEnabled() && compatFacets != null) {
-            log.debug("Compabitle Facets:");
-            for (String compatible: compatFacets) {
-                log.debug(   "- " + compatible);
-            }
-        }
-
         try {
             writeFacets(outputName, newOutFacets, oldOutFacets, compatFacets);
         }
@@ -191,16 +184,12 @@
         for (Facet fac: newFacets) {
             ManagedFacet facet = (ManagedFacet) fac;
 
-            if (debug) {
-                log.debug("Try to add Facet: " + facet.getName());
-            }
-
             String bondage = facet.getBoundToOut();
             if (bondage != null && bondage.equals(outputName)) {
                 log.debug("Adding bound facet regardless of compatibility: " +
                     facet.getName());
             } else if (!compatibleFacets.contains(facet.getName())) {
-                log.debug("Have incompatible facet, skip: " + facet.getName());
+                log.debug("Skip incompatible facet " + facet.getName());
                 continue;
             } else if (facet.getBoundToOut() != null &&
                     !facet.getBoundToOut().equals(outputName)) {
@@ -208,8 +197,8 @@
                         " because it is bound to: " + facet.getBoundToOut());
                 continue;
             } else {
-                log.debug("Facet is bound to: " + facet.getBoundToOut());
-                log.debug("Have compatible facet: " + facet.getName());
+                log.debug("Compatible facet " + facet.getName() +
+                    " is bound to: " + facet.getBoundToOut());
             }
 
             ManagedFacet picked = pickFacet(facet, oldFacets);
diff -r 1e4e5ff44aa9 -r f0b78f7498ae artifacts/src/main/java/org/dive4elements/river/exports/DischargeGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeGenerator.java	Thu Sep 25 17:24:35 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeGenerator.java	Thu Sep 25 17:25:07 2014 +0200
@@ -9,10 +9,7 @@
 
 import java.awt.Font;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.river.exports.injector.InjectorConstants;
 import org.dive4elements.river.jfree.AxisDataset;
 import org.jfree.chart.axis.NumberAxis;
@@ -23,7 +20,7 @@
 extends      DiagramGenerator
 implements   InjectorConstants
 {
-    private static Logger log = Logger.getLogger(DiagramGenerator.class);
+    private static Logger log = Logger.getLogger(DischargeGenerator.class);
 
     public DischargeGenerator() {
     }
diff -r 1e4e5ff44aa9 -r f0b78f7498ae gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 25 17:24:35 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 25 17:25:07 2014 +0200
@@ -188,10 +188,10 @@
 unitWFrom = cm -
 unitWTo = cm a
 unitWStep = cm
-unitQSingle = m³/s
-unitQFrom = m³/s -
-unitQTo = m³/s a
-unitQStep = m³/s
+unitQSingle = m\u00b3/s
+unitQFrom = m\u00b3/s -
+unitQTo = m\u00b3/s a
+unitQStep = m\u00b3/s
 main_channel = Main Channel
 total_channel = Total Channel
 footerHome = Home
diff -r 1e4e5ff44aa9 -r f0b78f7498ae gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 25 17:24:35 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 25 17:25:07 2014 +0200
@@ -349,7 +349,7 @@
 error_same_waterlevels_in_pair = Error - minuend and subtrahend m\u00fcssen sich unterscheiden.
 error_not_logged_in = Sie m\u00fcssen sich erst einloggen um mit der Arbeit beginnen zu k\u00f6nnen.
 error_load_parameterization = Fehler beim Laden der Parametrisierung.
-error_wrong_date = Bitte geben Sie gültige Daten ein.
+error_wrong_date = Bitte geben Sie g\u00fcltige Daten ein.
 error_no_gaugeoverviewinfo_found = Fehler beim Laden der Fluss- und Pegelinformationen
 
 error_feed_no_data = Keine Eingabedaten gefunden.
@@ -512,8 +512,8 @@
 other = Sonstige
 axis = Achse
 bfg_model = BfG-Modell
-federal = Bundesländer
-areas = Darstellungstyp: Flächen
+federal = Bundesl\u00e4nder
+areas = Darstellungstyp: Fl\u00e4chen
 sobek_flooded = SOBEK-Grenzlinie durchflutet / nicht durchflutet
 sobek_areas = SOBEK-Bereiche
 measurements = Messungen
@@ -667,7 +667,7 @@
 reference_endpoint = Zielort/pegel
 
 fix_deltawt_export = \u0394 W/t
-select=Ausgewählt
+select=Ausgew\u00e4hlt
 add_date=Hinzuf\u00fcgen
 
 fix_parameters_export = Angepasste Koeffizienten
@@ -721,12 +721,12 @@
 PATH = Dateipfad
 DESCRIPTION = Name
 KM = Station
-Z = Höhe
+Z = H\u00f6he
 LOCATION = Ort
 HPGP = HP/GP
 DIFF = DIFF
 SOURCE = Quelle
-WATERBODY = Gewässer
+WATERBODY = Gew\u00e4sser
 FEDSTATE_KM = Landes-Stationierung
 official_regulation = amtl. Festlegung
 negative_values_not_allowed_for_to=Keine negativen Werte bei 'bis' erlaubt.
diff -r 1e4e5ff44aa9 -r f0b78f7498ae gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Sep 25 17:24:35 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Sep 25 17:25:07 2014 +0200
@@ -189,10 +189,10 @@
 unitWFrom = cm -
 unitWTo = cm a
 unitWStep = cm
-unitQSingle = m³/s
-unitQFrom = m³/s -
-unitQTo = m³/s a
-unitQStep = m³/s
+unitQSingle = m\u00b3/s
+unitQFrom = m\u00b3/s -
+unitQTo = m\u00b3/s a
+unitQStep = m\u00b3/s
 main_channel = Main Channel
 total_channel = Total Channel
 footerHome = Home