dive4elements/river: flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java comparison

Bugfix in the range/location panel - avoid NullPointerExceptions in getData(). flys-client/trunk@1999 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Wed, 25 May 2011 07:05:22 +0000
parents	ec965bf8dfef
children	9f16ac843dda

comparison

equal deleted inserted replaced

-:77234b1d009c
+:9e2b151770bd
 package de.intevation.flys.client.client.ui;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 DoubleRangePanel form = (DoubleRangePanel) member;
 saveDistanceValues(form);
 }
 }
-return new Data[] {
+Data dMode      = getDataMode();
-getDataMode(),
+Data dLocations = getDataLocations();
-getDataLocations(),
+Data dFrom      = getDataFrom();
-getDataFrom(),
+Data dTo        = getDataTo();
-getDataTo(),
+Data dStep      = getDataStep();
-getDataStep() };
+List<Data> data = new ArrayList<Data>();
+if (dMode != null) {
+data.add(dMode);
+}
+if (dLocations != null) {
+data.add(dLocations);
+}
+if (dFrom != null) {
+data.add(dFrom);
+}
+if (dTo != null) {
+data.add(dTo);
+}
+if (dStep != null) {
+data.add(dStep);
+}
+return (Data[]) data.toArray(new Data[data.size()]);
 }
 /**
 * Returns the Data object for the 'mode' attribute.
 protected Data getDataLocations() {
 double[] locations = getLocationValues();
 boolean  first     = true;
+if (locations == null) {
+return null;
+}
 StringBuilder sb = new StringBuilder();
 for (double l: locations) {
 if (!first) {

Mercurial > dive4elements > river