# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1307451117 0
# Node ID 605debcbb6a0980f11a0f0e421b7198c84935dd1
# Parent  e74bf6bfeeb658021b9b64d75d76404a100e2085
Adjusted the return values of the CSVExportService, so that GWT can handle those values better.

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

diff -r e74bf6bfeeb6 -r 605debcbb6a0 flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportService.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportService.java	Tue Jun 07 10:03:19 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportService.java	Tue Jun 07 12:51:57 2011 +0000
@@ -19,7 +19,7 @@
     /**
      * This method returns a list of DistanceInfoObjects for a specific river.
      */
-    List getCSV(
+    List<String[]> getCSV(
         String serverUrl,
         String locale,
         String uuid,
diff -r e74bf6bfeeb6 -r 605debcbb6a0 flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java	Tue Jun 07 10:03:19 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/services/CSVExportServiceAsync.java	Tue Jun 07 12:51:57 2011 +0000
@@ -14,6 +14,6 @@
         String locale,
         String uuid,
         String name,
-        AsyncCallback<List> cb);
+        AsyncCallback<List<String[]>> cb);
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r e74bf6bfeeb6 -r 605debcbb6a0 flys-client/src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java	Tue Jun 07 10:03:19 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/TableDataPanel.java	Tue Jun 07 12:51:57 2011 +0000
@@ -5,6 +5,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
+import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.layout.VLayout;
@@ -72,13 +73,13 @@
         dataTable.setShowHeaderContextMenu(false);
 
         exportService.getCSV(url, locale, uuid, name,
-            new AsyncCallback<List>() {
+            new AsyncCallback<List<String[]>>() {
                 public void onFailure(Throwable caught) {
                     GWT.log("Could not recieve csv.");
-                    GWT.log(caught.getMessage());
+                    SC.warn(caught.getMessage());
                 }
 
-                public void onSuccess(List l) {
+                public void onSuccess(List<String[]> l) {
                     GWT.log("Recieved csv with " + l.size() + " lines.");
                     setData(l);
                 }
diff -r e74bf6bfeeb6 -r 605debcbb6a0 flys-client/src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java	Tue Jun 07 10:03:19 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/CSVExportServiceImpl.java	Tue Jun 07 12:51:57 2011 +0000
@@ -34,7 +34,7 @@
     public static final String ERROR_NO_EXPORT_FOUND =
         "error_no_export_found";
 
-    public List getCSV(
+    public List<String[]> getCSV(
         String url,
         String locale,
         String uuid,
@@ -62,7 +62,7 @@
             Reader reader       = new InputStreamReader (in, "UTF-8");
             CSVReader csvReader = new CSVReader (reader);
 
-            return csvReader.readAll ();
+            return (List<String[]>) csvReader.readAll ();
         }
         catch (IOException ce) {
             System.err.println(ce.getLocalizedMessage());