This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 38044634c8c44e25de96b8a1f5a80c77b33b19d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 27 17:39:54 2015 +0200 Add resetModel on gis editors (See #3771) --- .../java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java | 5 +++++ .../java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java | 6 ++++++ .../java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java | 6 ++++++ .../widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 1 + .../gis/absolute/AbsoluteDdCoordinateEditorHandler.java | 4 ++++ .../widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 1 + .../gis/absolute/AbsoluteDmdCoordinateEditorHandler.java | 4 ++++ .../widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 1 + .../gis/absolute/AbsoluteDmsCoordinateEditorHandler.java | 4 ++++ .../gis/absolute/AbsoluteDmsCoordinateEditorModel.java | 4 ---- .../jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx | 1 + .../widgets/gis/absolute/CoordinatesEditorHandler.java | 15 +++++++++++++++ 12 files changed, 48 insertions(+), 4 deletions(-) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java index 7a94455..56f43ff 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinate.java @@ -266,6 +266,11 @@ public class DdCoordinate extends AbstractSerializableBean { '}'; } + public void reset() { + degree = null; + degree = null; + } + protected boolean isDegreeValid(boolean longitude) { boolean result = true; if (!isDegreeNull()) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java index 78aec35..92a3440 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinate.java @@ -322,6 +322,12 @@ public class DmdCoordinate extends AbstractSerializableBean { '}'; } + public void reset() { + degree = null; + minute = null; + degree = null; + } + protected boolean isDegreeValid(boolean longitude) { boolean result = true; if (!isDegreeNull()) { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java index 1f4fc73..44fce27 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinate.java @@ -366,4 +366,10 @@ public class DmsCoordinate extends AbstractSerializableBean { } return result; } + + public void reset() { + degree=null; + minute=null; + second=null; + } } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx index 73fa859..3f83715 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx @@ -46,6 +46,7 @@ public void setPropertyDegree(String property) { model.setPropertyDegree(propert public void setPropertyDecimal(String property) { model.setPropertyDecimal(property); } public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DdCoordinate value) { handler.setValue(value, true); } +public void resetModel() { handler.resetModel(); } ]]> </script> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java index d33c146..4b71bf2 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorHandler.java @@ -75,6 +75,10 @@ public class AbsoluteDdCoordinateEditorHandler implements UIHandler<AbsoluteDdCo // nothing special to do here } + public void resetModel() { + ui.getModel().reset(); + } + public void init(boolean longitudeEditor) { final AbsoluteDdCoordinateEditorModel model = ui.getModel(); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx index bf950b8..9f88bea 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx @@ -47,6 +47,7 @@ public void setPropertyMinute(String property ) { model.setPropertyMinute(proper public void setPropertyDecimal(String property ) { model.setPropertyDecimal(property); } public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DmdCoordinate value) { handler.setValue(value, true); } +public void resetModel() { handler.resetModel(); } ]]> </script> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java index 1af3afe..90557dc 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorHandler.java @@ -79,6 +79,10 @@ public class AbsoluteDmdCoordinateEditorHandler implements UIHandler<AbsoluteDmd // nothing special to do here } + public void resetModel() { + ui.getModel().reset(); + } + public void init(boolean longitudeEditor) { final AbsoluteDmdCoordinateEditorModel model = ui.getModel(); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx index 3ca5b5d..b471b25 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx @@ -47,6 +47,7 @@ public void setPropertyMinute(String property ) { model.setPropertyMinute(proper public void setPropertySecond(String property ) { model.setPropertySecond(property); } public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { handler.setDisplayZeroWhenNull(displayZeroWhenNull); } public void setValue(DmsCoordinate value) { handler.setValue(value, true); } +public void resetModel() { handler.resetModel(); } ]]> </script> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java index 8ecf935..37eed50 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorHandler.java @@ -77,6 +77,10 @@ public class AbsoluteDmsCoordinateEditorHandler implements UIHandler<AbsoluteDms // nothing special to do here } + public void resetModel() { + ui.getModel().reset(); + } + public void init(boolean longitudeEditor) { final AbsoluteDmsCoordinateEditorModel model = ui.getModel(); diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorModel.java index bb8e153..256c717 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditorModel.java @@ -102,10 +102,6 @@ public class AbsoluteDmsCoordinateEditorModel extends DmsCoordinate { setSecond(value == null ? null : value.getSecond()); } - public String getStringPattern() { - return COORDINATE_STRING_PATTERN; - } - @Override public boolean isSign() { return false; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index 95600a7..317685b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -40,6 +40,7 @@ public void setLatitudeAndLongitude(Float latitude, Float longitude) { model.set public void setFormat(CoordinateFormat format) { model.setFormat(format); } public void setShowResetButton(boolean showResetButton) { model.setShowResetButton(showResetButton); } public void setDisplayZeroWhenNull(boolean displayZeroWhenNull) { model.setDisplayZeroWhenNull(displayZeroWhenNull); } +public void resetModel() { handler.resetModel(); } ]]> </script> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java index f4dbc3c..bc63232 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorHandler.java @@ -39,8 +39,11 @@ import java.lang.reflect.Method; */ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { + private CoordinatesEditor ui; + @Override public void beforeInit(CoordinatesEditor ui) { + this.ui = ui; CoordinatesEditorModel model = new CoordinatesEditorModel(); model.setFormat(CoordinateFormat.dd); @@ -63,6 +66,18 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { } + public void resetModel() { + + ui.getLongitudeDd().resetModel(); + ui.getLongitudeDms().resetModel(); + ui.getLongitudeDmd().resetModel(); + + ui.getLatitudeDd().resetModel(); + ui.getLatitudeDms().resetModel(); + ui.getLatitudeDmd().resetModel(); + + } + public void init(CoordinatesEditor ui) { CoordinatesEditorModel model = ui.getModel(); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.