changeset 1437:1d82a2c695a6

Fix ThemeList.toMaps flys-client/trunk@3402 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 13 Dec 2011 13:23:18 +0000
parents 29fc2d1dfe9b
children 432180235caf
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java
diffstat 2 files changed, 22 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Tue Dec 13 11:11:48 2011 +0000
+++ b/flys-client/ChangeLog	Tue Dec 13 13:23:18 2011 +0000
@@ -1,3 +1,23 @@
+2011-12-13	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/shared/model/ThemeList.java:
+	  Fix. Respect fact that ThemeLists indices are not 0-based.
+
+2011-12-13	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	For CrossSections, enable kilometer- and master-selection from
+	client.
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.java: Added
+	  translation.
+	
+	* src/main/java/de/intevation/flys/client/client/ui/chart/CrossSectionChartThemePanel.java:
+	  Added input element to select a (cross section) master and 
+	  make km spinners work.
+
 2011-12-13	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Provide access to Artifacts Data via Themes and CollectionItems.
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java	Tue Dec 13 11:11:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/ThemeList.java	Tue Dec 13 13:23:18 2011 +0000
@@ -109,7 +109,7 @@
     public LinkedHashMap<String, String> toMapIndexDescription(String facetName) {
         int count = getThemeCount();
         LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
-        for (int i = 0; i < count; i++) {
+        for (int i = 0; i <= count; i++) {
             Theme theme = getThemeAt(i + 1);
 
             if (theme == null || theme.getVisible() == 0) {
@@ -130,7 +130,7 @@
     ) {
         int count = getThemeCount();
         LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
-        for (int i = 0; i < count; i++) {
+        for (int i = 0; i <= count; i++) {
             Theme theme = getThemeAt(i + 1);
 
             if (theme == null || theme.getVisible() == 0) {

http://dive4elements.wald.intevation.org