--- a/flys-client/ChangeLog	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/ChangeLog	Mon Sep 19 16:13:42 2011 +0000
@@ -1,3 +1,24 @@
+2011-09-19  Ingo Weinzierl <ingo@intevation.de>
+
+	Tagged RELEASE 2.5
+
+	* Changes: Prepared changes for the release.
+
+2011-09-19  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/CollectionView.java,
+	  src/main/java/de/intevation/flys/client/client/ui/TableFilter.java,
+	  src/main/java/de/intevation/flys/client/client/ui/ProjectList.java,
+	  src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java:
+	  Removed needless imports.
+
+2011-09-19  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/DemDatacagePanel.java:
+	  Display datacage panel with DEMs only. Return Data object with selected
+	  database ID after pushing 'next' button.
+
 2011-09-16  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/server/MetaDataServiceImpl.java,

--- a/flys-client/Changes	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/Changes	Mon Sep 19 16:13:42 2011 +0000
@@ -1,3 +1,111 @@
+2011-09-19  RELEASE 2.5
+
+    NEW:
+
+        * Added new widgets:
+          - DistancePanel: allows users to enter a km range.
+          - ContinuePanel: offers a 'next' button only for states which do not require input data.
+          - BooleanPanel: allows users to answer for yes/no questions.
+          - TextProvider: allows users to enter text strings.
+          - AutoIntegerPanel: allows users to enter integer values or the value 'auto'.
+          - WaterlevelGroundPanel: allows users to enter three integer values for "from", "to", and "diff" used for floodmaps.
+          - DatacagePanel: displays a datacage widget, that allows users to select items from datacage.
+          - MapPanel: displays a Gwt-OpenLayers based map and a MapToolbar.
+          - DatacageWidget: reads XML documents from MetaDataService and displays the result as tree.
+          - DigitizePanel: allows users to digitize spatial geometries using a map based on Gwt-OpenLayers.
+          - DatacageTwinPanel: allows users to select items from two parallel datacage widgets.
+
+        * Added RPC services to:
+          - create new Artifacts based on a model Artifact (ArtifactService).
+          - read XML documents from MetaDataService (MetaDataService).
+          - read map information (as srid, extent) from MapInfoService (MapInfoService).
+          - feed an Artifact only (without forwarding into a new state) (FeedService).
+          - fetch the description of an Artifact only (DescribeArtifactService).
+          - create new Artifacts based on Recommendation objects and add them to
+            current Collection (LoadArtifactService).
+
+        * The DatacageWindow in charts now allows adding new themes to charts.
+
+        * Introduced a Recommendation mechanism in the CollectionView that loads Artifacts to the
+          current Collection based on the recommendations in the Artifact description of the master
+          Artifact.
+
+        * Extract background state/messages of master Artifacts. Lock CollectionView window if
+          master Artifacts have started background threads that have not finished yet and display
+          status messages in the lock screen.
+
+        * Added support to clone existing projects in the project list.
+
+        * Introduced copy&paste support in calculation result tables.
+
+        * Added new OutputTab MapOutputTab. This tab initializes map based on Gwt-OpenLayers.
+          The layers added to the map depend on the facets of the output.
+
+        * Added a CrossSectionChartThemePanel. This ThemePanel offers a spinner right besides the
+          theme name to modify the current km.
+
+        * Added a MapToolbar that offers controls for working with a map based on Gwt-OpenLayers.
+
+        * UI improvements:
+          - Stepping back/forward in parameterization no longer redraws the whole CollectionView.
+          - set the title of CollectionView windows when the name of a collection is modified in the project list.
+          - introduced "find-as-you-type" search in most input tables.
+
+        * Distinguish between 'chart' and 'map' output modes to create ChartOutputTabs or MapOutputTabs.
+
+        * Bumped GWT up to 2.3.0.
+
+
+    FIXES:
+
+        * flys/issue159 (WINFO: Radiobutton - Ortsauswahl bei "W für ungleichwertigen Abflusslängsschnitt" entfernen)
+
+        * flys/issue166 (Projektname in die Fensterleiste übernehmen)
+
+        * flys/issue181 (Erstes Thema in der Themenliste wählt sich automatisch wieder an)
+
+        * flys/issue185 (IE8 + Chromium: Kein Zoomen von Diagrammen möglich)
+
+        * flys/issue194 (Wasserspiegellagen: Hauptwerte Q/D Spaltenbezeichnung "Kenzeichnender Abfluss")
+
+        * flys/issue195 (Wasserspiegellagen: Q/D-Panel Spaltenbezeichnung "W/Q/D" -> "Q/D")
+
+        * flys/issue199 (Berechnete Abflusskurve / Dauerzahlen: Freies Textfeld akzeptiert mehr als einen Ort.)
+
+        * flys/issue203 (W-INFO: Wasserspiegellagenberechnung / Auswahlunterstützung Abfluss)
+
+        * flys/issue234 (W-INFO: Projektverwaltung)
+
+        * flys/issue239 (W-INFO: Wasserspiegellagenberechnung / Auswahlunterstützung Ort bzw. Strecke)
+
+        * flys/issue240 (W-INFO: Projektverwaltung / Einstellung dauerhaft)
+
+        * flys/issue259 (Daten aus Datenkorb in Diagramm einladen)
+
+        * flys/issue266 (Projektverwaltung: Duplizieren von Projekten)
+
+        * flys/issue282 (Karte: Abstand interpolierte Profile - Default wert)
+
+        * flys/issue285 (Projektverwaltung: Suche auf den Titeln)
+
+        * flys/issue286 (Karte: Tooltips für die Werkzeugleiste)
+
+        * flys/issue289 (Karte: Messen von Strecken und Flächen in falscher Dimension)
+
+        * flys/issue299 (Karte: Einige Farben vereinheitlichen)
+
+        * flys/issue293 (Karte: Farbliche Anpassung der digitalisierten Objekte)
+
+        * flys/issue305 (Suche: Löschen der Eingabe nach einem Wechseln des Tabs Strecke -> Ort)
+
+        * flys/issue309 (Querprofil: Manuelle Eingabe funktioniert nicht nach Return (nur nach Tab))
+
+        * flys/issue311 (Querprofil: i18n)
+
+        * flys/issue313 ("AssertionError" beim Wechsel von Deutsch zu Englisch in der Projektliste)
+
+
+
 2011-06-27  RELEASE 2.4
 
     NEW:

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Mon Sep 19 16:13:42 2011 +0000
@@ -17,7 +17,6 @@
 import com.smartgwt.client.widgets.layout.Layout;
 import com.smartgwt.client.widgets.layout.VLayout;
 import com.smartgwt.client.widgets.tab.TabSet;
