[Dive4elements-commits] [PATCH] flys-client: Shapefile upload widget readded again (regression)

[Wald Commits]

# HG changeset patch
# User Christian Lins <christian.lins at intevation.de>
# Date 1354022446 -3600
# Node ID 32a4651eef93b4ff5546ec34ebaf6be773cfbea5
# Parent  b87073a05f9d86aed4667480422ad7c3b74a4ae8
flys-client: Shapefile upload widget readded again (regression).

diff -r b87073a05f9d -r 32a4651eef93 flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Tue Nov 27 12:50:10 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java	Tue Nov 27 14:20:46 2012 +0100
@@ -108,6 +108,7 @@
 
             if (FLOODMAP_WSPLGEN.equals(name)) {
                 setInitialExtent(extent);
+                logger.debug("MapGenerator.doOut(): attr = " + XMLUtils.toString(attr));
                 createWSPLGENLayer(flys, wms, attr);
             }
             else if (FLOODMAP_BARRIERS.equals(name)) {
diff -r b87073a05f9d -r 32a4651eef93 flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Tue Nov 27 12:50:10 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Tue Nov 27 14:20:46 2012 +0100
@@ -2,7 +2,6 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-
 import com.smartgwt.client.types.Encoding;
 import com.smartgwt.client.types.VerticalAlignment;
 import com.smartgwt.client.util.SC;
@@ -204,6 +203,7 @@
             layout.addMember(uploadLabel);
             layout.addMember(uploadForm);
             layout.addMember(submit);
+            layout.addMember(getNextButton());
         }
 
         form.setValues(initial);
diff -r b87073a05f9d -r 32a4651eef93 flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Tue Nov 27 12:50:10 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SelectProvider.java	Tue Nov 27 14:20:46 2012 +0100
@@ -58,12 +58,19 @@
      */
     @Override
     public Canvas create(DataList data) {
+        VLayout v = new VLayout();
+        v.setMembersMargin(10);
+        v.addMember(createWidget(data));
+        if(data.size() > COMBOBOX_THRESHOLD) {
+            v.addMember(getNextButton());
+        }
+        return v;
+    }
+
+
+    protected Canvas createWidget(DataList data) {
         if (data.size() > COMBOBOX_THRESHOLD) {
-            VLayout v = new VLayout();
-            v.setMembersMargin(10);
-            v.addMember(createComboboxWidget(data));
-            v.addMember(getNextButton());
-            return v;
+            return createComboboxWidget(data);
         }
         else {
             return createListWidget(data);
@@ -71,11 +78,6 @@
     }
 
 
-    protected Canvas createWidget(DataList data) {
-        return create(data);
-    }
-
-
     @Override
     public Canvas createOld(DataList dataList) {
         HLayout layout  = new HLayout();