[Schmitzm-commits] r671 - in branches/2.0-RC2/src: schmitzm/jfree/feature/style skrueger/geotools/selection

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-02-03 20:08:37 +0100 (Wed, 03 Feb 2010)
New Revision: 671

Modified:
   branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
   branches/2.0-RC2/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
Log:


Modified: branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
===================================================================
--- branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-02-03 18:57:43 UTC (rev 670)
+++ branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-02-03 19:08:37 UTC (rev 671)
@@ -278,8 +278,12 @@
 			SimpleFeature f = fi.next();
 			// Determine X value (NULL not permitted for XYDateset!)
 			Number xValue = (Number) f.getAttribute(xAttrName);
+			
+			// Filter out NODATA values
+			xValue = chartStyle.filterNoDataValue(0, xValue);
 			if (xValue == null)
 				continue;
+			
 			// Determine the Y values and fill the series
 			for (int attrIdx = 1; attrIdx < attrCount; attrIdx++) {
 				String yAttrName = chartStyle.getAttributeName(attrIdx);
@@ -486,8 +490,13 @@
 				// Determine the category (NULL not permitted!)
 				Comparable<?> catValue = (Comparable<?>) f
 						.getAttribute(xAttrName);
+				
+				// Filter out NODATA values
+				catValue = chartStyle.filterNoDataValue(0, catValue);
+				
 				if (catValue == null)
 					continue;
+				
 				// Determine the Y values and fill the dataset
 				for (int attrIdx = 1; attrIdx < attrCount; attrIdx++) {
 					String yAttrName = chartStyle.getAttributeName(attrIdx);

Modified: branches/2.0-RC2/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
===================================================================
--- branches/2.0-RC2/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2010-02-03 18:57:43 UTC (rev 670)
+++ branches/2.0-RC2/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2010-02-03 19:08:37 UTC (rev 671)
@@ -262,7 +262,8 @@
 				} else {
 					Set<FeatureId> fids = new HashSet<FeatureId>();
 					for (String fid : newSelection) {
-						fids.add(FilterUtil.FILTER_FAC2.featureId(fid));
+						if (fid != null)
+							fids.add(FilterUtil.FILTER_FAC2.featureId(fid));
 					}
 
 					selectionFTStyle.rules().get(0).setFilter(