[Schmitzm-commits] r619 - branches/2.0-RC1/src/schmitzm/geotools/styling

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-01-25 18:44:22 +0100 (Mon, 25 Jan 2010)
New Revision: 619

Modified:
   branches/2.0-RC1/src/schmitzm/geotools/styling/StylingUtil.java
Log:
Attribute name correction (after OpenCalc DBF editing for example) improved...

Modified: branches/2.0-RC1/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- branches/2.0-RC1/src/schmitzm/geotools/styling/StylingUtil.java	2009-12-27 19:32:08 UTC (rev 618)
+++ branches/2.0-RC1/src/schmitzm/geotools/styling/StylingUtil.java	2010-01-25 17:44:22 UTC (rev 619)
@@ -72,6 +72,7 @@
 import org.geotools.filter.BinaryComparisonAbstract;
 import org.geotools.filter.ConstantExpression;
 import org.geotools.filter.FilterAttributeExtractor;
+import org.geotools.filter.IsBetweenImpl;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.renderer.lite.RendererUtilities;
 import org.geotools.resources.i18n.Vocabulary;
@@ -2531,6 +2532,13 @@
 					BinaryComparisonAbstract binFilter = (BinaryComparisonAbstract)filter;
 					binFilter.setExpression1(copy(binFilter.getExpression1()));
 					binFilter.setExpression2(copy(binFilter.getExpression2()));
+
+					// TODO noch viel mehr faelle!!
+					if (filter instanceof IsBetweenImpl) {
+						IsBetweenImpl isbetween = (IsBetweenImpl)filter;
+						isbetween.setExpression(copy(isbetween.getExpression()));
+					}
+					
 				}
 				return (Filter)super.copy(filter);
 			}
@@ -2538,7 +2546,8 @@
 
 		dsv.visit(style);
 
-		return (Style) dsv.getCopy();
+		Style copiedCleanStyle = (Style) dsv.getCopy();
+		return copiedCleanStyle;
 	}
 
 	/**