Author: sletellier Date: 2009-05-06 15:01:17 +0000 (Wed, 06 May 2009) New Revision: 1391 Removed: jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/widget/ Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/NumberEditorDemo.jaxx jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java jaxx/trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java Log: Updating NumberEditor model automatiquely Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/NumberEditorDemo.jaxx =================================================================== --- jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/NumberEditorDemo.jaxx 2009-05-06 14:43:09 UTC (rev 1390) +++ jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/NumberEditorDemo.jaxx 2009-05-06 15:01:17 UTC (rev 1391) @@ -40,7 +40,6 @@ property='positifInteger' constructorParams='this' bean='{demoModel}' - model='{demoModel.getPositifInteger()}' autoPopup='false' showPopupButton='true' showReset='true'/> @@ -50,7 +49,6 @@ property='positifInteger' constructorParams='this' bean='{demoModel}' - model='{demoModel.getPositifInteger()}' autoPopup='true' showPopupButton='true' showReset='true'/> @@ -65,7 +63,6 @@ property='normalInteger' constructorParams='this' bean='{demoModel}' - model='{demoModel.getNormalInteger()}' autoPopup='false' showPopupButton='true' showReset='true' @@ -76,7 +73,6 @@ property='normalInteger' constructorParams='this' bean='{demoModel}' - model='{demoModel.getNormalInteger()}' autoPopup='true' showPopupButton='true' showReset='true' @@ -92,7 +88,6 @@ property='positifFloat' constructorParams='this' bean='{demoModel}' - model='{demoModel.getPositifFloat()}' autoPopup='false' showPopupButton='true' showReset='true'/> @@ -102,7 +97,6 @@ property='positifFloat' constructorParams='this' bean='{demoModel}' - model='{demoModel.getPositifFloat()}' autoPopup='true' showPopupButton='true' showReset='true'/> @@ -117,7 +111,6 @@ property='normalFloat' constructorParams='this' bean='{demoModel}' - model='{demoModel.getNormalFloat()}' autoPopup='false' showPopupButton='true' showReset='true' @@ -128,7 +121,6 @@ property='normalFloat' constructorParams='this' bean='{demoModel}' - model='{demoModel.getNormalFloat()}' autoPopup='true' showPopupButton='true' showReset='true' Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java 2009-05-06 14:43:09 UTC (rev 1390) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/SwingUtil.java 2009-05-06 15:01:17 UTC (rev 1391) @@ -149,8 +149,10 @@ // evince the model model.removeListDataListener(combo); model.removeAllElements(); - for (Object o : data) { - model.addElement(o); + if (data != null){ + for (Object o : data) { + model.addElement(o); + } } // attach the model model.addListDataListener(combo); @@ -170,8 +172,10 @@ if (firstNull) { items.add(new Item("null", " ", null, false)); } - for (Object d : data) { - items.add(new Item(d.toString(), d.toString(), d, d.equals(select))); + if (data != null){ + for (Object d : data) { + items.add(new Item(d.toString(), d.toString(), d, d.equals(select))); + } } combo.setItems(items); } Modified: jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx =================================================================== --- jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2009-05-06 14:43:09 UTC (rev 1390) +++ jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditor.jaxx 2009-05-06 15:01:17 UTC (rev 1391) @@ -25,7 +25,7 @@ <Boolean id='autoPopup' javaBean='false'/> <!-- showPopupButton property --> - <Boolean id='showPopupButton' javaBean='true'/> + <Boolean id='showPopupButton' javaBean='false'/> <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> Modified: jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2009-05-06 14:43:09 UTC (rev 1390) +++ jaxx/trunk/jaxx-runtime-swing-widget/src/main/java/jaxx/runtime/swing/editor/NumberEditorHandler.java 2009-05-06 15:01:17 UTC (rev 1391) @@ -1,6 +1,7 @@ package jaxx.runtime.swing.editor; import java.awt.Dimension; +import java.lang.reflect.InvocationTargetException; import javax.swing.JTextField; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.math.NumberUtils; @@ -51,34 +52,52 @@ /** initialise l'ui et les listeners d'évènements. */ public void init() { + try { + if (editor.getBean() == null) { + throw new NullPointerException("can not have a null bean in ui " + editor); + } + editor.addPropertyChangeListener(MODEL_PROPERTY, new PropertyChangeListener() { - if (editor.getBean() == null) { - throw new NullPointerException("can not have a null bean in ui " + editor); - } + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("set new model " + evt.getNewValue() + " for " + editor.getProperty()); + } + setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); + } + }); + editor.addPropertyChangeListener(POPUP_VISIBLE_PROPERTY, new PropertyChangeListener() { - editor.addPropertyChangeListener(MODEL_PROPERTY, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("set new model " + evt.getNewValue() + " for " + editor.getProperty()); + @Override + public void propertyChange(PropertyChangeEvent evt) { + setPopupVisible((Boolean) evt.getNewValue()); } - setModel((Number) evt.getOldValue(), (Number) evt.getNewValue()); - } - }); - editor.addPropertyChangeListener(POPUP_VISIBLE_PROPERTY, new PropertyChangeListener() { + }); + editor.getTextField().addMouseListener(new PopupListener()); + + // Determine si c'est un float + Class type = getGetter().getReturnType(); + editor.setUseFloat(!type.equals(Integer.class) && !type.equals(int.class)); - @Override - public void propertyChange(PropertyChangeEvent evt) { - setPopupVisible((Boolean) evt.getNewValue()); + // Initialise le model + if (editor.getModel() == null){ + Number num = (Number)getGetter().invoke(editor.getBean(), null); + editor.setModel(num); } - }); - editor.getTextField().addMouseListener(new PopupListener()); - - // Determine si c'est un float - Class type = getGetter().getReturnType(); - editor.setUseFloat(!type.equals(Integer.class) && !type.equals(int.class)); - + + /*if (editor.getResetButton().getIcon() == null) { + editor.getResetButton().setIcon(SwingUtil.createActionIcon("numbereditor-reset")); + } + if (editor.getButton().getIcon() == null) { + editor.getButton().setIcon(SwingUtil.createActionIcon("numbereditor-calculator")); + }*/ + } catch (IllegalAccessException ex) { + log.error(ex); + } catch (IllegalArgumentException ex) { + log.error(ex); + } catch (InvocationTargetException ex) { + log.error(ex); + } /*if (editor.getResetButton().getIcon() == null) { editor.getResetButton().setIcon(SwingUtil.createActionIcon("numbereditor-reset")); } Modified: jaxx/trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties 2009-05-06 14:43:09 UTC (rev 1390) +++ jaxx/trunk/jaxx-runtime-swing-widget/src/main/resources/i18n/jaxx-runtime-swing-widget-fr_FR.properties 2009-05-06 15:01:17 UTC (rev 1391) @@ -24,4 +24,4 @@ numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique numbereditor.clearAll=C numbereditor.clearOne=CE -numbereditor.toggleSign=+/- +numbereditor.toggleSign=+/- \ No newline at end of file