[Schmitzm-commits] r1134 - in trunk: src/schmitzm/geotools/feature src_junit/schmitzm/swing

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-10-15 00:02:58 +0200 (Fri, 15 Oct 2010)
New Revision: 1134

Modified:
   trunk/src/schmitzm/geotools/feature/FeatureUtil.java
   trunk/src_junit/schmitzm/swing/TestingUtil.java
Log:


Modified: trunk/src/schmitzm/geotools/feature/FeatureUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/feature/FeatureUtil.java	2010-10-14 22:02:39 UTC (rev 1133)
+++ trunk/src/schmitzm/geotools/feature/FeatureUtil.java	2010-10-14 22:02:58 UTC (rev 1134)
@@ -2449,7 +2449,24 @@
 						.getLocalPart());
 			}
 		}
+		
+		// Checking for excact match with a CLEANED version of the localname
+		for (AttributeDescriptor d : attributeDescriptors) {
+			if (FeatureUtil.cleanAttname(d.getLocalName()).equals(localName)) {
+				return new NameImpl(d.getName().getNamespaceURI(), d.getName()
+						.getLocalPart());
+			}
+		}
 
+		// Checking for IGNORECASE match with a CLEANED version of the localname
+		for (AttributeDescriptor d : attributeDescriptors) {
+			if (FeatureUtil.cleanAttname(d.getLocalName()).equalsIgnoreCase(localName)) {
+				return new NameImpl(d.getName().getNamespaceURI(), d.getName()
+						.getLocalPart());
+			}
+		}
+
+
 		return null;
 	}
 	

Modified: trunk/src_junit/schmitzm/swing/TestingUtil.java
===================================================================
--- trunk/src_junit/schmitzm/swing/TestingUtil.java	2010-10-14 22:02:39 UTC (rev 1133)
+++ trunk/src_junit/schmitzm/swing/TestingUtil.java	2010-10-14 22:02:58 UTC (rev 1134)
@@ -54,6 +54,23 @@
 public class TestingUtil {
 
 	/**
+	 * List of available test datasets
+	 */
+	public static enum TestDatasets {
+		kreise, arabicInHeader;
+
+		public URL getUrl() {
+			switch (this) {
+			case kreise:
+				return TestingUtil.class.getResource(resLocation_Kreise);
+			case arabicInHeader:
+				return TestingUtil.class.getResource(resLocation_ArabicHeader);
+
+			}
+			return null;
+		}
+	}
+	/**
 	 * Number of seconds to wait until a GUI should be closed by default. Can be
 	 * set to -1 to always wait forever.
 	 */
@@ -275,24 +292,7 @@
 	final static String resLocation_Kreise = "/schmitzm/jfree/feature/style/testLineChartShape/testKreiseLineChart.shp";
 	final static String resLocation_ArabicHeader = "/schmitzm/geotools/feature/arabicShapefiles/arabicwitharabicinheader.shp";
 
-	/**
-	 * List of available test datasets
-	 */
-	public static enum TestDatasets {
-		kreise, arabicInHeader;
 
-		public URL getUrl() {
-			switch (this) {
-			case kreise:
-				return TestingUtil.class.getResource(resLocation_Kreise);
-			case arabicInHeader:
-				return TestingUtil.class.getResource(resLocation_ArabicHeader);
-
-			}
-			return null;
-		}
-	}
-
 	/**
 	 * Stellt Test-Features zur Verfügung, WENN die Anwendung im maven scope
 	 * <code>test</code> läuft.