changeset 582:78907f0fb939

Added dummy report panel. flys-client/trunk@2170 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Jun 2011 16:35:43 +0000
parents 210339fd1a34
children 6ec50e517bc0
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java
diffstat 9 files changed, 27 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/ChangeLog	Mon Jun 20 16:35:43 2011 +0000
@@ -1,3 +1,17 @@
+2011-06-20	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/ParameterList.java: Added report panel.
+
+	* src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java,
+	  src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java,
+	  src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java,
+	  src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java:
+	  Removed superfluous imports.
+
+	* src/main/java/de/intevation/flys/client/client/ui/CollectionView.java:
+	  'boolean ? true : false' <=> 'boolean'
+	
 2011-06-20	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java	Mon Jun 20 16:35:43 2011 +0000
@@ -280,7 +280,7 @@
      * @return true, if the Collection is new.
      */
     public boolean isNew() {
-        return collection.getItemLength() == 0 ? true : false;
+        return collection.getItemLength() == 0;
     }
 
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWindow.java	Mon Jun 20 16:35:43 2011 +0000
@@ -1,7 +1,6 @@
 package de.intevation.flys.client.client.ui;
 
 import java.util.List;
-import java.util.ArrayList;
 
 import com.google.gwt.core.client.GWT;
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java	Mon Jun 20 16:35:43 2011 +0000
@@ -1,7 +1,6 @@
 package de.intevation.flys.client.client.ui;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Mon Jun 20 16:35:43 2011 +0000
@@ -90,8 +90,10 @@
     protected VLayout oldItems;
     protected VLayout currentItems;
     protected VLayout exportModes;
+    protected VLayout report;
     protected Canvas  helperPanel;
     protected Canvas  tablePanel;
+    protected Canvas  reportPanel;
 
     public ParameterList(FLYS flys, CollectionView cView, String title) {
         super(title);
@@ -105,6 +107,7 @@
         oldItems          = new VLayout();
         currentItems      = new VLayout();
         exportModes       = new VLayout();
+        report            = new VLayout();
 
         addParameterChangeHandler(this);
 
@@ -130,6 +133,7 @@
         oldItems          = new VLayout();
         currentItems      = new VLayout();
         exportModes       = new VLayout();
+        report            = new VLayout();
 
         init();
 
@@ -159,6 +163,12 @@
         left.addMember(oldItems);
         left.addMember(currentItems);
         left.addMember(exportModes);
+        left.addMember(report);
+
+        reportPanel = new Canvas();
+        //reportPanel.setContents("<strong>I was here!</strong>");
+        reportPanel.setHeight("*");
+        report.addMember(reportPanel);
 
         // This canvas is used to render helper widgets
         helperPanel = new Canvas();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java	Mon Jun 20 16:35:43 2011 +0000
@@ -942,7 +942,7 @@
     public boolean isRangeMode() {
         String rMode = modes.getValueAsString(FIELD_MODE);
 
-        return rMode.equals(FIELD_MODE_RANGE) ? true : false;
+        return rMode.equals(FIELD_MODE_RANGE);
     }
 
 
@@ -953,7 +953,7 @@
      */
     public boolean isWMode() {
         String wq = modes.getValueAsString(FIELD_WQ);
-        return wq.equals(FIELD_WQ_W) ? true : false;
+        return wq.equals(FIELD_WQ_W);
     }
 
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/MousePositionPanel.java	Mon Jun 20 16:35:43 2011 +0000
@@ -2,7 +2,6 @@
 
 import com.google.gwt.i18n.client.NumberFormat;
 
-import com.smartgwt.client.types.Alignment;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.layout.HLayout;
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/DescribeCollectionServiceImpl.java	Mon Jun 20 16:35:43 2011 +0000
@@ -9,7 +9,6 @@
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
--- a/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java	Mon Jun 20 16:25:48 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/DistanceInfoServiceImpl.java	Mon Jun 20 16:35:43 2011 +0000
@@ -3,11 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.xpath.XPathConstants;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;

http://dive4elements.wald.intevation.org