April 2011 - Jaxx-commits - mailman.cloud.codelutin.com

r2253 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor resources/i18n
by tchemit＠users.nuiton.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 12:11:46 +0200 (Mon, 11 Apr 2011) New Revision: 2253 Url: http://nuiton.org/repositories/revision/jaxx/2253 Log: Evolution #1450: Can set a numberPattern on number editor Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-11 10:11:46 UTC (rev 2253) @@ -39,9 +39,15 @@ return new String[]{ getDefaultSource(), "NumberEditorDemoModel.java" }; } +public void changeNumberPattern() { + editor.setNumberPattern(numberPattern.getText()); +} + void $afterCompleteSetup() { editor.init(); + changeNumberPattern(); } + ]]> </script> @@ -71,11 +77,17 @@ <JCheckBox id='autoPopup' text='jaxxdemo.numbereditor.autoPopup' selected='false'/> - <JTextField id='numberPattern'/> - <JButton id='applyNumberPattern' - text='jaxxdemo.numbereditor.applyNumberPattern' - onActionPerformed='editor.setNumberPattern(numberPattern.getText())'/> + <JPanel + border='{new TitledBorder(_("jaxxdemo.numbereditor.numberPattern.configuration"))}' + layout='{new GridLayout(1,0)}'> + <JTextField id='numberPattern' text='{"\\d{0,3}"}'/> + <JButton id='applyNumberPattern' + text='jaxxdemo.numbereditor.applyNumberPattern' + onActionPerformed='changeNumberPattern();'/> + </JPanel> + + </JPanel> </cell> </row> @@ -97,6 +109,8 @@ <JPanel border='{new TitledBorder(_("jaxxdemo.numbereditor.model"))}' layout='{new GridLayout(0,1)}'> <JLabel + text='{_("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> + <JLabel text='{_("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> <JLabel text='{_("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2011-04-11 10:11:46 UTC (rev 2253) @@ -211,12 +211,14 @@ jaxxdemo.navigation.actors.title=Actors jaxxdemo.navigation.movie.title=Movie jaxxdemo.navigation.movies.title=Movies -jaxxdemo.numbereditor.applyNumberPattern=Apply the pattern +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.numberPattern=Editor pattern \: %s +jaxxdemo.numbereditor.numberPattern.configuration=Number Pattern jaxxdemo.numbereditor.showPopupButton=Show Popup button jaxxdemo.numbereditor.showReset=Show reset button jaxxdemo.numbereditor.useFloat=Use float Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-11 10:11:46 UTC (rev 2253) @@ -211,12 +211,14 @@ jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film jaxxdemo.navigation.movies.title=Films -jaxxdemo.numbereditor.applyNumberPattern=Appliquer le format de l'\u00E9diteur +jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=R\u00E9sultat jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s +jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales

1 0

r2252 - trunk
by tchemit＠users.nuiton.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 12:11:33 +0200 (Mon, 11 Apr 2011) New Revision: 2252 Url: http://nuiton.org/repositories/revision/jaxx/2252 Log: Evolution #1452: Updates to nuiton-utils 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:45:45 UTC (rev 2251) +++ trunk/pom.xml 2011-04-11 10:11:33 UTC (rev 2252) @@ -97,7 +97,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion>

1 0

r2251 - trunk
by tchemit＠users.nuiton.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 10:45:45 +0200 (Mon, 11 Apr 2011) New Revision: 2251 Url: http://nuiton.org/repositories/revision/jaxx/2251 Log: Update mavenpom4redmineAndCentral to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-10 15:30:16 UTC (rev 2250) +++ trunk/pom.xml 2011-04-11 08:45:45 UTC (rev 2251) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2250 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org 10 Apr '11

10 Apr '11

Author: tchemit Date: 2011-04-10 17:30:16 +0200 (Sun, 10 Apr 2011) New Revision: 2250 Url: http://nuiton.org/repositories/revision/jaxx/2250 Log: Evolution #1450: Can set a numberPattern on number editor (init numberPattern on init method + init lastValidText when changin model)" Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2011-04-10 12:11:03 UTC (rev 2249) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2011-04-10 15:30:16 UTC (rev 2250) @@ -83,9 +83,6 @@ public NumberEditorHandler(NumberEditor ui) { editor = ui; - if (StringUtils.isNotEmpty(editor.getNumberPattern())) { - numberPattern = Pattern.compile(editor.getNumberPattern()); - } } /** initialise l'ui et les listeners d'évènements. */ @@ -156,6 +153,11 @@ }); editor.getTextField().addMouseListener(new PopupListener()); + // Initialise le number pattern + if (StringUtils.isNotEmpty(editor.getNumberPattern())) { + numberPattern = Pattern.compile(editor.getNumberPattern()); + } + // Determine si c'est un float Class<?> type = getGetter().getReturnType(); if (editor.getModelType() != null) { @@ -507,7 +509,8 @@ } } } - + + lastValidText = strValue; editor.setModelText(strValue); } catch (Exception e) { throw new RuntimeException(e);

