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

Merged

author	Christian Lins <christian.lins@intevation.de>
date	Fri, 19 Oct 2012 09:20:52 +0200
parents	9be8d7942284
children	79878efbdf07

comparison

equal deleted inserted replaced

-:ad2489b595d7
+:1755a1bfe5ce
 * GWT Tree.treeItemIterator returns another TreeItem for each
 * GaugeInfoItem */
 if (item instanceof GaugeInfoItem) {
 boolean setstate = false;
 GaugeInfoItem gitem = (GaugeInfoItem)item;
-if (end == null) {
+if (end == null && gitem.getStart() != null) {
 if (gitem.getStart() >= start) {
 setstate = true;
 }
 }
 else {
 item.setState(setstate);
 }
 }
 }
+/**
+* Open Gauge entry if a location fits to the gauge
+*/
 public void openOnLocations(List<Double> locations) {
 GWT.log("GaugeTree - openOnLocations " + locations + " " +
 tree.getItemCount());
 if (locations == null || locations.isEmpty()) {
 boolean isset = false;
 for (Double location: locations) {
 if (locations == null) {
 continue;
 }
-if (location >= gitem.getStart() &&
-location <= gitem.getEnd()) {
+Double start = gitem.getStart();
+Double end   = gitem.getEnd();
+if (start == null || end == null) {
+// should not occur but avoid NullPointerException
+continue;
+}
+if (location >= start && location <= end) {
 isset = true;
 break;
 }
 }
 item.setState(isset);
 }
 }
 }

Mercurial > dive4elements > river