# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1337091780 0
# Node ID 39cf246b28c498efaa9b38772463a3057027f055
# Parent  885b0213052820bcf069da82c91c6655b06c150d
Revert last commit which contains configuration modifications.

flys-client/trunk@4411 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 885b02130528 -r 39cf246b28c4 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Tue May 15 14:21:39 2012 +0000
+++ b/flys-client/ChangeLog	Tue May 15 14:23:00 2012 +0000
@@ -1,9 +1,3 @@
-2012-05-15  Ingo Weinzierl <ingo@intevation.de>
-
-	* src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java:
-	  Implemented getData() which now returns the selected values from
-	  ParameterMatrix as colon separated string.
-
 2012-05-14	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java:
diff -r 885b02130528 -r 39cf246b28c4 flys-client/pom.xml
--- a/flys-client/pom.xml	Tue May 15 14:21:39 2012 +0000
+++ b/flys-client/pom.xml	Tue May 15 14:23:00 2012 +0000
@@ -129,9 +129,6 @@
           <hostedWebapp>target/www</hostedWebapp>
           <!-- Ask GWT to create the Story of Your Compile (SOYC) (gwt:compile) -->
           <soyc>true</soyc>
-          <port>8881</port>
-          <codeServerPort>9991</codeServerPort>
-          <logLevel>INFO' -bindAddress 0.0.0.0 -codeServerPort 9991 -logLevel 'INFO</logLevel>
         </configuration>
       </plugin>
 
diff -r 885b02130528 -r 39cf246b28c4 flys-client/src/main/java/de/intevation/flys/client/client/config.xml
--- a/flys-client/src/main/java/de/intevation/flys/client/client/config.xml	Tue May 15 14:21:39 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/config.xml	Tue May 15 14:23:00 2012 +0000
@@ -1,5 +1,5 @@
 <config>
-    <server>http://localhost:1610</server>
+    <server>http://localhost:8181</server>
 
     <projectlist>
         <!-- The interval to update the user's projects (in ms) -->
diff -r 885b02130528 -r 39cf246b28c4 flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java	Tue May 15 14:21:39 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java	Tue May 15 14:23:00 2012 +0000
@@ -1,9 +1,5 @@
 package de.intevation.flys.client.client.ui;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.google.gwt.core.client.GWT;
 
 import com.smartgwt.client.types.FieldType;
@@ -14,8 +10,6 @@
 import de.intevation.flys.client.shared.model.Data;
 import de.intevation.flys.client.shared.model.DataItem;
 import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
 import de.intevation.flys.client.shared.model.IntegerOptionsData;
 
 /**
@@ -23,52 +17,12 @@
  */
 public class ParameterMatrixPanel extends AbstractUIProvider {
 
-    private ParameterMatrix matrix;
-
     @Override
     protected Data[] getData() {
-        Map<String, List<String>> selection = matrix.getSelection();
-        Set<Map.Entry<String, List<String>>> entries = selection.entrySet();
-
-        Data[] list = new Data[selection.size()];
-
-        int i = 0;
-
-        for (Map.Entry<String, List<String>> entry: entries) {
-            String value = buildValueString(entry.getValue());
-
-            DataItem item = new DefaultDataItem(
-                entry.getKey(),
-                null,
-                value);
-
-            list[i++] = new DefaultData(
-                entry.getKey(), null, null, new DataItem[] { item });
-        }
-
-        return list;
+        GWT.log("TODO: IMPLEMENT RadioPanel.getData()");
+        return new Data[0];
     }
 
-
-    protected String buildValueString(List<String> values) {
-        StringBuilder sb = new StringBuilder();
-
-        boolean first = true;
-
-        for (String value: values) {
-            if (!first) {
-                sb.append(";");
-            }
-
-            sb.append(value);
-
-            first = false;
-        }
-
-        return sb.toString();
-    }
-
-
     @Override
     public Canvas createOld(DataList dataList) {
         GWT.log("TODO: IMPLEMENT RadioPanel.createOld()");
@@ -80,7 +34,7 @@
         VLayout v = new VLayout();
         v.addMember(createTitle(dataList));
 
-        matrix = new ParameterMatrix();
+        ParameterMatrix matrix = new ParameterMatrix();
 
         for (Data data: dataList.getAll()) {
             if (data instanceof IntegerOptionsData) {
@@ -89,7 +43,6 @@
         }
 
         v.addMember(matrix.create());
-        v.addMember(getNextButton());
 
         return v;
     }
diff -r 885b02130528 -r 39cf246b28c4 flys-client/src/main/webapp/WEB-INF/web.xml
--- a/flys-client/src/main/webapp/WEB-INF/web.xml	Tue May 15 14:21:39 2012 +0000
+++ b/flys-client/src/main/webapp/WEB-INF/web.xml	Tue May 15 14:23:00 2012 +0000
@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>server-url</param-name>
-        <param-value>http://localhost:1610</param-value>
+        <param-value>http://localhost:8181</param-value>
     </context-param>
   
   <!-- Servlets -->