Mercurial > dive4elements > river

changeset 7945:2235bc9b66c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 18 Jun 2014 14:29:05 +0200
parents 9b092c960455 (diff) 2fc967e24f03 (current diff)
children 0f1a3bbfd243
files
diffstat 10 files changed, 24 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh	Wed Jun 18 12:32:24 2014 +0200
+++ b/contrib/make_flys_release/make_release.sh	Wed Jun 18 14:29:05 2014 +0200
@@ -264,6 +264,9 @@
 fi
 cp -r $FLYS_SOURCE_DIR/OpenLayers-2.11 $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/
 
+echo "INFO: Downloading smartGWT"
+mvn com.isomorphic:isc-maven-plugin:install -Dproduct=SMARTGWT -Dlicense=LGPL -DbuildNumber=4.1p
+
 echo "INFO: compile and build sources"
 mvn -f $FLYS_SOURCE_DIR/framework/pom.xml clean compile package install
 mvn -f $FLYS_SOURCE_DIR/river/backend/pom.xml clean compile package install
--- a/gwt-client/pom.xml	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/pom.xml	Wed Jun 18 14:29:05 2014 +0200
@@ -38,9 +38,9 @@
       <version>2.5</version>
     </dependency-->
     <dependency>
-      <groupId>com.smartgwt</groupId>
-      <artifactId>smartgwt</artifactId>
-      <version>3.1</version>
+      <groupId>com.isomorphic.smartgwt.lgpl</groupId>
+      <artifactId>smartgwt-lgpl</artifactId>
+      <version>[4.1,5.0)</version>
     </dependency>
     <dependency>
       <groupId>org.dive4elements</groupId>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/LocationDistancePanel.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/LocationDistancePanel.java	Wed Jun 18 14:29:05 2014 +0200
@@ -250,7 +250,7 @@
 
         ListGridField addDistance = new ListGridField ("", "");
         addDistance.setType (ListGridFieldType.ICON);
-        addDistance.setWidth (20);
+        addDistance.setWidth (30);
         addDistance.addRecordClickHandler (new RecordClickHandler () {
             @Override
             public void onRecordClick (RecordClickEvent e) {
@@ -463,12 +463,12 @@
             }
         };
 
-        ListGridField addfrom = new ListGridField ("from", MESSAGES.from());
+        ListGridField addfrom = new ListGridField ("fromIcon", MESSAGES.from());
         addfrom.setType (ListGridFieldType.ICON);
         addfrom.setWidth (30);
         addfrom.setCellIcon(baseUrl + MESSAGES.markerGreen());
 
-        ListGridField addto2 = new ListGridField ("to", MESSAGES.to());
+        ListGridField addto2 = new ListGridField ("toIcon", MESSAGES.to());
         addto2.setType (ListGridFieldType.ICON);
         addto2.setWidth (30);
         addto2.setCellIcon(baseUrl + MESSAGES.markerRed());
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.java	Wed Jun 18 14:29:05 2014 +0200
@@ -11,6 +11,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
 
+import com.smartgwt.client.data.DateRange;
 import com.smartgwt.client.types.ListGridFieldType;
 import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.Canvas;
@@ -70,8 +71,9 @@
         add.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent ce) {
-                Date f = inputPanel.getFromDate();
-                Date t = inputPanel.getToDate();
+                DateRange range = inputPanel.getValue();
+                Date f = range.getStartDate();
+                Date t = range.getEndDate();
                 if (f == null || t == null) {
                     return;
                 }
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java	Wed Jun 18 14:29:05 2014 +0200
@@ -11,6 +11,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
 
+import com.smartgwt.client.data.DateRange;
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
@@ -182,8 +183,9 @@
 
 
     protected boolean saveDateValues() {
-        Date st = inputPanel.getFromDate();
-        Date en = inputPanel.getToDate();
+        DateRange range = inputPanel.getValue();
+        Date st = range.getStartDate();
+        Date en = range.getEndDate();
         if (st == null || en == null) {
             SC.warn(MSG.error_wrong_date());
             return false;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.java	Wed Jun 18 14:29:05 2014 +0200
@@ -494,7 +494,7 @@
             SC.warn(msg);
 
             ListGridRecord[] rs = grid.getRecords();
-            rs[row] = (ListGridRecord) event.getOldRecord();
+            rs[row] = (ListGridRecord) event.getOldValues();
             grid.setRecords(rs);
 
             return;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WikiLinks.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WikiLinks.java	Wed Jun 18 14:29:05 2014 +0200
@@ -74,7 +74,9 @@
         DynamicForm form = new DynamicForm();
         LinkItem item = new LinkItem(quotedText);
         item.setShowTitle(false);
+        item.setLinkTitle(quotedText);
         item.setTarget(quotedUrl);
+        form.setItems(item);
         return form;
     }
 
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java	Wed Jun 18 14:29:05 2014 +0200
@@ -219,7 +219,7 @@
                     catch (NumberFormatException nfe) {
                         SC.warn(MSG.ele_window_format_error() + " " + z);
 
-                        PointRecord old = (PointRecord) evt.getOldRecord();
+                        PointRecord old = (PointRecord) evt.getOldValues();
 
                         ListGridRecord[] records = grid.getRecords();
                         records[evt.getRowNum()] = old;
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java	Wed Jun 18 14:29:05 2014 +0200
@@ -93,7 +93,7 @@
                 catch(NumberFormatException nfe) {
                     return;
                 }
-                Record r = new Record();
+                ListGridRecord r = new ListGridRecord();
                 r.setAttribute("from", v1);
                 r.setAttribute("to", v2);
                 elements.addData(r);
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java	Wed Jun 18 12:32:24 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java	Wed Jun 18 14:29:05 2014 +0200
@@ -44,12 +44,12 @@
         setEmptyMessage(MSG.empty_filter());
         setCanReorderFields(false);
 
-        ListGridField addfrom = new ListGridField ("from", MSG.from());
+        ListGridField addfrom = new ListGridField ("fromIcon", MSG.from());
         addfrom.setType(ListGridFieldType.ICON);
         addfrom.setWidth(30);
         addfrom.setCellIcon(baseUrl + MSG.markerGreen());
 
-        ListGridField addto = new ListGridField("to", MSG.to());
+        ListGridField addto = new ListGridField("toIcon", MSG.to());
         addto.setType(ListGridFieldType.ICON);
         addto.setWidth(30);
         addto.setCellIcon(baseUrl + MSG.markerRed());
http://dive4elements.wald.intevation.org