Mercurial > dive4elements > river
changeset 2524:39cf246b28c4
Revert last commit which contains configuration modifications.
flys-client/trunk@4411 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 15 May 2012 14:23:00 +0000 |
parents | 885b02130528 |
children | da1d897ed66d |
files | flys-client/ChangeLog flys-client/pom.xml flys-client/src/main/java/de/intevation/flys/client/client/config.xml flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java flys-client/src/main/webapp/WEB-INF/web.xml |
diffstat | 5 files changed, 5 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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>
--- 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) -->
--- 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; }
--- 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 -->