[Schmitzm-commits] r1492 - trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-02-05 15:00:13 +0100 (Sat, 05 Feb 2011)
New Revision: 1492

Modified:
   trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java
Log:


Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java	2011-02-05 13:54:46 UTC (rev 1491)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GtWfsServerSettings.java	2011-02-05 14:00:13 UTC (rev 1492)
@@ -34,7 +34,7 @@
  */
 public class GtWfsServerSettings extends
 		AbstractGTServerSettings<Object, Object> {
-	
+
 	Logger LOGGER = LangUtil.createLogger(this);
 
 	public enum Key {
@@ -73,7 +73,9 @@
 	}
 
 	public enum WfsProtocollVersion {
-		v1_0_0("1.0.0"), v1_1_0("1.1.0"), v1_1_1("1.1.1");
+		v1_0_0("1.0.0"), v1_1_0("1.1.0")
+		// , v1_1_1("1.1.1")
+		;
 
 		private final String versionString;
 
@@ -131,8 +133,8 @@
 				.setToolTipText(WFSDataStoreFactory.MAXFEATURES.description
 						.toString());
 
-		de.schmitzm.swing.input.ManualInputOption.Integer timeoutInput = new ManualInputOption.Integer("Timout in ms:",
-				false, wfsServer.getTimeout());
+		de.schmitzm.swing.input.ManualInputOption.Integer timeoutInput = new ManualInputOption.Integer(
+				"Timout in ms:", false, wfsServer.getTimeout());
 		timeoutInput.setToolTipText(WFSDataStoreFactory.TIMEOUT.description
 				.toString());
 
@@ -213,7 +215,13 @@
 			int i = 0;
 			setTitle(split[i++]);
 			setBaseUrl(new URL(split[i++]));
-			setVersion(WfsProtocollVersion.valueOf(split[i++]));
+
+			// Version 1.1.1 has been removed from the choices..
+			String v = split[i++];
+			if ("1.1.1".equals(v))
+				v = "1.1.0";
+			setVersion(WfsProtocollVersion.valueOf(v));
+
 			setMaxFeatures(intOrNull(split[i++]));
 			setTimeout(intOrNull(split[i++]));
 			setLenient(java.lang.Boolean.valueOf(split[i++]));