This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 940b8318c54ad0d8f6acb83e0eab243e48c8c3ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 3 09:44:10 2014 +0200 fixes #3493: Introduce a new module jaxx-widgets-gis + refs #3448 add some new demos --- .../jaxx/editor/CoordinatesEditorDemo.css | 37 ---- .../jaxx/editor/{ => gis}/CoordinateDemo.css | 0 .../jaxx/editor/{ => gis}/CoordinateDemo.jaxx | 0 .../editor/{ => gis}/CoordinateDemoHandler.java | 2 +- .../jaxx/editor/{ => gis}/CoordinateDemoModel.java | 2 +- .../jaxx/editor/gis/CoordinatesEditorDemo.css | 40 +++++ .../editor/{ => gis}/CoordinatesEditorDemo.jaxx | 5 +- .../{ => gis}/CoordinatesEditorDemoHandler.java | 23 +-- .../editor/gis/CoordinatesEditorDemoModel.java | 50 ++++++ .../main/java/jaxx/demo/tree/DemoDataProvider.java | 4 +- .../main/resources/i18n/jaxx-demo_en_GB.properties | 48 ++---- .../main/resources/i18n/jaxx-demo_es_ES.properties | 25 --- .../main/resources/i18n/jaxx-demo_fr_FR.properties | 15 +- jaxx-widgets-gis/pom.xml | 37 +--- .../nuiton/jaxx/widgets/gis/CoordinateFormat.java | 1 + .../nuiton/jaxx/widgets/gis/CoordinateHelper.java | 4 +- .../org/nuiton/jaxx/widgets/gis/DdCoordinate.java | 3 +- .../jaxx/widgets/gis/DdCoordinateConverter.java | 2 +- .../org/nuiton/jaxx/widgets/gis/DmdCoordinate.java | 2 +- .../jaxx/widgets/gis/DmdCoordinateConverter.java | 2 +- .../org/nuiton/jaxx/widgets/gis/DmsCoordinate.java | 2 +- .../jaxx/widgets/gis/DmsCoordinateConverter.java | 2 +- .../widgets/gis/MaskFormatterFromConverter.java | 2 +- .../absolute/AbsoluteCoordinateEditorModel.java | 2 +- .../AbsoluteDdCoordinateEditorHandler.java | 2 +- .../absolute/AbsoluteDdCoordinateEditorModel.java | 2 +- .../AbsoluteDmdCoordinateEditorHandler.java | 2 +- .../absolute/AbsoluteDmdCoordinateEditorModel.java | 2 +- .../AbsoluteDmsCoordinateEditorHandler.java | 2 +- .../absolute/AbsoluteDmsCoordinateEditorModel.java | 2 +- .../widgets/gis/absolute/CoordinatesEditor.css | 25 ++- .../widgets/gis/absolute/CoordinatesEditor.jaxx | 53 +++--- .../gis/absolute/CoordinatesEditorHandler.java | 88 +++++++++- .../gis/absolute/CoordinatesEditorModel.java | 191 +++++++++++++++------ .../jaxx/widgets/gis/absolute/package-info.java | 2 +- .../signed/SignedDdCoordinateEditorHandler.java | 2 +- .../gis/signed/SignedDdCoordinateEditorModel.java | 2 +- .../signed/SignedDmdCoordinateEditorHandler.java | 2 +- .../gis/signed/SignedDmdCoordinateEditorModel.java | 2 +- .../signed/SignedDmsCoordinateEditorHandler.java | 2 +- .../gis/signed/SignedDmsCoordinateEditorModel.java | 2 +- .../jaxx/widgets/gis/signed/package-info.java | 2 +- .../widgets/gis/DdCoordinateConverterTest.java | 2 +- .../nuiton/jaxx/widgets/gis/DdCoordinateTest.java | 2 +- .../widgets/gis/DmdCoordinateConverterTest.java | 2 +- .../nuiton/jaxx/widgets/gis/DmdCoordinateTest.java | 2 +- .../widgets/gis/DmsCoordinateConverterTest.java | 2 +- .../nuiton/jaxx/widgets/gis/DmsCoordinateTest.java | 2 +- .../gis/signed/SignedDmdCoordinateEditorTest.java | 2 +- .../gis/signed/SignedDmsCoordinateEditorTest.java | 2 +- 50 files changed, 427 insertions(+), 284 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.css deleted file mode 100644 index a57d84e..0000000 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.css +++ /dev/null @@ -1,37 +0,0 @@ - -#config { - border: {new TitledBorder(t("jaxxdemo.coordinatesEditor.configuration"))}; -} - -#showReset { - text: "jaxxdemo.coordinate.showReset"; - selected: true; -} - -#editorModel { - showResetButton: {showReset.isSelected()}; -} - -#result { - border: {new TitledBorder(t("jaxxdemo.coordinate.result"))}; -} - -#resultFormat { - text: {handler.getFormat(editorModel.getFormat())}; -} - -#resultQuadrant{ - text: {handler.getQuadrant(editorModel.getQuadrant())}; -} - -#resultLatitude{ - text: {handler.getLatitude(editorModel.getLatitude())}; -} - -#resultLongitude{ - text: {handler.getLongitude(editorModel.getLongitude())}; -} - - - - diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.css similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.css diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx similarity index 100% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemo.jaxx diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java similarity index 99% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java index 10c1d0a..34c4b51 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoHandler.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.editor.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java similarity index 97% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java index 4a8a604..5d56865 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinateDemoModel.java @@ -1,4 +1,4 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.editor.gis; /* * #%L diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.css new file mode 100644 index 0000000..e02c3a8 --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.css @@ -0,0 +1,40 @@ + +#config { + border: {new TitledBorder(t("jaxxdemo.coordinatesEditor.configuration"))}; +} + +#showReset { + text: "jaxxdemo.coordinate.showReset"; + selected: true; +} + +#editor { + showResetButton: {showReset.isSelected()}; + propertyLatitude:latitude; + propertyLongitude:longitude; + propertyQuadrant:quadrant; + bean: {model}; + latitude:{model.getLatitude()}; + longitude:{model.getLongitude()}; + quadrant:{model.getQuadrant()}; +} + +#result { + border: {new TitledBorder(t("jaxxdemo.coordinate.result"))}; +} + +#resultQuadrant{ + text: {handler.getQuadrant(model.getQuadrant())}; +} + +#resultLatitude{ + text: {handler.getLatitude(model.getLatitude())}; +} + +#resultLongitude{ + text: {handler.getLongitude(model.getLongitude())}; +} + + + + diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.jaxx similarity index 89% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.jaxx rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.jaxx index 4285ef5..f5488aa 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemo.jaxx @@ -23,9 +23,10 @@ <import> org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor - org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditorModel </import> + <CoordinatesEditorDemoModel id='model' initializer='getContextValue(CoordinatesEditorDemoModel.class)'/> + <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> @@ -37,13 +38,11 @@ <row> <cell> <CoordinatesEditor id='editor'/> - <CoordinatesEditorModel id='editorModel' initializer='editor.getModel()'/> </cell> </row> <row> <cell> <JPanel id='result' layout='{new GridLayout(0,1)}'> - <JLabel id='resultFormat'/> <JLabel id='resultQuadrant'/> <JLabel id='resultLatitude'/> <JLabel id='resultLongitude'/> diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemoHandler.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java similarity index 61% rename from jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemoHandler.java rename to jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java index e86a193..a2178ba 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinatesEditorDemoHandler.java +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoHandler.java @@ -1,8 +1,6 @@ -package jaxx.demo.component.jaxx.editor; +package jaxx.demo.component.jaxx.editor.gis; import jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.widgets.gis.CoordinateFormat; -import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditorModel; import static org.nuiton.i18n.I18n.t; @@ -10,27 +8,29 @@ import static org.nuiton.i18n.I18n.t; * Created on 9/1/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class CoordinatesEditorDemoHandler implements UIHandler<CoordinatesEditorDemo> { @Override public void beforeInit(CoordinatesEditorDemo ui) { + + CoordinatesEditorDemoModel model = new CoordinatesEditorDemoModel(); + model.setLatitude(-12f); + model.setLongitude(42f); + model.setQuadrant(2); + + ui.setContextValue(model); + } @Override public void afterInit(final CoordinatesEditorDemo ui) { - CoordinatesEditorModel editorModel = ui.getEditorModel(); - editorModel.init(-12f, 42f); - editorModel.setFormat(CoordinateFormat.dd); + ui.getEditor().init(); } - public String getFormat(CoordinateFormat format) { - return t("jaxxdemo.coordinate.result.format", format == null ? null : format.name()); - } - public String getQuadrant(Integer quadrant) { return t("jaxxdemo.coordinate.result.quadrant", quadrant); } @@ -42,4 +42,5 @@ public class CoordinatesEditorDemoHandler implements UIHandler<CoordinatesEditor public String getLongitude(Float longitude) { return t("jaxxdemo.coordinate.result.longitude", longitude); } + } \ No newline at end of file diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java new file mode 100644 index 0000000..8a9a5fa --- /dev/null +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/gis/CoordinatesEditorDemoModel.java @@ -0,0 +1,50 @@ +package jaxx.demo.component.jaxx.editor.gis; + +import org.jdesktop.beans.AbstractSerializableBean; + +/** + * Created on 9/3/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.12 + */ +public class CoordinatesEditorDemoModel extends AbstractSerializableBean { + + private static final long serialVersionUID = 1L; + + protected Integer quadrant; + + protected Float latitude; + + protected Float longitude; + + public Integer getQuadrant() { + return quadrant; + } + + public void setQuadrant(Integer quadrant) { + Object oldValue = getQuadrant(); + this.quadrant = quadrant; + firePropertyChange("quadrant", oldValue, quadrant); + } + + public Float getLatitude() { + return latitude; + } + + public void setLatitude(Float latitude) { + Object oldValue = getLatitude(); + this.latitude = latitude; + firePropertyChange("latitude", oldValue, latitude); + } + + public Float getLongitude() { + return longitude; + } + + public void setLongitude(Float longitude) { + Object oldValue = getLongitude(); + this.longitude = longitude; + firePropertyChange("longitude", oldValue, longitude); + } +} diff --git a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java b/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java index 9369d39..1235a23 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java +++ b/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java @@ -26,8 +26,8 @@ import jaxx.demo.component.jaxx.BoxedDecoratorDemo; import jaxx.demo.component.jaxx.StatusMessagePanelDemo; import jaxx.demo.component.jaxx.editor.BeanComboBoxDemo; import jaxx.demo.component.jaxx.editor.ComboEditorDemo; -import jaxx.demo.component.jaxx.editor.CoordinateDemo; -import jaxx.demo.component.jaxx.editor.CoordinatesEditorDemo; +import jaxx.demo.component.jaxx.editor.gis.CoordinateDemo; +import jaxx.demo.component.jaxx.editor.gis.CoordinatesEditorDemo; import jaxx.demo.component.jaxx.editor.DatePickerDemo; import jaxx.demo.component.jaxx.editor.FileEditorDemo; import jaxx.demo.component.jaxx.editor.I18nEditorDemo; diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties index b9c90b4..0abfeba 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties @@ -42,7 +42,6 @@ Fancy\ Button= First\ Name\:= FirstName\:= Font\ size= -Font\ size\:\ = Fool\ me\ once= Fool\ me\ twice= Green= @@ -81,7 +80,6 @@ Stop= Supported\ Swing\ components\:= Text2\:= Text\:= -Total\:\ = Underline= Upper\ case\ text\:= Use\ the\ spinner\ to= @@ -91,9 +89,7 @@ View= Welcome\ to\ the\ JAXX\ framework\!= Working\ directory\:= Yellow= -You\ entered\:\ = Your\ name\:= -\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -237,29 +233,20 @@ jaxxdemo.config.ui.locale=Language used in application jaxxdemo.config.ui.logLevel=Log level jaxxdemo.config.ui.logPatternLayout=Log pattern jaxxdemo.context.helpPage.notFound= -jaxxdemo.coordinate.latitude= -jaxxdemo.coordinate.latitudeDd= -jaxxdemo.coordinate.latitudeDmd= -jaxxdemo.coordinate.latitudeDms= -jaxxdemo.coordinate.longitude= -jaxxdemo.coordinate.longitudeDd= -jaxxdemo.coordinate.longitudeDmd= -jaxxdemo.coordinate.longitudeDms= -jaxxdemo.coordinate.model= -jaxxdemo.coordinate.model.latitude= -jaxxdemo.coordinate.model.longitude= -jaxxdemo.coordinate.result= -jaxxdemo.coordinate.result.dd= -jaxxdemo.coordinate.result.dmd= -jaxxdemo.coordinate.result.dms= -jaxxdemo.coordinate.result.format= -jaxxdemo.coordinate.result.latitude= -jaxxdemo.coordinate.result.latitude.format= -jaxxdemo.coordinate.result.longitude= -jaxxdemo.coordinate.result.longitude.format= -jaxxdemo.coordinate.result.quadrant= -jaxxdemo.coordinate.showReset= -jaxxdemo.coordinatesEditor.configuration= +jaxxdemo.coordinate.latitude=Latitude +jaxxdemo.coordinate.latitudeDd=Latitude (format DD) +jaxxdemo.coordinate.latitudeDmd=Latitude (format DMD) +jaxxdemo.coordinate.latitudeDms=Latitude (format DMS) +jaxxdemo.coordinate.longitude=Longitude +jaxxdemo.coordinate.longitudeDd=Longitude (format DD) +jaxxdemo.coordinate.longitudeDmd=Longitude (format DMD) +jaxxdemo.coordinate.longitudeDms=Longitude (format DMS) +jaxxdemo.coordinate.result=Résultat +jaxxdemo.coordinate.result.latitude=<html>Latitude <strong>%s</strong> +jaxxdemo.coordinate.result.longitude=<html>Longitude <strong>%s</strong> +jaxxdemo.coordinate.result.quadrant=<html>Quadrant <strong>%s</strong> +jaxxdemo.coordinate.showReset=show Reset button +jaxxdemo.coordinatesEditor.configuration=Configuration jaxxdemo.datePickerEditor.dateResult=Result display jaxxdemo.datePickerEditor.patternLayout=Date pattern jaxxdemo.datePickerEditor.showPopupButton=Display popup button @@ -306,11 +293,6 @@ jaxxdemo.numbereditor.applyNumberPattern=Apply pattern jaxxdemo.numbereditor.autoPopup=Show automatic popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=Result -jaxxdemo.numbereditor.model.float=Float result \: %1$s -jaxxdemo.numbereditor.model.int=Integer result \: %1$s -jaxxdemo.numbereditor.model.latitude= -jaxxdemo.numbereditor.model.longitude= -jaxxdemo.numbereditor.model.numberPattern=Editor pattern \: %s jaxxdemo.numbereditor.numberPattern.configuration=Number Pattern jaxxdemo.numbereditor.showPopupButton=Show Popup button jaxxdemo.numbereditor.showReset=Show reset button @@ -320,7 +302,6 @@ jaxxdemo.openHelp=Open contextual help (%s), Will come in 3.0 version jaxxdemo.timeeditor.editor=Time Editor jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Result -jaxxdemo.timeeditor.value=Selected time \: %1$tH\:%1$tM jaxxdemo.title.about=About JAXXDemo... jaxxdemo.title.showLog=JAXXDemo logs jaxxdemo.tree.tabtitle=Tree @@ -345,6 +326,5 @@ t0.isSelected()= t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= -tutti.context.helpPage.notFound= valid= x= diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties index 432e725..93fce91 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties @@ -42,7 +42,6 @@ Fancy\ Button=Bouton 'Fancy' First\ Name\:=Prénom FirstName\:=Prénom \: Font\ size=Taille de la police -Font\ size\:\ = Fool\ me\ once= Fool\ me\ twice= Green=Vert @@ -81,7 +80,6 @@ Stop=Arrêter Supported\ Swing\ components\:=Composants Swing supportés Text2\:=Text 2 Text\:=Texte \: -Total\:\ = Underline=souligné Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour @@ -91,9 +89,7 @@ View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX Working\ directory\:=Répertoire de travail Yellow=Jaune -You\ entered\:\ = Your\ name\:=Votre nom \: -\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -167,7 +163,6 @@ jaxxdemo.action.help.tip=Affichier l'aide jaxxdemo.action.locale.fr=Français jaxxdemo.action.locale.fr.mnemonic= jaxxdemo.action.locale.fr.tip=Changer la langue en français -jaxxdemo.action.locale.mnemonic= jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.mnemonic= jaxxdemo.action.locale.uk.tip=Changer la langue en anglais @@ -246,18 +241,9 @@ jaxxdemo.coordinate.longitude= jaxxdemo.coordinate.longitudeDd= jaxxdemo.coordinate.longitudeDmd= jaxxdemo.coordinate.longitudeDms= -jaxxdemo.coordinate.model= -jaxxdemo.coordinate.model.latitude= -jaxxdemo.coordinate.model.longitude= jaxxdemo.coordinate.result= -jaxxdemo.coordinate.result.dd= -jaxxdemo.coordinate.result.dmd= -jaxxdemo.coordinate.result.dms= -jaxxdemo.coordinate.result.format= jaxxdemo.coordinate.result.latitude= -jaxxdemo.coordinate.result.latitude.format= jaxxdemo.coordinate.result.longitude= -jaxxdemo.coordinate.result.longitude.format= jaxxdemo.coordinate.result.quadrant= jaxxdemo.coordinate.showReset= jaxxdemo.coordinatesEditor.configuration= @@ -297,8 +283,6 @@ jaxxdemo.menu.file.locale.mnemonic= jaxxdemo.menu.file.mnemonic= jaxxdemo.menu.help=Aide jaxxdemo.menu.help.mnemonic= -jaxxdemo.menu.showLogs=Afficher les logs -jaxxdemo.menu.showLogs.mnemonic= jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur @@ -309,11 +293,6 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.latitude= -jaxxdemo.numbereditor.model.longitude= -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset @@ -323,7 +302,6 @@ jaxxdemo.openHelp=Open contextual help (%s), Will come in 3.0 version jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre @@ -348,8 +326,5 @@ t0.isSelected()= t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= -tutti.context.helpPage.notFound= -tutti.menu.file.mnemonic= -tutti.menu.help.mnemonic= valid=valide x=x diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties index c1c675b..68218f2 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties @@ -42,7 +42,6 @@ Fancy\ Button=Bouton 'Fancy' First\ Name\:=Prénom FirstName\:=Prénom \: Font\ size=Taille de la police -Font\ size\:\ = Fool\ me\ once= Fool\ me\ twice= Green=Vert @@ -81,7 +80,6 @@ Stop=Arrêter Supported\ Swing\ components\:=Composants Swing supportés Text2\:=Text 2 Text\:=Texte \: -Total\:\ = Underline=souligné Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour @@ -91,9 +89,7 @@ View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX Working\ directory\:=Répertoire de travail Yellow=Jaune -You\ entered\:\ = Your\ name\:=Votre nom \: -\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -246,14 +242,10 @@ jaxxdemo.coordinate.longitudeDd=Longitude (au format DD) jaxxdemo.coordinate.longitudeDmd=Longitude (au format DMD) jaxxdemo.coordinate.longitudeDms=Longitude (au format DMS) jaxxdemo.coordinate.result=Résultat -jaxxdemo.coordinate.result.dd=Coordonnées au format DD %s - %s -jaxxdemo.coordinate.result.dmd=Coordonnées au format DMS %s - %s -jaxxdemo.coordinate.result.dms=Coordonnées au format DMD %s - %s -jaxxdemo.coordinate.result.format=<html>Format <strong>%s</strong> jaxxdemo.coordinate.result.latitude=<html>Latitude <strong>%s</strong> jaxxdemo.coordinate.result.longitude=<html>Longitude <strong>%s</strong> jaxxdemo.coordinate.result.quadrant=<html>Quadrant <strong>%s</strong> -jaxxdemo.coordinate.showReset=Afficher le boutton de reset +jaxxdemo.coordinate.showReset=Afficher le boutton Réinitialiser jaxxdemo.coordinatesEditor.configuration=Configuration jaxxdemo.datePickerEditor.dateResult=Affichage du résultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date @@ -301,9 +293,6 @@ jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=Résultat -jaxxdemo.numbereditor.model.float=Valeur décimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur entière \: %1$s -jaxxdemo.numbereditor.model.numberPattern=Format de l'éditeur \: %s jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset @@ -313,7 +302,6 @@ jaxxdemo.openHelp=Ouvertude l'aide contextuelle (%s), A venir en version 3.0 jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Résultat -jaxxdemo.timeeditor.value=Heure sélectionnée \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... jaxxdemo.title.showLog=Logs de JAXX Demo jaxxdemo.tree.tabtitle=Arbre @@ -338,6 +326,5 @@ t0.isSelected()= t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= -tutti.context.helpPage.notFound= valid=valide x=x diff --git a/jaxx-widgets-gis/pom.xml b/jaxx-widgets-gis/pom.xml index 6437bdb..e5c97a6 100644 --- a/jaxx-widgets-gis/pom.xml +++ b/jaxx-widgets-gis/pom.xml @@ -74,32 +74,15 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </dependency> - - <dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-autocomplete</artifactId> - </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> + <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> @@ -109,38 +92,20 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateFormat.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateFormat.java index eeca9b3..c6eef2a 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateFormat.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateFormat.java @@ -4,6 +4,7 @@ package org.nuiton.jaxx.widgets.gis; * Created on 8/31/14. * * @author Tony Chemit - chemit@codelutin.com + * @since 2.12 */ public enum CoordinateFormat { /** diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateHelper.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateHelper.java index b95f2d8..821833b 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateHelper.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/CoordinateHelper.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; * Helper to deal with coordinates. * * @author Tony Chemit - chemit@codelutin.com + * @since 2.12 */ public class CoordinateHelper { @@ -37,7 +38,6 @@ public class CoordinateHelper { * @param latitude la latitude décimale * @return la valeur du quadrant ou {@code null} si l'une des deux * coordonnées est {@code null}. - * @since 1.2 */ public static Integer getQuadrant(Float longitude, Float latitude) { if (longitude == null || latitude == null) { @@ -61,7 +61,6 @@ public class CoordinateHelper { * @param longitude la longitude décimale (peut être null) * @return la valeur signée de la longitude ou {@code null} si l'une des * deux données d'entrée est {@code null}. - * @since 1.2 */ public static Float getSignedLongitude(Integer quadrant, Float longitude) { if (longitude == null) { @@ -93,7 +92,6 @@ public class CoordinateHelper { * @param latitude la longitude décimale (peut être null) * @return la valeur signée de la latitude ou {@code null} si l'une des * deux données d'entrée est {@code null}. - * @since 1.2 */ public static Float getSignedLatitude(Integer quadrant, Float latitude) { if (latitude == null) { 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 b703747..9fc9157 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 @@ -2,14 +2,13 @@ package org.nuiton.jaxx.widgets.gis; import org.jdesktop.beans.AbstractSerializableBean; -import java.math.BigDecimal; import java.util.regex.Pattern; /** * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class DdCoordinate extends AbstractSerializableBean { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java index f948687..b03560c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverter.java @@ -12,7 +12,7 @@ import static org.nuiton.i18n.I18n.t; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class DdCoordinateConverter implements NuitonConverter<DdCoordinate> { 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 2f85f63..a2fadfc 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 @@ -32,7 +32,7 @@ import java.util.regex.Pattern; * Created on 10/23/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmdCoordinate extends AbstractSerializableBean { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java index e00d56b..350c0de 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverter.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.t; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmdCoordinateConverter implements NuitonConverter<DmdCoordinate> { 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 70cbf7b..f9b5233 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 @@ -32,7 +32,7 @@ import java.util.regex.Pattern; * Created on 10/23/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmsCoordinate extends AbstractSerializableBean { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java index 862b024..dacfa8d 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverter.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.t; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmsCoordinateConverter implements NuitonConverter<DmsCoordinate> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java index c9bea2f..c5628d0 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/MaskFormatterFromConverter.java @@ -31,7 +31,7 @@ import java.text.ParseException; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class MaskFormatterFromConverter<O> extends MaskFormatter { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteCoordinateEditorModel.java index abd1613..d7d1db0 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteCoordinateEditorModel.java @@ -10,7 +10,7 @@ import org.nuiton.jaxx.widgets.gis.DmsCoordinate; * Created on 8/31/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 + * @since 2.12 */ public class AbsoluteCoordinateEditorModel extends AbstractSerializableBean { 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 80a4fb1..3f416e8 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 @@ -20,7 +20,7 @@ import java.text.ParseException; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDdCoordinateEditorHandler implements UIHandler<AbsoluteDdCoordinateEditor> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java index fe157e8..836ba5c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditorModel.java @@ -8,7 +8,7 @@ import java.io.Serializable; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDdCoordinateEditorModel extends DdCoordinate { 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 284ba76..39859e1 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 @@ -20,7 +20,7 @@ import java.text.ParseException; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDmdCoordinateEditorHandler implements UIHandler<AbsoluteDmdCoordinateEditor> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java index 1ebcaba..f04d543 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditorModel.java @@ -8,7 +8,7 @@ import java.io.Serializable; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDmdCoordinateEditorModel extends DmdCoordinate { 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 2145c9e..2d9335f 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 @@ -20,7 +20,7 @@ import java.text.ParseException; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDmsCoordinateEditorHandler implements UIHandler<AbsoluteDmsCoordinateEditor> { 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 81f3e60..230a9cf 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 @@ -8,7 +8,7 @@ import java.io.Serializable; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class AbsoluteDmsCoordinateEditorModel extends DmsCoordinate { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css index 67dca50..128f3b9 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css @@ -39,36 +39,45 @@ AbsoluteDmdCoordinateEditor { showReset: {model.isShowResetButton()}; } +#model { + quadrant:{(Integer)quadrantBG.getSelectedValue()}; + format:{(CoordinateFormat)formatBG.getSelectedValue()}; +} + // ---------- // Quandrant // ---------- #quadrantLabel { text:"jaxx.common.quadrant"; - labelFor:{quadrant}; + labelFor:{quadrantPanel}; } #quadrant4 { text:"jaxx.common.quadrant4"; - buttonGroup:"quadrantBG"; + buttonGroup:quadrantBG; + value:{new Integer(4)}; selected:{handler.isQuadrantSelected(model.getQuadrant(), 4)}; } #quadrant1 { text:"jaxx.common.quadrant1"; - buttonGroup:"quadrantBG"; + buttonGroup:quadrantBG; + value:{new Integer(1)}; selected:{handler.isQuadrantSelected(model.getQuadrant(), 1)}; } #quadrant3 { text:"jaxx.common.quadrant3"; - buttonGroup:"quadrantBG"; + buttonGroup:quadrantBG; + value:{new Integer(3)}; selected:{handler.isQuadrantSelected(model.getQuadrant(), 3)}; } #quadrant2 { text:"jaxx.common.quadrant2"; - buttonGroup:"quadrantBG"; + buttonGroup:quadrantBG; + value:{new Integer(2)}; selected:{handler.isQuadrantSelected(model.getQuadrant(), 2)}; } @@ -167,7 +176,7 @@ AbsoluteDmdCoordinateEditor { toolTipText:"jaxx.coordinate.format.dd.tip"; value:{CoordinateFormat.dd}; selected:{model.getFormat() == CoordinateFormat.dd}; - buttonGroup:coordinateFormat; + buttonGroup:formatBG; } #dmsFormat { @@ -175,7 +184,7 @@ AbsoluteDmdCoordinateEditor { toolTipText:"jaxx.coordinate.format.dms.tip"; value:{CoordinateFormat.dms}; selected:{model.getFormat() == CoordinateFormat.dms}; - buttonGroup:coordinateFormat; + buttonGroup:formatBG; } #dmdFormat { @@ -183,5 +192,5 @@ AbsoluteDmdCoordinateEditor { toolTipText:"jaxx.coordinate.format.dmd.tip"; value:{CoordinateFormat.dmd}; selected:{model.getFormat() == CoordinateFormat.dmd}; - buttonGroup: coordinateFormat; + buttonGroup: formatBG; } \ No newline at end of file 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 5a1e0f9..f251c45 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 @@ -1,16 +1,32 @@ -<JPanel constraints='BorderLayout.CENTER' layout='{new BorderLayout()}'> +<JPanel id='coordinateEditorTopPanel'> <import> jaxx.runtime.swing.CardLayout2Ext org.nuiton.jaxx.widgets.gis.CoordinateFormat + java.io.Serializable </import> - <CoordinatesEditorModel id='model'/> + <script><![CDATA[ +public void init() { handler.init(this); } +public void setBean(Serializable bean) { model.setBean(bean); } +public void setPropertyQuadrant(String property) { model.setPropertyQuadrant(property); } +public void setPropertyLatitude(String property) { model.setPropertyLatitude(property); } +public void setPropertyLongitude(String property) { model.setPropertyLongitude(property); } +public void setQuadrant(Integer quadrant) { model.setQuadrant(quadrant); } +public void setLatitude(Float latitude) { model.setLatitude(latitude); } +public void setLongitude(Float longitude) { model.setLongitude(longitude); } +public void setFormat(CoordinateFormat format) { model.setFormat(format); } +public void setShowResetButton(boolean showResetButton) { model.setShowResetButton(showResetButton); } +]]> + </script> + + <CoordinatesEditorModel id='model' initializer='getContextValue(CoordinatesEditorModel.class)'/> <AbsoluteCoordinateEditorModel id='latitudeModel' initializer='model.getLatitudeModel()'/> <AbsoluteCoordinateEditorModel id='longitudeModel' initializer='model.getLongitudeModel()'/> <!-- validator --> <BeanValidator id='validator' autoField='true' bean='model'> + <field name='quadrant' component='quadrantEditor'/> <field name='latitude' component='latitudeEditor'/> <field name='longitude' component='longitudeEditor'/> </BeanValidator> @@ -18,39 +34,31 @@ <CardLayout2Ext id='latitudeLayout' constructorParams='this, "latitudeEditor"'/> <CardLayout2Ext id='longitudeLayout' constructorParams='this, "longitudeEditor"'/> - <Table id='coordinatesPanel' constraints='BorderLayout.CENTER'> + <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> + <JToggleButton id='quadrant4'/> + <JToggleButton id='quadrant1'/> + <JToggleButton id='quadrant3'/> + <JToggleButton id='quadrant2'/> + </JPanel> + + <Table id='coordinatesPanel'> <row> - <cell rows='2'> - <JPanel id='quadrant' layout="{new GridLayout(2,2,0,0)}"> - <JToggleButton id='quadrant4' onActionPerformed='model.setQuadrant(4)'/> - <JToggleButton id='quadrant1' onActionPerformed='model.setQuadrant(1)'/> - <JToggleButton id='quadrant3' onActionPerformed='model.setQuadrant(3)'/> - <JToggleButton id='quadrant2' onActionPerformed='model.setQuadrant(2)'/> - </JPanel> - </cell> <cell anchor='east'> <JLabel id='latitudeLabel'/> </cell> - <cell fill='both'> + <cell> <JPanel id='latitudeEditor'> <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> </JPanel> </cell> - <cell rows='2'> - <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> - <JRadioButton id='ddFormat' onActionPerformed='model.setFormat(CoordinateFormat.dd)'/> - <JRadioButton id='dmsFormat' onActionPerformed='model.setFormat(CoordinateFormat.dms)'/> - <JRadioButton id='dmdFormat' onActionPerformed='model.setFormat(CoordinateFormat.dmd)'/> - </JPanel> - </cell> </row> <row> <cell anchor='east'> <JLabel id='longitudeLabel'/> </cell> - <cell fill='both'> + <cell> <JPanel id='longitudeEditor'> <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> @@ -59,5 +67,10 @@ </cell> </row> </Table> + <JPanel id='formatPanel' layout='{new GridLayout(0,1,0,0)}'> + <JRadioButton id='ddFormat'/> + <JRadioButton id='dmsFormat'/> + <JRadioButton id='dmdFormat'/> + </JPanel> </JPanel> \ No newline at end of file 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 c496400..4d496a9 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 @@ -1,13 +1,19 @@ package org.nuiton.jaxx.widgets.gis.absolute; +import com.google.common.base.Preconditions; import jaxx.runtime.spi.UIHandler; +import jaxx.runtime.swing.editor.bean.BeanUIUtil; import org.nuiton.jaxx.widgets.gis.CoordinateFormat; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.lang.reflect.Method; + /** * Created on 8/31/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 + * @since 2.12 */ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { @@ -35,7 +41,87 @@ public class CoordinatesEditorHandler implements UIHandler<CoordinatesEditor> { } + public void init(CoordinatesEditor ui) { + + CoordinatesEditorModel model = ui.getModel(); + + Object bean = model.getBean(); + + if (bean != null) { + + if (model.getPropertyLatitude() != null) { + + Method latitudeMutator = BeanUIUtil.getMutator(bean, model.getPropertyLatitude()); + Preconditions.checkNotNull(latitudeMutator, "could not find mutator for " + model.getPropertyLatitude()); + // When model latitude changed, let's push it back in bean + model.addPropertyChangeListener( + CoordinatesEditorModel.PROPERTY_LATITUDE, + new ModelPropertyChangeListener(model, latitudeMutator)); + + } + + if (model.getPropertyLatitude() != null) { + + Method longitudeMutator = BeanUIUtil.getMutator(bean, model.getPropertyLongitude()); + Preconditions.checkNotNull(longitudeMutator, "could not find mutator for " + model.getPropertyLongitude()); + + // When model longitude changed, let's push it back in bean + model.addPropertyChangeListener( + CoordinatesEditorModel.PROPERTY_LONGITUDE, + new ModelPropertyChangeListener(model, longitudeMutator)); + + } + + if (model.getPropertyQuadrant() != null) { + + Method quadrantMutator = BeanUIUtil.getMutator(bean, model.getPropertyQuadrant()); + Preconditions.checkNotNull(quadrantMutator, "could not find mutator for " + model.getPropertyQuadrant()); + + // When model quadrant changed, let's push it back in bean + model.addPropertyChangeListener( + CoordinatesEditorModel.PROPERTY_QUADRANT, + new ModelPropertyChangeListener(model, quadrantMutator)); + + } + + } + + } + public boolean isQuadrantSelected(Integer value, int requiredValue) { return value != null && value == requiredValue; } + + + private class ModelPropertyChangeListener implements PropertyChangeListener { + + private final CoordinatesEditorModel model; + + private final Method mutator; + + private ModelPropertyChangeListener(CoordinatesEditorModel model, Method mutator) { + this.model = model; + this.mutator = mutator; + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { +// if (!valueIsAdjusting) { + Object newValue = evt.getNewValue(); + + try { + +// valueModelIsAdjusting = true; +// try { + mutator.invoke(model.getBean(), newValue); +// } finally { +// valueModelIsAdjusting = false; +// } + + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java index 6803f03..7538825 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditorModel.java @@ -6,12 +6,13 @@ import org.nuiton.jaxx.widgets.gis.CoordinateHelper; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.io.Serializable; /** * Created on 8/31/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 + * @since 2.12 */ public class CoordinatesEditorModel extends AbstractSerializableBean { @@ -35,24 +36,32 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { protected final AbsoluteCoordinateEditorModel longitudeModel = new AbsoluteCoordinateEditorModel(); - protected Integer quadrant; + /** Bean where to push back data. */ + protected Serializable bean; - protected CoordinateFormat format; + /** Name of the property of the bean to fire the change of the {@link #latitudeModel}. */ + protected String propertyLatitude; + + /** Name of the property of the bean to fire the change of the {@link #longitudeModel}. */ + protected String propertyLongitude; - protected boolean autoPopupNumberEditor; + /** Name of the property of the bean to fire the change of the {@link #quadrant}. */ + protected String propertyQuadrant; + + protected Integer quadrant; - protected boolean showNumberEditorButton; + protected CoordinateFormat format; protected boolean showResetButton; - private boolean formatIsAdjusting; + private boolean valueIsAdjusting; public CoordinatesEditorModel() { latitudeModel.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (!formatIsAdjusting) { + if (!valueIsAdjusting) { fireLatitude(); } } @@ -61,7 +70,7 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { longitudeModel.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (!formatIsAdjusting) { + if (!valueIsAdjusting) { fireLongitude(); } } @@ -80,17 +89,27 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { @Override public void propertyChange(PropertyChangeEvent evt) { - formatIsAdjusting = true; + valueIsAdjusting = true; try { - CoordinateFormat oldValue = (CoordinateFormat) evt.getOldValue(); + CoordinateFormat oldFormat = (CoordinateFormat) evt.getOldValue(); + + if (oldFormat != null) { + + // synchronize latitude value from the previous format + Float latitude = latitudeModel.getValue(oldFormat); + latitudeModel.setValue(latitude); - updateFormat(oldValue); + // synchronize longitude value from the previous format + Float longitude = longitudeModel.getValue(oldFormat); + longitudeModel.setValue(longitude); + + } } finally { - formatIsAdjusting = false; + valueIsAdjusting = false; fireLatitude(); fireLongitude(); @@ -100,32 +119,36 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { }); } - public void init(Float latitude, Float longitude) { + public Serializable getBean() { + return bean; + } - formatIsAdjusting = true; + public void setBean(Serializable bean) { + this.bean = bean; + } - try { - Integer quadrant; - if (longitude == null || latitude == null) { - quadrant = null; - } else { - quadrant = CoordinateHelper.getQuadrant(longitude, latitude); - } - this.quadrant = quadrant; - this.latitudeModel.setValue(latitude); - this.longitudeModel.setValue(longitude); + public String getPropertyLatitude() { + return propertyLatitude; + } - updateFormat(getFormat()); + public void setPropertyLatitude(String propertyLatitude) { + this.propertyLatitude = propertyLatitude; + } - } finally { + public String getPropertyLongitude() { + return propertyLongitude; + } - formatIsAdjusting = false; + public void setPropertyLongitude(String propertyLongitude) { + this.propertyLongitude = propertyLongitude; + } - fireLatitude(); - fireLongitude(); - fireQuadrant(); + public String getPropertyQuadrant() { + return propertyQuadrant; + } - } + public void setPropertyQuadrant(String propertyQuadrant) { + this.propertyQuadrant = propertyQuadrant; } public boolean isShowResetButton() { @@ -138,26 +161,6 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { firePropertyChange(PROPERTY_SHOW_RESET_BUTTON, oldValue, showResetButton); } - public boolean isAutoPopupNumberEditor() { - return autoPopupNumberEditor; - } - - public void setAutoPopupNumberEditor(boolean autoPopupNumberEditor) { - boolean oldValue = isAutoPopupNumberEditor(); - this.autoPopupNumberEditor = autoPopupNumberEditor; - firePropertyChange(PROPERTY_AUTO_POPUP_NUMBER_EDITOR, oldValue, autoPopupNumberEditor); - } - - public boolean isShowNumberEditorButton() { - return showNumberEditorButton; - } - - public void setShowNumberEditorButton(boolean showNumberEditorButton) { - boolean oldValue = isShowNumberEditorButton(); - this.showNumberEditorButton = showNumberEditorButton; - firePropertyChange(PROPERTY_SHOW_NUMBER_EDITOR_BUTTON, oldValue, showNumberEditorButton); - } - public AbsoluteCoordinateEditorModel getLatitudeModel() { return latitudeModel; } @@ -167,21 +170,95 @@ public class CoordinatesEditorModel extends AbstractSerializableBean { } public Float getLatitude() { - Float latitude = format == null ? null : CoordinateHelper.getSignedLatitude(quadrant, latitudeModel.getValue(format)); + + Float latitude; + + if (format == null) { + latitude = null; + } else { + Float absoluteLatitude = latitudeModel.getValue(format); + latitude = CoordinateHelper.getSignedLatitude(quadrant, absoluteLatitude); + } + return latitude; + } - public void setLatitude(Float dd) { - // don't use it + public void setLatitude(Float latitude) { + + valueIsAdjusting = true; + + Integer newQuadrant = CoordinateHelper.getQuadrant(getLongitude(), latitude); + boolean quadrantChanged = newQuadrant != null; + + try { + + if (quadrantChanged) { + + // only change not nul quadrant + this.quadrant = newQuadrant; + + } + + this.latitudeModel.setValue(latitude); + + } finally { + + valueIsAdjusting = false; + + fireLatitude(); + if (quadrantChanged) { + fireQuadrant(); + } + + } + } public Float getLongitude() { - Float longitude = format == null ? null : CoordinateHelper.getSignedLongitude(quadrant, longitudeModel.getValue(format)); + + Float longitude; + + if (format == null) { + longitude = null; + } else { + Float absoluteLongitude = longitudeModel.getValue(format); + longitude = CoordinateHelper.getSignedLongitude(quadrant, absoluteLongitude); + } + return longitude; + } - public void setLongitude(Float dd) { - // don't use it + public void setLongitude(Float longitude) { + + valueIsAdjusting = true; + + Integer newQuadrant = CoordinateHelper.getQuadrant(longitude, getLatitude()); + boolean changeQuandrant = newQuadrant != null; + + try { + + if (changeQuandrant) { + + // only change not null quadrant + this.quadrant = newQuadrant; + + } + + this.longitudeModel.setValue(longitude); + + } finally { + + valueIsAdjusting = false; + + fireLongitude(); + if (changeQuandrant) { + fireQuadrant(); + } + + } + } public Integer getQuadrant() { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/package-info.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/package-info.java index 50cc5e9..c78431c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/package-info.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/package-info.java @@ -1,5 +1,5 @@ /** - * Define some absolute editor using quadrant. + * Define some absolute coordinate editors (using quadrant for sign). * * Created on 9/2/14. * @author Tony Chemit - chemit@codelutin.com diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java index 331aa68..bf526cb 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorHandler.java @@ -43,7 +43,7 @@ import java.text.ParseException; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDdCoordinateEditorHandler implements UIHandler<SignedDdCoordinateEditor> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorModel.java index 85299e8..e6b526a 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditorModel.java @@ -30,7 +30,7 @@ import java.io.Serializable; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDdCoordinateEditorModel extends DdCoordinate { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java index 36310ef..53a5947 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorHandler.java @@ -43,7 +43,7 @@ import java.text.ParseException; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmdCoordinateEditorHandler implements UIHandler<SignedDmdCoordinateEditor> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java index 0f444d1..78a0eee 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorModel.java @@ -30,7 +30,7 @@ import java.io.Serializable; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmdCoordinateEditorModel extends DmdCoordinate { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java index 1402dce..0e88034 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorHandler.java @@ -43,7 +43,7 @@ import java.text.ParseException; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmsCoordinateEditorHandler implements UIHandler<SignedDmsCoordinateEditor> { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorModel.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorModel.java index d1627bc..0939ff8 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorModel.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorModel.java @@ -30,7 +30,7 @@ import java.io.Serializable; * Created on 10/16/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmsCoordinateEditorModel extends DmsCoordinate { diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/package-info.java b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/package-info.java index bf02f6a..29b5763 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/package-info.java +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/package-info.java @@ -1,5 +1,5 @@ /** - * Define some signed editor. + * Define some signed coordinate editors. * * Created on 9/2/14. * @author Tony Chemit - chemit@codelutin.com diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverterTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverterTest.java index 9718b5c..3ff5d31 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverterTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateConverterTest.java @@ -8,7 +8,7 @@ import org.nuiton.converter.ConverterUtil; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class DdCoordinateConverterTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateTest.java index 2e74dd8..8ddc28d 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DdCoordinateTest.java @@ -7,7 +7,7 @@ import org.junit.Test; * Created on 9/2/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 2.12 */ public class DdCoordinateTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverterTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverterTest.java index 77e015d..7f95176 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverterTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateConverterTest.java @@ -30,7 +30,7 @@ import org.nuiton.converter.ConverterUtil; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmdCoordinateConverterTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateTest.java index 0e22e73..eef5ce2 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmdCoordinateTest.java @@ -29,7 +29,7 @@ import org.junit.Test; * Created on 10/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmdCoordinateTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java index d4c8f09..e0742e5 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateConverterTest.java @@ -30,7 +30,7 @@ import org.nuiton.converter.ConverterUtil; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmsCoordinateConverterTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateTest.java index 53276db..72fe653 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/DmsCoordinateTest.java @@ -29,7 +29,7 @@ import org.junit.Test; * Created on 11/25/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class DmsCoordinateTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java index c15995e..f5ad909 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditorTest.java @@ -44,7 +44,7 @@ import java.text.ParseException; * Created on 10/17/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmdCoordinateEditorTest { diff --git a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java index 103800e..aee7fc6 100644 --- a/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java +++ b/jaxx-widgets-gis/src/test/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditorTest.java @@ -44,7 +44,7 @@ import java.text.ParseException; * Created on 10/17/13. * * @author Tony Chemit - chemit@codelutin.com - * @since 2.6 + * @since 2.12 */ public class SignedDmsCoordinateEditorTest { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.