-import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
 import de.intevation.flys.client.shared.model.Artifact;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePairWidget.java	Mon Sep 19 16:13:42 2011 +0000
@@ -1,21 +1,9 @@
 package de.intevation.flys.client.client.ui;
 
-import de.intevation.flys.client.client.event.DatacageHandler;
-
 import com.google.gwt.core.client.GWT;
 
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import com.smartgwt.client.util.SC;
-
 import com.smartgwt.client.widgets.Button;
 
-import com.smartgwt.client.widgets.tree.Tree;
-import com.smartgwt.client.widgets.tree.TreeGrid;
-import com.smartgwt.client.widgets.tree.TreeNode;
-
-import com.smartgwt.client.types.TreeModelType;
-
 import com.smartgwt.client.widgets.layout.VLayout;
 import com.smartgwt.client.widgets.layout.HLayout;
 
@@ -25,27 +13,14 @@
 import com.smartgwt.client.widgets.grid.ListGrid;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
-import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
-
 import de.intevation.flys.client.shared.model.Artifact;
 import de.intevation.flys.client.shared.model.User;
 import de.intevation.flys.client.shared.model.ToLoad;
 
 import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.Config;
 
-import de.intevation.flys.client.client.services.MetaDataService;
-import de.intevation.flys.client.client.services.MetaDataServiceAsync;
-
-import de.intevation.flys.client.shared.model.DataCageTree;
-import de.intevation.flys.client.shared.model.DataCageNode;
-import de.intevation.flys.client.shared.model.AttrList;
 import de.intevation.flys.client.shared.model.Recommendation;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
 
 /**
  * Widget showing two Datacages and a plus-button.

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java	Mon Sep 19 16:13:42 2011 +0000
@@ -26,7 +26,6 @@
 import de.intevation.flys.client.shared.model.User;
 
 import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.DatacageHandler;
 import de.intevation.flys.client.client.event.StepForwardEvent;
 import de.intevation.flys.client.shared.model.Recommendation;
 import de.intevation.flys.client.shared.model.ToLoad;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DemDatacagePanel.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DemDatacagePanel.java	Mon Sep 19 16:13:42 2011 +0000
@@ -1,9 +1,13 @@
 package de.intevation.flys.client.client.ui;
 
+import java.util.List;
+
 import de.intevation.flys.client.shared.model.Data;
 import de.intevation.flys.client.shared.model.DataItem;
 import de.intevation.flys.client.shared.model.DefaultData;
 import de.intevation.flys.client.shared.model.DefaultDataItem;
+import de.intevation.flys.client.shared.model.Recommendation;
+import de.intevation.flys.client.shared.model.ToLoad;
 import de.intevation.flys.client.shared.model.User;
 
 
@@ -43,10 +47,19 @@
 
     @Override
     protected Data[] getData() {
-        String value  = "TODO:FIND VALUE";
-        DataItem item = new DefaultDataItem(dataName, dataName, value);
+        Recommendation r = getSelectedRecommendation();
+
+        DataItem item = new DefaultDataItem(dataName, dataName, r.getIDs());
         return new Data[] { new DefaultData(
             dataName, null, null, new DataItem[] { item }) };
     }
+
+
+    protected Recommendation getSelectedRecommendation() {
+        ToLoad toLoad = widget.getSelection();
+        List<Recommendation> recoms = toLoad.toRecommendations();
+
+        return recoms.get(0);
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java	Mon Sep 19 16:13:42 2011 +0000
@@ -11,7 +11,6 @@
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import com.smartgwt.client.data.Criteria;
 import com.smartgwt.client.types.Alignment;
 import com.smartgwt.client.types.ListGridEditEvent;
 import com.smartgwt.client.types.ListGridFieldType;

--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableFilter.java	Fri Sep 16 13:24:36 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableFilter.java	Mon Sep 19 16:13:42 2011 +0000
@@ -5,9 +5,6 @@
 
 import com.google.gwt.core.client.GWT;
 
-import com.smartgwt.client.widgets.IButton;
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.form.DynamicForm;
 import com.smartgwt.client.widgets.form.fields.TextItem;
 import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;