1 0

r2249 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor resources/i18n
by tchemit＠users.nuiton.org 10 Apr '11

10 Apr '11

Author: tchemit Date: 2011-04-10 14:11:03 +0200 (Sun, 10 Apr 2011) New Revision: 2249 Url: http://nuiton.org/repositories/revision/jaxx/2249 Log: Evolution #1450: Can set a numberPattern on number editor Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-10 12:09:20 UTC (rev 2248) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-10 12:11:03 UTC (rev 2249) @@ -71,9 +71,9 @@ <JCheckBox id='autoPopup' text='jaxxdemo.numbereditor.autoPopup' selected='false'/> - <JTextField id='numberPattern' - text='jaxxdemo.numbereditor.numberPattern'/> + <JTextField id='numberPattern'/> <JButton id='applyNumberPattern' + text='jaxxdemo.numbereditor.applyNumberPattern' onActionPerformed='editor.setNumberPattern(numberPattern.getText())'/> </JPanel> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-10 12:09:20 UTC (rev 2248) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-10 12:11:03 UTC (rev 2249) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libell\u00e9 de l'action +Button\ label\:=Libell\u00E9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activ\u00e9 +Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Pr\u00e9nom -FirstName\:=Pr\u00e9nom \: +First\ Name\:=Pr\u00E9nom +FirstName\:=Pr\u00E9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incr\u00e9menter (+) +Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'\u00e9diteur de mot de passe +Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=D\u00e9marrer -Stop=Arr\u00eater -Supported\ Swing\ components\:=Composants Swing support\u00e9s +Start=D\u00E9marrer +Stop=Arr\u00EAter +Supported\ Swing\ components\:=Composants Swing support\u00E9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=soulign\u00e9 +Underline=soulign\u00E9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=L\u00e9gumes +Vegetable=L\u00E9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=R\u00e9pertoire de travail +Working\ directory\:=R\u00E9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage compl\u00eat) -button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00eat) +button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) cancel=Annuler close=Fermer close2=Fermer 2 @@ -142,12 +142,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein \u00e9cran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00e9cran +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Fran\u00e7ais -jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00e7ais +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -155,10 +155,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Acc\u00e9der au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Pr\u00e9nom +jaxxdemo.common.firstName=Pr\u00E9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -166,7 +166,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Ann\u00e9e +jaxxdemo.common.year=Ann\u00E9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.jaxx.tree= @@ -176,17 +176,17 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fen\u00eatres -jaxxdemo.config.category.directories=R\u00e9pertoires -jaxxdemo.config.category.directories.description=R\u00e9pertoires de l'application +jaxxdemo.component.swing.window=Fen\u00EAtres +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la d\u00e9mo par d\u00e9faut -jaxxdemo.config.ui.fontSize=La taille de la police \u00e0 utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00e9cran -jaxxdemo.config.ui.locale=La langue utilis\u00e9e par l'application -jaxxdemo.feature=Fonctionnalit\u00e9s +jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application +jaxxdemo.feature=Fonctionnalit\u00E9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation @@ -194,45 +194,45 @@ jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue s\u00e9lectionn\u00e9e +jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a \u00e9t\u00e9 ferm\u00e9 \u00e0 %1$s -jaxxdemo.init.context.done=Initialisation du contexte termin\u00e9e en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00e9e. +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00e9e. -jaxxdemo.message.goto.site=Acc\u00e9der au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film jaxxdemo.navigation.movies.title=Films -jaxxdemo.numbereditor.applyNumberPattern=Appliquer le format de l'\u00e9diteur +jaxxdemo.numbereditor.applyNumberPattern=Appliquer le format de l'\u00E9diteur jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=R\u00e9sultat -jaxxdemo.numbereditor.model.float=Valeur d\u00e9cimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur enti\u00e8re \: %1$s +jaxxdemo.numbereditor.model=R\u00E9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les d\u00e9cimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=R\u00e9sultat -jaxxdemo.timeeditor.value=Heure s\u00e9lectionn\u00e9e \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00E9sultat +jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... -jaxxdemo.tree.age=Age / ann\u00e9e +jaxxdemo.tree.age=Age / ann\u00E9e jaxxdemo.tree.firstName=Prenom jaxxdemo.tree.lastName=Nom jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00e9t\u00e9 trouv\u00e9, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00e9tect\u00e9 +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 model0.f0= model0.f1= model0.file...=

