code cleanup and fixed typos

mstahv · mstahv · commit 598dd376a47a · 2013-12-18T11:54:44.000+02:00
diff --git a/src/main/java/org/vaadin/addon/leaflet/util/AbstractJTSField.java b/src/main/java/org/vaadin/addon/leaflet/util/AbstractJTSField.java
@@ -52,15 +52,8 @@ public static void setDefaultConfigurator(Configurator configurator) {
 		}
 		defaultConfigurator = configurator;
 	}
-	
-	public interface CRFTranslator<T> {
 
-		T toPresentation(T geom);
-
-		T toModel(T geom);
-	}
-
-	private static CRFTranslator<Geometry> defaultCRFTranslator = new CRFTranslator<Geometry>() {
+	private static CRSTranslator<Geometry> defaultCRSTranslator = new CRSTranslator<Geometry>() {
 
 		@Override
 		public Geometry toPresentation(Geometry geom) {
@@ -76,23 +69,25 @@ public Geometry toModel(Geometry geom) {
 	};
 
 	/**
-	 * Sets the default CRFTranslator to convert values to and from presentation in WSG86 (EPSG:4326).
+	 * Sets the default CRFTranslator to convert values to and from presentation
+	 * in WSG86 (EPSG:4326).
 	 * 
 	 * @param configurator
 	 */
 	@SuppressWarnings("unchecked")
-	public static void setDefaultCRFTranslator(CRFTranslator<? extends Geometry> translator) {
+	public static void setDefaultCRFTranslator(
+			CRSTranslator<? extends Geometry> translator) {
 		if (translator == null) {
 			throw new IllegalArgumentException();
 		}
-		defaultCRFTranslator = (CRFTranslator<Geometry>) translator;
+		defaultCRSTranslator = (CRSTranslator<Geometry>) translator;
 	}
 
 	protected LMap map = new LMap();
 
 	private Configurator configurator;
 
-	private CRFTranslator<T> cRFTranslator;
+	private CRSTranslator<T> crsTranslator;
 
 	public AbstractJTSField() {
 		super();
@@ -133,7 +128,7 @@ protected void setInternalValue(T newValue) {
 			prepareEditing();
 		}
 	}
-		
+
 	protected abstract void prepareEditing();
 
 	protected abstract void prepareDrawing();
@@ -147,16 +142,16 @@ public void setConfigurator(Configurator configurator) {
 	}
 
 	@SuppressWarnings("unchecked")
-	public CRFTranslator<T> getCRFTranslator() {
-		if(cRFTranslator == null) {
-			return (CRFTranslator<T>) defaultCRFTranslator;
+	public CRSTranslator<T> getCrsTranslator() {
+		if (crsTranslator == null) {
+			return (CRSTranslator<T>) defaultCRSTranslator;
 		}
-		return cRFTranslator;
+		return crsTranslator;
 	}
 
-	@SuppressWarnings("unchecked")
-	public void setCRFTranslator(CRFTranslator<Geometry> cRFTranslator) {
-		this.cRFTranslator = (CRFTranslator<T>) cRFTranslator;
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void setCRSTranslator(CRSTranslator crsTranslator) {
+		this.crsTranslator = crsTranslator;
 	}
 
 }
diff --git a/src/main/java/org/vaadin/addon/leaflet/util/CRSTranslator.java b/src/main/java/org/vaadin/addon/leaflet/util/CRSTranslator.java
@@ -0,0 +1,24 @@
+package org.vaadin.addon.leaflet.util;
+
+import com.vividsolutions.jts.geom.Geometry;
+
+public interface CRSTranslator<T extends Geometry> {
+
+	/**
+	 * Converts a geometry to a CRS suitable for Leaflet (WGS84 aka
+	 * EPSG:4326)
+	 * 
+	 * @param geom
+	 * @return geometry transformed to EPSG:4326
+	 */
+	T toPresentation(T geom);
+
+	/**
+	 * Converts geometry coming from V-Leaflet (in WGS84 aka EPSG:4326) to
+	 * another CRS for model.
+	 * 
+	 * @param geom
+	 * @return
+	 */
+	T toModel(T geom);
+}
diff --git a/src/main/java/org/vaadin/addon/leaflet/util/LineStringField.java b/src/main/java/org/vaadin/addon/leaflet/util/LineStringField.java
@@ -34,15 +34,15 @@ protected void prepareEditing() {
 			lPolyline = new LPolyline();
 			map.addLayer(lPolyline);
 		}
-		Point[] lPointArray = JTSUtil.toLeafletPointArray(getCRFTranslator()
+		Point[] lPointArray = JTSUtil.toLeafletPointArray(getCrsTranslator()
 				.toPresentation(getInternalValue()));
 		lPolyline.setPoints(lPointArray);
 		LEditing editing = new LEditing(lPolyline);
 		editing.addFeatureModifiedListener(new FeatureModifiedListener() {
 
 			@Override
 			public void featureModified(FeatureModifiedEvent event) {
-				setValue(getCRFTranslator().toModel(
+				setValue(getCrsTranslator().toModel(
 						JTSUtil.toLineString(lPolyline)));
 			}
 		});
@@ -55,7 +55,7 @@ protected void prepareDrawing() {
 
 			@Override
 			public void featureDrawn(FeatureDrawnEvent event) {
-				setValue(getCRFTranslator().toModel(
+				setValue(getCrsTranslator().toModel(
 						JTSUtil.toLineString((LPolyline) event
 								.getDrawnFeature())));
 			}
diff --git a/src/main/java/org/vaadin/addon/leaflet/util/LinearRingField.java b/src/main/java/org/vaadin/addon/leaflet/util/LinearRingField.java
@@ -34,15 +34,15 @@ protected void prepareEditing() {
 			lPolygon = new LPolygon();
 			map.addLayer(lPolygon);
 		}
-		Point[] lPointArray = JTSUtil.toLeafletPointArray(getCRFTranslator()
+		Point[] lPointArray = JTSUtil.toLeafletPointArray(getCrsTranslator()
 				.toPresentation(getInternalValue()));
 		lPolygon.setPoints(lPointArray);
 		LEditing editing = new LEditing(lPolygon);
 		editing.addFeatureModifiedListener(new FeatureModifiedListener() {
 
 			@Override
 			public void featureModified(FeatureModifiedEvent event) {
-				setValue(getCRFTranslator().toModel(
+				setValue(getCrsTranslator().toModel(
 						JTSUtil.toLinearRing(lPolygon)));
 			}
 		});
@@ -58,7 +58,7 @@ public void featureDrawn(FeatureDrawnEvent event) {
 				// TODO fill Vaadin bug report: exception from here has horrible
 				// stack trace (non informative), even more horrible than the
 				// usual that has some irrelevant stuff in front
-				setValue(getCRFTranslator()
+				setValue(getCrsTranslator()
 						.toModel(
 								JTSUtil.toLinearRing((LPolygon) event
 										.getDrawnFeature())));
diff --git a/src/main/java/org/vaadin/addon/leaflet/util/PointField.java b/src/main/java/org/vaadin/addon/leaflet/util/PointField.java
@@ -29,13 +29,13 @@ public Class<? extends Point> getType() {
 
 	protected void prepareEditing() {
 		if (marker == null) {
-			marker = new LMarker(JTSUtil.toLeafletPoint(getCRFTranslator()
+			marker = new LMarker(JTSUtil.toLeafletPoint(getCrsTranslator()
 					.toPresentation(getInternalValue())));
 			marker.addDragEndListener(new DragEndListener() {
 
 				@Override
 				public void dragEnd(DragEndEvent event) {
-					setValue(getCRFTranslator()
+					setValue(getCrsTranslator()
 							.toModel(JTSUtil.toPoint(marker)));
 				}
 			});
@@ -50,7 +50,7 @@ protected void prepareDrawing() {
 
 			@Override
 			public void featureDrawn(FeatureDrawnEvent event) {
-				setValue(getCRFTranslator().toModel(
+				setValue(getCrsTranslator().toModel(
 						JTSUtil.toPoint((LMarker) event.getDrawnFeature())));
 			}
 		});
diff --git a/src/test/java/org/vaadin/addon/leaflet/demoandtestapp/JtsFieldWithProjectionTest.java b/src/test/java/org/vaadin/addon/leaflet/demoandtestapp/JtsFieldWithProjectionTest.java
@@ -12,7 +12,7 @@
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.TransformException;
 import org.vaadin.addon.leaflet.demoandtestapp.util.AbstractTest;
-import org.vaadin.addon.leaflet.util.AbstractJTSField.CRFTranslator;
+import org.vaadin.addon.leaflet.util.CRSTranslator;
 import org.vaadin.addon.leaflet.util.LineStringField;
 import org.vaadin.addon.leaflet.util.LinearRingField;
 import org.vaadin.addon.leaflet.util.PointField;
@@ -147,7 +147,7 @@ public Component getTestComponent() {
 			final MathTransform toModel = toWsg86.inverse();
 			
 			// Build the actual v-leaflet JTS field translator
-			CRFTranslator<Geometry> translator = new CRFTranslator<Geometry>() {
+			CRSTranslator<Geometry> translator = new CRSTranslator<Geometry>() {
 
 				@Override
 				public Geometry toPresentation(Geometry geom) {
@@ -167,9 +167,9 @@ public Geometry toModel(Geometry geom) {
 					}
 				}
 			};
-			point.setCRFTranslator(translator);
-			linearRing.setCRFTranslator(translator);
-			lineString.setCRFTranslator(translator);
+			point.setCRSTranslator(translator);
+			linearRing.setCRSTranslator(translator);
+			lineString.setCRSTranslator(translator);
 			// Also can be set web app global CRFTranslator
 			// AbstractJTSField.setDefaultCRFTranslator(translator);
 		} catch (NoSuchAuthorityCodeException e) {
@@ -216,7 +216,7 @@ public Geometry toModel(Geometry geom) {
 		beanFieldGroup.setItemDataSource(pojo);
 		beanFieldGroup.bindMemberFields(this);
 
-		editorform.addComponent(new Button("Save", new ClickListener() {
+		Button c = new Button("Save", new ClickListener() {
 
 			@Override
 			public void buttonClick(ClickEvent event) {
@@ -227,7 +227,10 @@ public void buttonClick(ClickEvent event) {
 					e.printStackTrace();
 				}
 			}
-		}));
+		});
+		c.setImmediate(true);
+		c.setId("SSS");
+		editorform.addComponent(c);
 
 		horizontalLayout.addComponents(editorform, display);
 		horizontalLayout.setExpandRatio(editorform, 1);
