# HG changeset patch # User Raimund Renkert # Date 1403094545 -7200 # Node ID 2235bc9b66c0acbd0e67203d7b329afee9becb2b # Parent 9b092c960455c3eb8d8820a3c2b2c0302765d8fe# Parent 2fc967e24f03576ff707b16595da8bed91db1216 merged. diff -r 2fc967e24f03 -r 2235bc9b66c0 contrib/make_flys_release/make_release.sh --- 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 diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/pom.xml --- 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 @@ 2.5 - com.smartgwt - smartgwt - 3.1 + com.isomorphic.smartgwt.lgpl + smartgwt-lgpl + [4.1,5.0) org.dive4elements diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/LocationDistancePanel.java --- 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()); diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.java --- 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; } diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java --- 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; diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.java --- 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; diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WikiLinks.java --- 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; } diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java --- 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; diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java --- 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); diff -r 2fc967e24f03 -r 2235bc9b66c0 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java --- 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());