1 0

r2248 - in trunk/jaxx-demo/src/main: java/jaxx/demo/component/jaxx/editor resources/i18n
by tchemit＠users.nuiton.org 10 Apr '11

10 Apr '11

Author: tchemit Date: 2011-04-10 14:09:20 +0200 (Sun, 10 Apr 2011) New Revision: 2248 Url: http://nuiton.org/repositories/revision/jaxx/2248 Log: Evolution #1450: Can set a numberPattern on number editor Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-10 12:07:19 UTC (rev 2247) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-10 12:09:20 UTC (rev 2248) @@ -71,6 +71,10 @@ <JCheckBox id='autoPopup' text='jaxxdemo.numbereditor.autoPopup' selected='false'/> + <JTextField id='numberPattern' + text='jaxxdemo.numbereditor.numberPattern'/> + <JButton id='applyNumberPattern' + onActionPerformed='editor.setNumberPattern(numberPattern.getText())'/> </JPanel> </cell> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2011-04-10 12:07:19 UTC (rev 2247) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2011-04-10 12:09:20 UTC (rev 2248) @@ -211,6 +211,7 @@ jaxxdemo.navigation.actors.title=Actors jaxxdemo.navigation.movie.title=Movie jaxxdemo.navigation.movies.title=Movies +jaxxdemo.numbereditor.applyNumberPattern=Apply the pattern jaxxdemo.numbereditor.autoPopup=Show automatic popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=Result Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-10 12:07:19 UTC (rev 2247) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-10 12:09:20 UTC (rev 2248) @@ -21,7 +21,7 @@ Blue=Bleu Blue\:=bleu \: Bold=En gras -Button\ label\:=Libell\u00E9 de l'action +Button\ label\:=Libell\u00e9 de l'action C=C CE=CE Cancel=Annuler @@ -35,12 +35,12 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Enabled=Activ\u00E9 +Enabled=Activ\u00e9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue Fancy\ Button=Bouton 'Fancy' -First\ Name\:=Pr\u00E9nom -FirstName\:=Pr\u00E9nom \: +First\ Name\:=Pr\u00e9nom +FirstName\:=Pr\u00e9nom \: Font\ size=Taille de la police Font\ size\:\ = Fool\ me\ once= @@ -49,7 +49,7 @@ Green\:=Vert \: Greet= Help= -Inc\ (+)=Incr\u00E9menter (+) +Inc\ (+)=Incr\u00e9menter (+) Italic=Italique JAXX\ Demo= JMenu\ demo= @@ -70,26 +70,26 @@ Red\:=rouge \: Reset=Reinitialiser Show\ Background=Voir le fond -Show\ password\ dialog=Voir l'\u00E9diteur de mot de passe +Show\ password\ dialog=Voir l'\u00e9diteur de mot de passe Sign\ on=Signer Simple\ Button=Bouton simple Size\:=Taille \: Sources=Sources Spacing\:=Espacement \: -Start=D\u00E9marrer -Stop=Arr\u00EAter -Supported\ Swing\ components\:=Composants Swing support\u00E9s +Start=D\u00e9marrer +Stop=Arr\u00eater +Supported\ Swing\ components\:=Composants Swing support\u00e9s Text2\:=Text 2 Text\:=Texte \: Total\:\ = -Underline=soulign\u00E9 +Underline=soulign\u00e9 Upper\ case\ text\:=Texte en majuscule Use\ the\ spinner\ to=Utiliser la jauge pour Username\:=Utilisateur \: -Vegetable=L\u00E9gumes +Vegetable=L\u00e9gumes View=Vue Welcome\ to\ the\ JAXX\ framework\!=Bienvenu dans le framework JAXX -Working\ directory\:=R\u00E9pertoire de travail +Working\ directory\:=R\u00e9pertoire de travail Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: @@ -98,8 +98,8 @@ between\ these\ lines= button\ A=Bouton A button\ B=Bouton B -button\ C\ (full\ block)=Bouton C (blocage compl\u00EAt) -button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00EAt) +button\ C\ (full\ block)=Bouton C (blocage compl\u00eat) +button\ D\ (full\ block\ 2)=Bouton D (blocage compl\u00eat) cancel=Annuler close=Fermer close2=Fermer 2 @@ -142,12 +142,12 @@ jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter jaxxdemo.action.exit.tip=Quitter JAXX Demo -jaxxdemo.action.fullscreen=Plein \u00E9cran -jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran +jaxxdemo.action.fullscreen=Plein \u00e9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00e9cran jaxxdemo.action.help=Aide jaxxdemo.action.help.tip=Affichier l'aide -jaxxdemo.action.locale.fr=Fran\u00E7ais -jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais +jaxxdemo.action.locale.fr=Fran\u00e7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00e7ais jaxxdemo.action.locale.uk=Anglais jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal @@ -155,10 +155,10 @@ jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir jaxxdemo.action.site=Site internet -jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet +jaxxdemo.action.site.tip=Acc\u00e9der au site de l'application sur internet jaxxdemo.common.actors=Acteurs jaxxdemo.common.age=Age -jaxxdemo.common.firstName=Pr\u00E9nom +jaxxdemo.common.firstName=Pr\u00e9nom jaxxdemo.common.id=Identifiant jaxxdemo.common.image=Image jaxxdemo.common.lastName=Nom @@ -166,7 +166,7 @@ jaxxdemo.common.movies=Films jaxxdemo.common.people=Acteur jaxxdemo.common.title=Titre -jaxxdemo.common.year=Ann\u00E9e +jaxxdemo.common.year=Ann\u00e9e jaxxdemo.component.jaxx=Composants JAXX jaxxdemo.component.jaxx.editor=Editeurs jaxxdemo.component.jaxx.tree= @@ -176,17 +176,17 @@ jaxxdemo.component.swing.form.text=Texte jaxxdemo.component.swing.layout=Layouts jaxxdemo.component.swing.menu=Menus -jaxxdemo.component.swing.window=Fen\u00EAtres -jaxxdemo.config.category.directories=R\u00E9pertoires -jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application +jaxxdemo.component.swing.window=Fen\u00eatres +jaxxdemo.config.category.directories=R\u00e9pertoires +jaxxdemo.config.category.directories.description=R\u00e9pertoires de l'application jaxxdemo.config.category.other=Autre jaxxdemo.config.category.other.description=Autres options jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.demo.path=Chemin de la d\u00E9mo par d\u00E9faut -jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran -jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application -jaxxdemo.feature=Fonctionnalit\u00E9s +jaxxdemo.config.ui.demo.path=Chemin de la d\u00e9mo par d\u00e9faut +jaxxdemo.config.ui.fontSize=La taille de la police \u00e0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00e9cran +jaxxdemo.config.ui.locale=La langue utilis\u00e9e par l'application +jaxxdemo.feature=Fonctionnalit\u00e9s jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.nav=API JAXX pour les arbres jaxxdemo.feature.validation=Validation @@ -194,44 +194,45 @@ jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popup.title=Titre de la popup jaxxdemo.i18neditor.popupBorderText=Titre de la popup -jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e +jaxxdemo.i18neditor.selected.locale=Langue s\u00e9lectionn\u00e9e jaxxdemo.i18neditor.showIcon=Afficher les icones jaxxdemo.i18neditor.showPopupIcon=Afficher les icones dans la popup jaxxdemo.i18neditor.showPopupText=Afficher les textes dans la popup jaxxdemo.i18neditor.showText=Afficher le text -jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s -jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. -jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. +jaxxdemo.init.closed=JAXX Demo a \u00e9t\u00e9 ferm\u00e9 \u00e0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00e9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00e9e. jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues jaxxdemo.menu.help=Aide -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. -jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00e9e. +jaxxdemo.message.goto.site=Acc\u00e9der au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film jaxxdemo.navigation.movies.title=Films +jaxxdemo.numbereditor.applyNumberPattern=Appliquer le format de l'\u00e9diteur jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration -jaxxdemo.numbereditor.model=R\u00E9sultat -jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s -jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model=R\u00e9sultat +jaxxdemo.numbereditor.model.float=Valeur d\u00e9cimale \: %1$s +jaxxdemo.numbereditor.model.int=Valeur enti\u00e8re \: %1$s jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset -jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales +jaxxdemo.numbereditor.useFloat=Utiliser les d\u00e9cimales jaxxdemo.numbereditor.useSign=Utiliser le signe jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label -jaxxdemo.timeeditor.model=R\u00E9sultat -jaxxdemo.timeeditor.value=Heure s\u00E9lectionn\u00E9e \: %1$tH\:%1$tM +jaxxdemo.timeeditor.model=R\u00e9sultat +jaxxdemo.timeeditor.value=Heure s\u00e9lectionn\u00e9e \: %1$tH\:%1$tM jaxxdemo.title.about=A propos de JAXX Demo... -jaxxdemo.tree.age=Age / ann\u00E9e +jaxxdemo.tree.age=Age / ann\u00e9e jaxxdemo.tree.firstName=Prenom jaxxdemo.tree.lastName=Nom jaxxdemo.tree.tabtitle=Arbre jaxxdemo.treeTable.tabtitle=Arbre tableau -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00e9t\u00e9 trouv\u00e9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00e9tect\u00e9 model0.f0= model0.f1= model0.file...=

