comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java @ 8864:fa8897698133 3.2.x

Encode fixation preview image-URL with GWT-means.
author Tom Gottfried <tom@intevation.de>
date Fri, 19 Jan 2018 20:30:47 +0100
parents 5e38e2924c07
children 9be51f776798
comparison
equal deleted inserted replaced
8859:0862ea5d66ba 8864:fa8897698133
7 */ 7 */
8 8
9 package org.dive4elements.river.client.client.ui.fixation; 9 package org.dive4elements.river.client.client.ui.fixation;
10 10
11 import com.google.gwt.core.client.GWT; 11 import com.google.gwt.core.client.GWT;
12 import com.google.gwt.http.client.URL;
12 import com.google.gwt.i18n.client.DateTimeFormat; 13 import com.google.gwt.i18n.client.DateTimeFormat;
13 import com.google.gwt.i18n.client.NumberFormat; 14 import com.google.gwt.i18n.client.NumberFormat;
14 import com.google.gwt.json.client.JSONNumber; 15 import com.google.gwt.json.client.JSONNumber;
15 import com.google.gwt.json.client.JSONObject; 16 import com.google.gwt.json.client.JSONObject;
16 import com.google.gwt.json.client.JSONString; 17 import com.google.gwt.json.client.JSONString;
38 import org.dive4elements.river.client.client.Config; 39 import org.dive4elements.river.client.client.Config;
39 import org.dive4elements.river.client.client.FLYSConstants; 40 import org.dive4elements.river.client.client.FLYSConstants;
40 import org.dive4elements.river.client.client.services.FixingsOverviewService; 41 import org.dive4elements.river.client.client.services.FixingsOverviewService;
41 import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync; 42 import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync;
42 import org.dive4elements.river.client.client.ui.AbstractUIProvider; 43 import org.dive4elements.river.client.client.ui.AbstractUIProvider;
43 import org.dive4elements.river.client.shared.MapUtils;
44 import org.dive4elements.river.client.shared.model.Data; 44 import org.dive4elements.river.client.shared.model.Data;
45 import org.dive4elements.river.client.shared.model.DataList; 45 import org.dive4elements.river.client.shared.model.DataList;
46 import org.dive4elements.river.client.shared.model.FixAnalysisArtifact; 46 import org.dive4elements.river.client.shared.model.FixAnalysisArtifact;
47 import org.dive4elements.river.client.shared.model.FixFilter; 47 import org.dive4elements.river.client.shared.model.FixFilter;
48 import org.dive4elements.river.client.shared.model.FixingsOverviewInfo; 48 import org.dive4elements.river.client.shared.model.FixingsOverviewInfo;
155 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; 155 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact;
156 156
157 overviewService.generateOverview( 157 overviewService.generateOverview(
158 locale, 158 locale,
159 artifact.getUuid(), 159 artifact.getUuid(),
160 MapUtils.toJavaEncodedString(getOverviewFilter(art.getFilter())), 160 getOverviewFilter(art.getFilter()),
161 renderCheckboxes(), 161 renderCheckboxes(),
162 callBack, 162 callBack,
163 new AsyncCallback<FixingsOverviewInfo>() { 163 new AsyncCallback<FixingsOverviewInfo>() {
164 @Override 164 @Override
165 public void onFailure(Throwable caught) { 165 public void onFailure(Throwable caught) {
295 } 295 }
296 else { 296 else {
297 hHeight = (int)(hWidth *3f/4); 297 hHeight = (int)(hWidth *3f/4);
298 } 298 }
299 299
300 String imgUrl = GWT.getModuleBaseURL(); 300 String imgUrl = URL.encode(GWT.getModuleBaseURL()
301 imgUrl += "fixings-km-chart"; 301 + "fixings-km-chart"
302 imgUrl += "?locale=" + locale; 302 + "?locale=" + locale
303 imgUrl += "&filter=" + getChartFilter(filter, hWidth, hHeight); 303 + "&filter=" + getChartFilter(filter, hWidth, hHeight));
304 304
305 if (chartContainer.hasMember(chartImg)) { 305 if (chartContainer.hasMember(chartImg)) {
306 chartImg.setWidth(hWidth); 306 chartImg.setWidth(hWidth);
307 chartImg.setHeight(hHeight); 307 chartImg.setHeight(hHeight);
308 chartImg.setSrc(imgUrl); 308 chartImg.setSrc(imgUrl);

http://dive4elements.wald.intevation.org