Mercurial > dive4elements > river

changeset 4145:d39f229ea990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 16 Oct 2012 11:27:27 +0200
parents 0ac1158605bd (diff) d7db9baa4e62 (current diff)
children 5589b1fd459d
files flys-artifacts/ChangeLog
diffstat 7 files changed, 35 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-artifacts/ChangeLog	Tue Oct 16 11:27:27 2012 +0200
@@ -1,3 +1,10 @@
+2012-10-16	Christian Lins	<christian.lins@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java,
+	  src/main/resources/messages_de.properties,
+	  src/main/resources/messages_de_DE.properties:
+	  Fix typo
+
 2012-10-16  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue930
@@ -12787,7 +12794,6 @@
 	  not. In addition, the scenario parameter used by WSPLGEN is now set
 	  correctly.
 
->>>>>>> .r3356
 2011-12-05	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Allow longitudinal_section.q facets in wdiff states output.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java	Tue Oct 16 11:27:27 2012 +0200
@@ -1,23 +1,17 @@
 package de.intevation.flys.exports;
 
-import org.apache.log4j.Logger;
-
-import org.jfree.data.xy.XYSeries;
-
-import org.w3c.dom.Document;
-
 import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
-
 import de.intevation.flys.artifacts.FLYSArtifact;
-
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.MiddleBedHeightData;
-
 import de.intevation.flys.jfree.FLYSAnnotation;
 import de.intevation.flys.jfree.StyledXYSeries;
+import de.intevation.flys.utils.FLYSUtils;
 
-import de.intevation.flys.utils.FLYSUtils;
+import org.apache.log4j.Logger;
+import org.jfree.data.xy.XYSeries;
+import org.w3c.dom.Document;
 
 
 /**
@@ -59,7 +53,7 @@
     public static final String I18N_YAXIS_LABEL =
         "chart.bedheight_middle.section.yaxis.label";
 
-    public static final String I18N_CHART_TITLE_DEFAULT  = "Mittlere Sohlöhe";
+    public static final String I18N_CHART_TITLE_DEFAULT  = "Mittlere Sohlhöhe";
     public static final String I18N_XAXIS_LABEL_DEFAULT  = "km";
     public static final String I18N_YAXIS_LABEL_DEFAULT  = "mittlere Sohlhöhen [müNN]";
 
@@ -136,6 +130,7 @@
      * @param artifactAndFacet current facet.
      * @param attr  theme for facet
      */
+    @Override
     public void doOut(
         ArtifactAndFacet artifactAndFacet,
         Document         attr,
--- a/flys-artifacts/src/main/resources/messages_de.properties	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Tue Oct 16 11:27:27 2012 +0200
@@ -307,7 +307,7 @@
 export.flow_velocity.csv.header.locations = Streckendaten
 export.bedheight_middle.csv.header.km = Fluss-km
 export.bedheight_middle.csv.header.sounding = Peilung / Epoche
-export.bedheight_middle.csv.header.height = gemittelte Sohl\u00f6he
+export.bedheight_middle.csv.header.height = gemittelte Sohlh\u00f6he
 export.bedheight_middle.csv.header.uncertainty = Unsicherheit [m]
 export.bedheight_middle.csv.header.datagap = Datenl\u00fccke
 export.bedheight_middle.csv.header.soundingwidth = Peilbreite [m]
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Tue Oct 16 11:27:27 2012 +0200
@@ -304,7 +304,7 @@
 export.flow_velocity.csv.header.locations = Streckendaten
 export.bedheight_middle.csv.header.km = Fluss-km
 export.bedheight_middle.csv.header.sounding = Peilung / Epoche
-export.bedheight_middle.csv.header.height = gemittelte Sohl\u00f6he
+export.bedheight_middle.csv.header.height = gemittelte Sohlh\u00f6he
 export.bedheight_middle.csv.header.uncertainty = Unsicherheit [m]
 export.bedheight_middle.csv.header.datagap = Datenl\u00fccke
 export.bedheight_middle.csv.header.soundingwidth = Peilbreite [m]
--- a/flys-client/ChangeLog	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-client/ChangeLog	Tue Oct 16 11:27:27 2012 +0200
@@ -1,3 +1,16 @@
+2012-10-15	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/FLYS.java:
+	  Add a CloseClickHandler if a gauge discharge curve is created.
+	  Also add an entry in the project list in this case.
+	  Fix for part a) and c) in issue #918
+
+2012-10-15	Björn Ricks	<bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/ProjectList.java:
+	  Make updateUserCollections public. It must be called by FLYS to update the
+	  project list if a new gauge discharge curve collection is created.
+
 2012-10-15	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYS.java	Tue Oct 16 11:27:27 2012 +0200
@@ -477,6 +477,7 @@
                 public void onSuccess(Collection collection) {
                     GWT.log("Successfully created a new collection.");
                     final Collection col = collection;
+                    final ProjectList plist = projectList;
                     artifactService.createGaugeDischargeCurveArtifact(
                         col, locale, riv, ref,
                         new AsyncCallback<Artifact>() {
@@ -491,9 +492,13 @@
                                 GWT.log("Successfully created a new artifact.");
                                 CollectionView view = new CollectionView(flys,
                                     col, artifact);
-                                workspace.addView("new-project", view);
+                                workspace.addView(col.identifier(), view);
 
                                 view.addCollectionChangeHandler(getProjectList());
+                                view.addCloseClickHandler(
+                                    new CloseCollectionViewHandler(
+                                        FLYS.this, col.identifier()));
+                                projectList.updateUserCollections();
                             }
                     });
                 }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Tue Oct 16 09:55:15 2012 +0200
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Tue Oct 16 11:27:27 2012 +0200
@@ -569,7 +569,7 @@
     }
 
 
-    protected void updateUserCollections() {
+    public void updateUserCollections() {
         GWT.log("==> ProjectList updates user collections!");
 
         Config config = Config.getInstance();
http://dive4elements.wald.intevation.org