1 0

r2247 - trunk/jaxx-demo
by tchemit＠users.nuiton.org 10 Apr '11

10 Apr '11

Author: tchemit Date: 2011-04-10 14:07:19 +0200 (Sun, 10 Apr 2011) New Revision: 2247 Url: http://nuiton.org/repositories/revision/jaxx/2247 Log: use license-m-p instead of m-license-p Modified: trunk/jaxx-demo/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-04-10 12:07:01 UTC (rev 2246) +++ trunk/jaxx-demo/pom.xml 2011-04-10 12:07:19 UTC (rev 2247) @@ -269,8 +269,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <executions> <execution> <id>attach-licenses</id>

1 0

r2246 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org 10 Apr '11

10 Apr '11

Author: tchemit Date: 2011-04-10 14:07:01 +0200 (Sun, 10 Apr 2011) New Revision: 2246 Url: http://nuiton.org/repositories/revision/jaxx/2246 Log: Evolution #1450: Can set a numberPattern on number editor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2011-03-18 11:45:43 UTC (rev 2245) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2011-04-10 12:07:01 UTC (rev 2246) @@ -67,6 +67,9 @@  <Boolean id='showReset' javaBean='false'/> +  + <String id="numberPattern" javaBean='null'/> +  <String id="modelText" javaBean='""'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2011-03-18 11:45:43 UTC (rev 2245) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2011-04-10 12:07:01 UTC (rev 2246) @@ -26,6 +26,7 @@ package jaxx.runtime.swing.editor; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,6 +45,8 @@ import java.lang.reflect.Method; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_MODEL; import static jaxx.runtime.swing.editor.NumberEditor.PROPERTY_POPUP_VISIBLE; @@ -76,8 +79,13 @@ protected Class<?> modelType; + protected Pattern numberPattern; + public NumberEditorHandler(NumberEditor ui) { editor = ui; + if (StringUtils.isNotEmpty(editor.getNumberPattern())) { + numberPattern = Pattern.compile(editor.getNumberPattern()); + } } /** initialise l'ui et les listeners d'évènements. */ @@ -87,6 +95,22 @@ throw new NullPointerException("can not have a null bean in ui " + editor); } + editor.addPropertyChangeListener(NumberEditor.PROPERTY_NUMBER_PATTERN, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + String newPattern = (String) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("set new numberPattern" + newPattern); + } + if (StringUtils.isEmpty(newPattern)) { + numberPattern = null; + } else { + numberPattern = Pattern.compile(newPattern); + } + } + }); + editor.addPropertyChangeListener(NumberEditor.PROPERTY_SHOW_POPUP_BUTTON, new PropertyChangeListener() { @Override @@ -112,7 +136,7 @@ } } }); - + editor.addPropertyChangeListener(PROPERTY_MODEL, new PropertyChangeListener() { @Override @@ -197,6 +221,8 @@ }); } + protected String lastValidText; + /** * Modifie le modèle de la donnée à éditer à partir d'un evenement clavier * <p/> @@ -216,6 +242,31 @@ return; } + if (StringUtils.isNotEmpty(s) && numberPattern != null) { + + // use given number pattern + Matcher matcher = numberPattern.matcher(s); + if (!matcher.matches()) { + + // the current text is not accepted... + if (log.isInfoEnabled()) { + log.info("Does not accept the new number " + s + + ", will reapply lastValidText : " + lastValidText); + } + + String oldText; + if (lastValidText != null) { + + // push back last valid text + oldText = lastValidText; + } else { + oldText = ""; + } + editor.getTextField().setText(oldText); + return; + } + } + boolean canApply = false; boolean endWithDot = false; @@ -278,6 +329,7 @@ int oldPosition = field.getCaretPosition(); if (canApply) { + if (log.isDebugEnabled()) { log.debug("can apply new model value : " + newValue); } @@ -291,6 +343,8 @@ editor.setModelText(s.substring(0, s.length() - 1)); field.setCaretPosition(oldPosition); } + + lastValidText = editor.getModelText(); return; } @@ -305,10 +359,11 @@ oldPosition--; } field.setText(text); + + lastValidText = text; try { field.setCaretPosition(oldPosition); - } - catch (IllegalArgumentException ex) { + } catch (IllegalArgumentException ex) { log.debug("CaretPosition is invalid for position : " + oldPosition, ex); } }

1 0