Mercurial > dive4elements > river

comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java @ 8856:5e38e2924c07 3.2.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix code style.
author Tom Gottfried <tom@intevation.de>
date Thu, 18 Jan 2018 20:12:01 +0100
parents d87b32635bb5
children ae298eccc25c
comparison
equal deleted inserted replaced
8855:d7c005e12af0 8856:5e38e2924c07
191 PropertyGroup origPg = (PropertyGroup)orig; 191 PropertyGroup origPg = (PropertyGroup)orig;
192 192
193 if (pg.getName().equals("axis")) { 193 if (pg.getName().equals("axis")) {
194 // Certain axis shall be skipped (W/Q-Diagrams cm-axis especially). 194 // Certain axis shall be skipped (W/Q-Diagrams cm-axis especially).
195 String outputName = tab.getOutputName(); 195 String outputName = tab.getOutputName();
196 if (outputName.equals("fix_wq_curve") || outputName.equals("computed_discharge_curve") 196 if (outputName.equals("fix_wq_curve")
197 || outputName.equals("computed_discharge_curve")
197 || outputName.equals("extreme_wq_curve")) { 198 || outputName.equals("extreme_wq_curve")) {
198 String labelString = ((StringProperty)origPg.getPropertyByName("label")).getValue(); 199 String labelString = ((StringProperty)origPg.getPropertyByName(
200 "label")).getValue();
199 if(labelString.equals("W [cm]")) { 201 if(labelString.equals("W [cm]")) {
200 VLayout layout = new VLayout(); 202 VLayout layout = new VLayout();
201 layout.setHeight(0); 203 layout.setHeight(0);
202 return layout; 204 return layout;
203 } 205 }
221 if (suggestedLabel != null) { 223 if (suggestedLabel != null) {
222 // X Axis does not have a suggested label 224 // X Axis does not have a suggested label
223 // otherwise add an hidden property for suggestedLabel 225 // otherwise add an hidden property for suggestedLabel
224 sugLabel = createStringProperty(suggestedLabel); 226 sugLabel = createStringProperty(suggestedLabel);
225 sugLabel.setValue( 227 sugLabel.setValue(
226 ((StringProperty)origPg.getPropertyByName("suggested-label")).getValue()); 228 ((StringProperty)origPg.getPropertyByName(
229 "suggested-label")).getValue());
227 } 230 }
228 231
229 IntegerProperty fontsize = 232 IntegerProperty fontsize =
230 (IntegerProperty)pg.getPropertyByName("font-size"); 233 (IntegerProperty)pg.getPropertyByName("font-size");
231 FormItem fs = createIntegerProperty(fontsize); 234 FormItem fs = createIntegerProperty(fontsize);
268 ((DoubleProperty) 271 ((DoubleProperty)
269 origPg.getPropertyByName("lower")).toUIString()); 272 origPg.getPropertyByName("lower")).toUIString());
270 } else { 273 } else {
271 // Time range axis 274 // Time range axis
272 scaleLayout = new VLayout(); 275 scaleLayout = new VLayout();
273 StringProperty dateUpper = (StringProperty)pg.getPropertyByName("upper-time"); 276 StringProperty dateUpper =
274 StringProperty dateLower = (StringProperty)pg.getPropertyByName("lower-time"); 277 (StringProperty)pg.getPropertyByName("upper-time");
278 StringProperty dateLower =
279 (StringProperty)pg.getPropertyByName("lower-time");
275 if (dateUpper != null && dateLower != null) { 280 if (dateUpper != null && dateLower != null) {
276 DateItem lowerDI = createDateProperty(dateLower); 281 DateItem lowerDI = createDateProperty(dateLower);
277 DateItem upperDI = createDateProperty(dateUpper); 282 DateItem upperDI = createDateProperty(dateUpper);
278 StringProperty origUp = (StringProperty)origPg.getPropertyByName("upper-time"); 283 StringProperty origUp =
279 StringProperty origLow = (StringProperty)origPg.getPropertyByName("lower-time"); 284 (StringProperty)origPg.getPropertyByName("upper-time");
285 StringProperty origLow =
286 (StringProperty)origPg.getPropertyByName("lower-time");
280 try { 287 try {
281 lowerDI.setValue(new Date(Long.valueOf(origLow.getValue()))); 288 lowerDI.setValue(new Date(
282 upperDI.setValue(new Date(Long.valueOf(origUp.getValue()))); 289 Long.valueOf(origLow.getValue())));
290 upperDI.setValue(new Date(
291 Long.valueOf(origUp.getValue())));
283 } catch (NumberFormatException e) { 292 } catch (NumberFormatException e) {
284 // Just leave it at default then. 293 // Just leave it at default then.
285 } 294 }
286 range1candidate = upperDI; 295 range1candidate = upperDI;
287 range2candidate = lowerDI; 296 range2candidate = lowerDI;
294 303
295 BooleanProperty fixation = 304 BooleanProperty fixation =
296 (BooleanProperty)pg.getPropertyByName("fixation"); 305 (BooleanProperty)pg.getPropertyByName("fixation");
297 FormItem fix = createBooleanProperty(fixation); 306 FormItem fix = createBooleanProperty(fixation);
298 fix.setValue(((BooleanProperty) 307 fix.setValue(((BooleanProperty)
299 origPg.getPropertyByName("fixation")).getValue().booleanValue()); 308 origPg.getPropertyByName("fixation"))
309 .getValue().booleanValue());
300 fix.setWidth(30); 310 fix.setWidth(30);
301 311
302 fix.addChangedHandler(new ChangedHandler() { 312 fix.addChangedHandler(new ChangedHandler() {
303 @Override 313 @Override
304 public void onChanged(ChangedEvent e) { 314 public void onChanged(ChangedEvent e) {
379 389
380 String choiceAttribute = sp.getAttribute("choice"); 390 String choiceAttribute = sp.getAttribute("choice");
381 391
382 if (choiceAttribute != null && choiceAttribute.equals("logo")) { 392 if (choiceAttribute != null && choiceAttribute.equals("logo")) {
383 SelectItem logoChooser = new SelectItem(); 393 SelectItem logoChooser = new SelectItem();
384 logoChooser.setImageURLPrefix(GWT.getHostPageBaseURL() + "images/logo-"); 394 logoChooser.setImageURLPrefix(
395 GWT.getHostPageBaseURL() + "images/logo-");
385 logoChooser.setValueIconHeight(50); 396 logoChooser.setValueIconHeight(50);
386 logoChooser.setValueIconWidth(100); 397 logoChooser.setValueIconWidth(100);
387 398
388 LinkedHashMap valueMap = new LinkedHashMap<String, String>(); 399 LinkedHashMap valueMap = new LinkedHashMap<String, String>();
389 LinkedHashMap<String, String> valueIcons = new LinkedHashMap<String, String>(); 400 LinkedHashMap<String, String> valueIcons =
401 new LinkedHashMap<String, String>();
390 valueMap.put("none", MSG.getString("none")); 402 valueMap.put("none", MSG.getString("none"));
391 /* 403 /*
392 If you want to add images, remember to change code in these places: 404 If you want to add images, remember to change code in these places:
393 flys-artifacts: 405 flys-artifacts:
394 XYChartGenerator.java 406 XYChartGenerator.java
http://dive4elements.wald.intevation.org