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

r1933 - in trunk/src/site: . rst
by jcouteau＠users.nuiton.org May 26, 2010

May 26, 2010

Author: jcouteau Date: 2010-05-26 16:19:35 +0200 (Wed, 26 May 2010) New Revision: 1933 Url: http://nuiton.org/repositories/revision/jaxx/1933 Log: Add java bean doc Added: trunk/src/site/rst/javaBeans.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/javaBeans.rst =================================================================== --- trunk/src/site/rst/javaBeans.rst (rev 0) +++ trunk/src/site/rst/javaBeans.rst 2010-05-26 14:19:35 UTC (rev 1933) @@ -0,0 +1,28 @@ +------------------------------------ +Utilisation des java beans dans JAXX +------------------------------------ + +Il est possible dans JAXX de rajouter des objets quelconques via leur nom +qualifié de classe. Example :: + + <JPanel> + <java.lang.Boolean id='myState' constructorParams='true'/> + <JLabel text='text' visible='{isMyState()}'/> + </JPanel> + +Cela permet de faire du data-binding en ajoutant un attribut *javaBean* sur +l'objet. Exemple :: + + <JPanel> + <java.lang.Boolean id='myState' constructorParams='true' javaBean='anyValue'/> + <JLabel text='text' visible='{isMySate()}'/> + </JPanel> + +Cela permet d'avoir un mutateur sur la propriété *myState* qui déclenchera +l'envoi d'un *PropertyChange* sur la propriété lors de modification de valeur +(ce qui n'est pas possible en utilisant une propriété en lecture seule). + +Ainsi le compilateur JAXX sera capable d'enregistrer un nouveau dataBinding sur +la propriété *visible* du label et la modification de l'état *myState* sera +automatiquement répercuté sur la propriété. + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-05-26 13:13:13 UTC (rev 1932) +++ trunk/src/site/site_fr.xml 2010-05-26 14:19:35 UTC (rev 1933) @@ -56,10 +56,18 @@ <item name="Les scripts JAXX" href="scripting.html"/> <item name="Le data-binding" href="dataBinding.html"/> <item name="Utiliser des styles" href="useStylesheets.html"/> +  + <item name="Java beans" href="javaBeans.html"/> +  </item> <item name="Fonctionnalités avancées"> <item name="Internationalisation" href="I18n.html"/> +  </item> +  <item name="Démo" href="demo.html"/> <item name="Tutoriels"> <item name="Hello World" href="tutos/helloworld.html"/> @@ -68,6 +76,9 @@ <item name="Data-binding" href="tutos/data-binding.html"/> <item name="ConfigUI" href="tutos/config.html"/> </item> +  </menu> <menu name="Ancienne documentation">

1 0

r1932 - in trunk/src/site: . rst
by jcouteau＠users.nuiton.org May 26, 2010

May 26, 2010

Author: jcouteau Date: 2010-05-26 15:13:13 +0200 (Wed, 26 May 2010) New Revision: 1932 Url: http://nuiton.org/repositories/revision/jaxx/1932 Log: Doc about internationalisation (i18n) Modified: trunk/src/site/rst/I18n.rst trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/I18n.rst =================================================================== --- trunk/src/site/rst/I18n.rst 2010-05-23 19:00:50 UTC (rev 1931) +++ trunk/src/site/rst/I18n.rst 2010-05-26 13:13:13 UTC (rev 1932) @@ -22,59 +22,94 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - ----- -I18n ----- +==================== +Internationalisation +==================== + .. contents:: Présentation ============ -Ajout du support i18n dans JAXX. +L'internationalisation est présente par défaut dans JAXX et utilise la librairie +`Nuiton-I18n`_ -On utilise la système i18n développé dans la librairie des lutins (*lutinlib*). +.. _Nuiton-I18n::http://maven-site.nuiton.org/i18n/ Configuration ============= -Une option a été ajoutée dans le plugin maven de JAXX : *i18nable* pour permettre ou non l'utilisation de ce système. +Une option a été ajoutée dans le plugin maven de JAXX : *i18nable* pour +permettre ou non l'utilisation de ce système. -Par défaut, l'option est active (donc aucune configuration supplémentaire n'est nécessaire pour utiliser i18n dans JAXX). +Par défaut, l'option est active (donc aucune configuration supplémentaire n'est +nécessaire pour utiliser i18n dans JAXX). Pour la désactiver, il suffit de +rajouter *<i18nable>false</i18nable>* dans la configuration du plugin. Fonctionnement ============== -Le fonctionnement est simple : lors de la compilation JAXX, lorsque l'on rencontre certains attributs on encapsule la -valeur de l'attribution par un appel à la méthode +Le fonctionnement est simple : lors de la compilation JAXX, lorsque l'on +rencontre certains attributs on encapsule la valeur de l'attribution par un +appel à la méthode :: -:: - org.nuiton.i18n.I18n._(String) - La liste des attributs en question sont les suivants : - title - text - toolTipText +Ensuite l'utilisation du *parserJava* du plugin i18n permet la détection des +clefs i18n. -Ensuite l'utilisation du *parserJava* du plugin i18n permet la détection des clefs i18n. +Exemple +======= +Si on prend l'exemple suivant, on a une JFrame avec le titre myKey :: -Pourquoi ne plus utiliser l'ancien parserJaxx du plugin i18n -============================================================ + <JFrame id='mainFrame' + width='800' + height='800' + title='myKey'/> -Un parseur avait été développé initialement pour détecter dans les fichiers JAXX (*parserJaxx*), les appels à la méthode de traduction -i18n dans les attributs. +Maintenant, si on configure le plugin i18n de la manière suivante (pour plus +d'information sur le plugin i18n, reportez vous à la `documentation ad-hoc`_ ):: -Ce parseur n'est plus d'actualité car on ne doit plus avoir d'appel explicite à cette méthode dans les fichiers JAXX. + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> -De plus, même sans avoir mis en place le mécanisme i18n dans JAXX, ce parseur n'était plus d'actualité : il se base -sur une liste prédéfinie d'attributs xml à scanner pour détecter des appels i18n; ce qui n'était pas acceptable à terme -car si on ajoute un nouveau composent dans JAXX, le plugin i18n n'est pas capable de détecter les nouvelles clefs. +On peut changer le titre de la +JFrame depuis le fichier de traduction en changeant la valeur pour la clé myKey. -Donc on préconise l'utilisation du *parserJava* du plugin i18n qui lui est capable de détecter tous les appels i18n. +.. _documentation ad-hoc::http://maven-site.nuiton.org/i18n/ + + +Pourquoi ne plus utiliser l'ancien parserJaxx du plugin i18n ? +============================================================== + +Le *parserJaxx* du plugin i18n avait besoin des appels explicites à la méthode +de traduction et de par sa conception n'était pas capable de détecter les +nouvelles clés à traduire. Il faut lui préférer l'utilisation du *parserJava* +qui se sert du code Java généré pour travailler avec les traductions. Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-05-23 19:00:50 UTC (rev 1931) +++ trunk/src/site/site_fr.xml 2010-05-26 13:13:13 UTC (rev 1932) @@ -57,6 +57,9 @@ <item name="Le data-binding" href="dataBinding.html"/> <item name="Utiliser des styles" href="useStylesheets.html"/> </item> + <item name="Fonctionnalités avancées"> + <item name="Internationalisation" href="I18n.html"/> + </item> <item name="Démo" href="demo.html"/> <item name="Tutoriels"> <item name="Hello World" href="tutos/helloworld.html"/>

1 0

r1931 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field
by tchemit＠users.nuiton.org May 23, 2010

May 23, 2010

Author: tchemit Date: 2010-05-23 21:00:50 +0200 (Sun, 23 May 2010) New Revision: 1931 Url: http://nuiton.org/repositories/revision/jaxx/1931 Log: add againstMe property in validator Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2010-05-23 13:35:09 UTC (rev 1930) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2010-05-23 19:00:50 UTC (rev 1931) @@ -55,18 +55,28 @@ * @since 1.5 */ protected String collectionFieldName; + /** * la liste des propriétés d'une entrée de la collection qui définit la * clef unique. */ protected String[] keys; + /** * Une propriété optionnelle pour valider que l'objet reflétée par cette * propriété ne viole pas l'intégrité de la clef unique. * Cela permet de valider l'unicité sans que l'objet soit dans la collection */ protected String againstProperty; + /** + * Une propriété optionnelle pour utiliser l'objet en cours de validation pour + * valider que l'objet reflétée par cette propriété ne viole pas l'intégrité de la clef unique. + * Cela permet de valider l'unicité sans que l'objet soit dans la collection + */ + protected boolean againstMe; + + /** * Lors de l'utilisation de la againstProperty et qu'un ne peut pas utiliser * le equals sur l'objet, on peut spécifier une expression pour exclure des * tests lors de la recherche de la violation de clef unique. @@ -85,6 +95,10 @@ return keys; } + public boolean getAgainstMe() { + return againstMe; + } + public void setKeys(String[] keys) { if (keys != null && keys.length == 1 && keys[0].indexOf(',') != -1) { this.keys = keys[0].split(","); @@ -109,6 +123,10 @@ this.againstIndexExpression = againstIndexExpression; } + public void setAgainstMe(boolean againstMe) { + this.againstMe = againstMe; + } + @Override public void validate(Object object) throws ValidationException { @@ -124,13 +142,14 @@ log.debug("collection found : " + col); } Object againstBean = againstProperty == null ? null : - getFieldValue(againstProperty, object); + getFieldValue(againstProperty, object); if (log.isDebugEnabled()) { log.debug("againtBean = " + againstBean); } Integer againstIndex = (Integer) (againstIndexExpression == null ? - -1 : getFieldValue(againstIndexExpression, object)); + -1 : + getFieldValue(againstIndexExpression, object)); if (againstIndex == null) { againstIndex = -1; } @@ -139,10 +158,19 @@ return; } + if (againstMe) { + // try on this object + againstBean = object; + if (log.isDebugEnabled()) { + log.debug("againtBean from me = " + againstBean); + } + } + + boolean answer = true; Integer againstHashCode = againstBean == null ? - null : getUniqueKeyHashCode(againstBean); + null : getUniqueKeyHashCode(againstBean); if (log.isDebugEnabled()) { log.debug("hash for new key " + againstHashCode); } @@ -168,7 +196,7 @@ // utilisation de againstBean if (againstIndex != -1) { if (index != againstIndex && - hash.equals(againstHashCode)) { + hash.equals(againstHashCode)) { // on a deja rencontre cette clef unique, // donc la validation a echouee answer = false; @@ -176,7 +204,7 @@ } } else { if (!againstBean.equals(o) && - hash.equals(againstHashCode)) { + hash.equals(againstHashCode)) { // on a deja rencontre cette clef unique, // donc la validation a echouee answer = false; @@ -246,7 +274,7 @@ if (!Collection.class.isInstance(obj)) { throw new ValidationException("field " + fieldName + - " is not a collection type! (" + obj.getClass() + ')'); + " is not a collection type! (" + obj.getClass() + ')'); } return (Collection<?>) obj; }

1 0

r1930 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org May 23, 2010

May 23, 2010

Author: tchemit Date: 2010-05-23 15:35:09 +0200 (Sun, 23 May 2010) New Revision: 1930 Url: http://nuiton.org/repositories/revision/jaxx/1930 Log: Evolution #633: BlockingLayerUI can accept som component NOT to be blocked reformat code Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2010-05-23 13:29:53 UTC (rev 1929) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2010-05-23 13:35:09 UTC (rev 1930) @@ -24,6 +24,12 @@ */ package jaxx.runtime.swing; +import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.jxlayer.plaf.AbstractLayerUI; + +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.JComponent; import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Component; @@ -34,21 +40,17 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; -import javax.swing.Action; -import javax.swing.ImageIcon; -import javax.swing.JComponent; -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.jxlayer.plaf.AbstractLayerUI; +import java.util.Arrays; +import java.util.List; /** - * * A JXLayer ui implementation that permits to block a component but still * allow an action when clicking on the right-top icon painted on the layer. - * + * * You can change the blocking and accepting icon. - * + * * To hook an click on the layer's icon, you can : - * + * * <ul><li>pass an Action via method {@link #setAcceptAction(Action)}</li> * <li>override the method {@link #acceptEvent(MouseEvent, JXLayer)}</li> * </ul> @@ -59,51 +61,50 @@ public class BlockingLayerUI extends AbstractLayerUI<JComponent> { public static final String CAN_CLICK_PROPERTY = "canClick"; + public static final String ACCEPT_ICON_PROPERTY = "acceptIcon"; + public static final String BLOCK_ICON_PROPERTY = "blockIcon"; + public static final String BLOCK_PROPERTY = "block"; // private static final long serialVersionUID = 1L; - /** - * Action to be treated when click on icon - */ + /** Action to be treated when click on icon */ protected Action acceptAction; - /** - * Icon when you can not click - */ + /** Icon when you can not click */ protected BufferedImage blockIcon; - /** - * Icon when you can click - */ + /** Icon when you can click */ protected BufferedImage acceptIcon; - /** - * Optinal color to put fill background when blocking - */ + /** Optinal color to put fill background when blocking */ protected Color blockingColor; - /** - * Internal state to known when we can accept click - */ + /** Internal state to known when we can accept click */ protected boolean canClick; /** * A flag to enable or disable the use of the icon. - * - * If set to false, no icon will be displayed and no action + * + * If set to false, no icon will be displayed and no action * will be possible. - * + * * By default, this is active. */ protected boolean useIcon = true; - /** - * Internal state when should block event and paint layer - */ + /** Internal state when should block event and paint layer */ protected boolean block; + /** Extra components names to accept even in block mode */ + protected List<String> acceptedComponentNames; + + public void setAcceptedComponentNames(String... acceptedComponentNames) { + this.acceptedComponentNames = Arrays.asList(acceptedComponentNames); + setDirty(true); + } + public void setAcceptAction(Action acceptAction) { this.acceptAction = acceptAction; } @@ -186,19 +187,46 @@ @Override protected void processKeyEvent(KeyEvent e, JXLayer<JComponent> l) { - if (useIcon || block) { + if (useIcon) { e.consume(); + return; } + + if (block) { + Object source = e.getSource(); + if (!(source instanceof JComponent)) { + e.consume(); + return; + } + JComponent comp = (JComponent) source; + String compName = comp.getName(); + if (acceptedComponentNames == null || + !acceptedComponentNames.contains(compName)) { + e.consume(); + } + } } @Override protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { if (useIcon) { updateCanClickState(l, e); - } - if (useIcon || block) { e.consume(); } + + if (block) { + Object source = e.getSource(); + if (!(source instanceof JComponent)) { + e.consume(); + return; + } + JComponent comp = (JComponent) source; + String compName = comp.getName(); + if (acceptedComponentNames == null || + !acceptedComponentNames.contains(compName)) { + e.consume(); + } + } } @Override @@ -218,10 +246,36 @@ break; } } - if (useIcon || block) { + if (useIcon) { + e.consume(); + return; } + if (block) { + Object source = e.getSource(); + if (!(source instanceof JComponent)) { + e.consume(); + return; + } + JComponent comp = (JComponent) source; + String compName = comp.getName(); + if (acceptedComponentNames == null || + !acceptedComponentNames.contains(compName)) { + e.consume(); + return; + } + switch (e.getID()) { + case MouseEvent.MOUSE_ENTERED: + break; + case MouseEvent.MOUSE_EXITED: + break; + case MouseEvent.MOUSE_CLICKED: + acceptEvent(e, l); + break; + } + } + } @Override Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java 2010-05-23 13:29:53 UTC (rev 1929) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java 2010-05-23 13:35:09 UTC (rev 1930) @@ -24,6 +24,12 @@ */ package jaxx.runtime.swing; +import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.jxlayer.plaf.AbstractLayerUI; + +import javax.swing.Action; +import javax.swing.ImageIcon; +import javax.swing.JComponent; import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Component; @@ -34,55 +40,46 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; -import javax.swing.Action; -import javax.swing.ImageIcon; -import javax.swing.JComponent; -import org.jdesktop.jxlayer.JXLayer; /** - * * A JXLayer ui implementation that permits to block a component but still * allow an action when clicking everywhere on the layer. - * + * * Moreover, an icon can be added on the right-top icon painted and changed * when the mouse is over the layer. - * + * * You can change the blocking and accepting icon. - * + * * To hook an click on the layer's icon, you can : - * + * * <ul><li>pass an Action via method {@link #setAcceptAction(Action)}</li> - * <li>override the method {@link #acceptEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer)}</li> + * <li>override the method {@link #acceptEvent(MouseEvent, JXLayer)}</li> * </ul> * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ -public class BlockingLayerUI2 extends org.jdesktop.jxlayer.plaf.AbstractLayerUI<JComponent> { +public class BlockingLayerUI2 extends AbstractLayerUI<JComponent> { public static final String CAN_CLICK_PROPERTY = "canClick"; + public static final String ACCEPT_ICON_PROPERTY = "acceptIcon"; + public static final String BLOCK_ICON_PROPERTY = "blockIcon"; - private static final long serialVersionUID = 1L; - /** - * Action to be treated when click on icon - */ + + /** Action to be treated when click on icon */ protected Action acceptAction; - /** - * Icon when you can not click - */ + + /** Icon when you can not click */ protected BufferedImage blockIcon; - /** - * Icon when you can click - */ + + /** Icon when you can click */ protected BufferedImage acceptIcon; - /** - * Optinal color to put fill background when blocking - */ + + /** Optinal color to put fill background when blocking */ protected Color blockingColor; - /** - * Internal state to known when we can accept click - */ + + /** Internal state to known when we can accept click */ protected boolean canClick; public void setAcceptAction(Action acceptAction) { @@ -171,7 +168,7 @@ } break; } - e.consume(); + e.consume(); } @Override

1 0

r1929 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org May 23, 2010

May 23, 2010

Author: tchemit Date: 2010-05-23 15:29:53 +0200 (Sun, 23 May 2010) New Revision: 1929 Url: http://nuiton.org/repositories/revision/jaxx/1929 Log: Evolution #632: Introduce jaxx.runtime.swing.layer package Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/layer/

1 0

r1928 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org May 22, 2010

May 22, 2010

Author: tchemit Date: 2010-05-22 11:02:09 +0200 (Sat, 22 May 2010) New Revision: 1928 Url: http://nuiton.org/repositories/revision/jaxx/1928 Log: clean code Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/EntityComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/EntityComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/EntityComboBoxHandler.java 2010-05-22 09:01:47 UTC (rev 1927) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/EntityComboBoxHandler.java 2010-05-22 09:02:09 UTC (rev 1928) @@ -32,6 +32,8 @@ import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; + +import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import javax.swing.JPopupMenu; @@ -134,11 +136,11 @@ // init combobox renderer base on given decorator ui.getCombobox().setRenderer(new DecoratorListCellRenderer(d)); - this.convertor = newDecoratedObjectToStringConverter(d); + convertor = newDecoratedObjectToStringConverter(d); // keep a trace of original document (to make possible reverse autom-complete) JTextComponent editorComponent = (JTextComponent) ui.getCombobox().getEditor().getEditorComponent(); - this.originalDocument = editorComponent.getDocument(); + originalDocument = editorComponent.getDocument(); // build popup preparePopup(d); @@ -409,7 +411,7 @@ @Override public String getPreferredStringForItem(Object item) { - return item instanceof String ? (String) item : (item == null ? "" : decorator.toString(item)); + return item instanceof String ? (String) item : item == null ? "" : decorator.toString(item); } }; } @@ -423,7 +425,7 @@ */ public static void decorate(JComboBox combo, ObjectToStringConverter convertor) { - org.jdesktop.swingx.autocomplete.AutoCompleteDecorator.decorate(combo, convertor); + AutoCompleteDecorator.decorate(combo, convertor); } /**

1 0

r1927 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org May 22, 2010

May 22, 2010

Author: tchemit Date: 2010-05-22 11:01:47 +0200 (Sat, 22 May 2010) New Revision: 1927 Url: http://nuiton.org/repositories/revision/jaxx/1927 Log: fires selected property Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java 2010-05-20 05:35:13 UTC (rev 1926) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2Ext.java 2010-05-22 09:01:47 UTC (rev 1927) @@ -24,41 +24,45 @@ */ package jaxx.runtime.swing; -import java.awt.Container; -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import jaxx.runtime.JAXXObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.Container; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + /** * Une extension de {@link CardLayout2} pour pouvoir automatiquement afficher un * contenu à partir de la propriété {@link #selected}. - * + * * Ainsi, en changeant cette propriété via la méthode {@link #setSelected(String)}, * le contenu sera changé automatiquement, ce qui permet une utilisation direct * dans jaxx sans à avoir à écrire d'écouteur. * * @author tchemit <chemit(a)codelutin.com> + * @see CardLayout2 * @since 1.3 - * @see CardLayout2 */ public class CardLayout2Ext extends CardLayout2 { /** log */ static private Log log = LogFactory.getLog(CardLayout2.class); + private static final long serialVersionUID = 1L; + public static final String SELECTED_PROPERTY_NAME = "selected"; - /** - * pour propager les changements dans le modèle vers l'ui - */ + + /** pour propager les changements dans le modèle vers l'ui */ protected PropertyChangeSupport pcs; - /** - * le contenu sélectionné - */ + + /** le contenu sélectionné */ protected String selected; + private String containerName; + private JAXXObject ui; + private Container container; public CardLayout2Ext(JAXXObject ui, String containerName) { @@ -91,8 +95,7 @@ String oldSelected = this.selected; this.selected = selected; show(getContainer(), selected); - //TODO-TC20100311 : should propagate the selected ? -// pcs.firePropertyChange(SELECTED_PROPERTY_NAME, oldSelected, selected); + pcs.firePropertyChange(SELECTED_PROPERTY_NAME, oldSelected, selected); } public Container getContainer() {

1 0

r1926 - in trunk/jaxx-compiler/src/main/java/jaxx/compiler: . binding decorators tags
by tchemit＠users.nuiton.org May 20, 2010

May 20, 2010

Author: tchemit Date: 2010-05-20 07:35:13 +0200 (Thu, 20 May 2010) New Revision: 1926 Url: http://nuiton.org/repositories/revision/jaxx/1926 Log: improve override mecanism Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -273,6 +273,16 @@ } /** + * {@code true} when overrides an object in the superclass of the class + * being compiled AND type is also override. + * + * @return {@code true} if this object is an override AND override type + */ + public boolean isOverrideType() { + return isOverride() && !getObjectClass().equals(getOverrideType()); + } + + /** * Sets whether this class overrides an identically-named object in the * parent class. * @@ -709,4 +719,8 @@ public int getGenericTypesLength() { return genericTypes == null ? 0 : genericTypes.length; } + + public String getGetterName() { + return "get"+StringUtils.capitalize(id); + } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataBinding.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -217,6 +217,31 @@ processDataBinding = getProcessDataBindingCode(compiler, dataSource, binding); + Set<String> ids = dataSource.getOverrideIds(); + + if (binding && ids != null && !ids.isEmpty()) { + + // there is some overrides, check trackers + DataListener[] listeners = dataSource.getTrackers(); + for (DataListener listener : listeners) { + String code = listener.getAddListenerCode(); + String newCode = replaceOverrides(compiler, ids, code); + if (code.equals(newCode)) { + listener.addListenerCode = newCode; + if (dataSource.showLog()) { + log.info("Replace overrides [" + code + "] --> [" + newCode + "]"); + } + } + code = listener.getRemoveListenerCode(); + newCode = replaceOverrides(compiler, ids, code); + if (code.equals(newCode)) { + listener.removeListenerCode = newCode; + if (dataSource.showLog()) { + log.info("Replace overrides [" + code + "] --> [" + newCode + "]"); + } + } + } + } return binding; } @@ -244,13 +269,17 @@ String objectCode = dataSource.getObjectCode(); + Set<String> overrideIds = dataSource.getOverrideIds(); // no need to test objectCode not null if on root object boolean needTest = objectCode != null && !objectCode.trim().isEmpty() && !compiler.getRootObject().getId().equals(objectCode + " != null"); if (needTest) { + + objectCode = replaceOverrides(compiler, overrideIds, objectCode); + buffer.append("if (").append(objectCode).append(") {").append(eol); } - String assiggment = getAssignment(compiler, dataSource.getOverrideIds()); - buffer.append(JavaFileGenerator.indent(assiggment, needTest ? 4 : 0, false, eol)); + String assignment = getAssignment(compiler, overrideIds); + buffer.append(JavaFileGenerator.indent(assignment, needTest ? 4 : 0, false, eol)); if (needTest) { buffer.append(eol).append("}"); } @@ -260,16 +289,24 @@ protected String getAssignment(JAXXCompiler compiler, Set<String> overrides) { String s = getAssignment(); + s = replaceOverrides(compiler, overrides, s); + + return s; + } + + protected String replaceOverrides(JAXXCompiler compiler, Set<String> overrides, String code) { if (overrides != null && !overrides.isEmpty()) { - String tmp = s; + String tmp = code; for (String override : overrides) { CompiledObject o = compiler.getCompiledObject(override); - tmp = tmp.replaceFirst(override + ".", o.getJavaCode() + "."); + tmp = tmp.replaceAll(override + "\\.", o.getGetterName() + "()."); +// tmp = tmp.replaceFirst(override + ".", o.getJavaCode() + "."); } - log.info("Assignment with overrides (" + s + ") = " + tmp); - s = tmp; + if (dataSource.showLog()) { + log.info("Assignment with overrides [" + code + "] to [" + tmp + "]"); + } + code = tmp; } - - return s; + return code; } } \ No newline at end of file Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataListener.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -49,13 +49,16 @@ /** * code of the add listener */ - protected final String addListenerCode; + protected String addListenerCode; /** * code of the remove listener */ - protected final String removeListenerCode; + protected String removeListenerCode; - public DataListener(String symbol, String objectCode, String addListenerCode, String removeListenerCode) { + public DataListener(String symbol, + String objectCode, + String addListenerCode, + String removeListenerCode) { this.symbol = symbol; this.objectCode = objectCode; this.addListenerCode = addListenerCode; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -277,7 +277,7 @@ break; case JavaParserTreeConstants.JJTPRIMARYEXPRESSION: type = determineExpressionType(node); - if (showLog()) { + if (log.isDebugEnabled()) { log.debug("result of determineExpressionType for " + node.getText() + " = " + type); } break; @@ -366,8 +366,10 @@ } catch (NoSuchMethodException e) { if (showLog()) { log.info("Could not find method " + methodName + ", code : " + code + " on : " + contextClass); - for (MethodDescriptor descriptor : contextClass.getMethodDescriptors()) { - log.info(" - " + Modifier.toString(descriptor.getModifiers()) + " " + descriptor.getName() + "(...) : " + descriptor.getReturnType()); + if (log.isDebugEnabled()) { + for (MethodDescriptor descriptor : contextClass.getMethodDescriptors()) { + log.debug(" - " + Modifier.toString(descriptor.getModifiers()) + " " + descriptor.getName() + "(...) : " + descriptor.getReturnType()); + } } } // happens for methods defined in the current JAXX file via scripts Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -35,7 +35,6 @@ import jaxx.compiler.java.JavaMethod; import jaxx.compiler.script.ScriptInitializer; import jaxx.compiler.types.TypeManager; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -84,28 +83,24 @@ log.debug("finalize " + id); } - if (object.isOverride()) { + boolean override = object.isOverride(); - // add a specialized getter, only if type has changed + if (override) { - if (object.getObjectClass().equals(object.getOverrideType())) { + if (object.isOverrideType()) { - // type is the same do nothing + // add a specialized getter, only if type has changed - return; - } + String methodName = object.getGetterName(); - // add a specialized getter + String body = "return (" + fqn + ") super." + methodName + "();"; - String methodName = "get" + StringUtils.capitalize(id); - - String body = "return (" + fqn + ") " + id + ";"; - - if (log.isDebugEnabled()) { - log.debug("Add specialized getter " + methodName + " : " + body); + if (log.isDebugEnabled()) { + log.debug("Add specialized getter " + methodName + " : " + body); + } + JavaMethod getter = JavaFileGenerator.newMethod(Modifier.PUBLIC, fqn, methodName, body, true); + javaFile.addMethod(getter); } - JavaMethod getter = JavaFileGenerator.newMethod(Modifier.PUBLIC, fqn, methodName, body, true); - javaFile.addMethod(getter); } else { int access = id.startsWith("$") ? Modifier.PRIVATE : Modifier.PROTECTED; @@ -113,73 +108,120 @@ JavaField field = JavaFileGenerator.newField(access, className, id, false, "this"); javaFile.addSimpleField(field); } else { - - JavaField field = JavaFileGenerator.newField(access, fqn, id, object.isOverride()); + + JavaField field = JavaFileGenerator.newField(access, fqn, id, override); javaFile.addField(field, object.isJavaBean()); } } - if (!compiler.inlineCreation(object) && !root.equals(object)) { - javaFile.addMethod(JavaFileGenerator.newMethod(Modifier.PROTECTED, "void", object.getCreationMethodName(), getCreationCode(compiler, object), object.isOverride())); + if (compiler.inlineCreation(object) || root.equals(object)) { + + // nothing more to do here + return; } -// if (!object.isOverride() && !(object instanceof ScriptInitializer)) { -// String id = object.getId(); -// int access = id.startsWith("$") ? Modifier.PRIVATE : Modifier.PROTECTED; -// if (object == root) { -// JavaField field = JavaFileGenerator.newField(access, className, id, false, "this"); -// javaFile.addSimpleField(field); -// } else { -// JavaField field = JavaFileGenerator.newField(access, JAXXCompiler.getCanonicalName(object), id, object.isOverride()); -// javaFile.addField(field, object.isJavaBean()); -// } -// } -// -// if (!compiler.inlineCreation(object) && object != root) { -// javaFile.addMethod(JavaFileGenerator.newMethod(Modifier.PROTECTED, "void", object.getCreationMethodName(), getCreationCode(compiler, object), object.isOverride())); -// } + String code = getCreationCode(compiler, object); + + // tchemit 20100519 Do not add the method only if overriden and code is null + + if (code != null) { + + JavaMethod javaMethod = JavaFileGenerator.newMethod( + Modifier.PROTECTED, + "void", + object.getCreationMethodName(), + code, + override + ); + javaFile.addMethod(javaMethod); + } } @Override public String getCreationCode(JAXXCompiler compiler, CompiledObject object) throws CompilerException { if (object instanceof ScriptInitializer) { - return object.getInitializationCode(compiler); + throw new IllegalStateException("A script initializer can not come in getCreationcode method!"); } String eol = JAXXCompiler.getLineSeparator(); + StringBuffer result = new StringBuffer(); - if (compiler.getRootObject() == object || compiler.inlineCreation(object)) { + StringBuilder init = new StringBuilder(); + + if (compiler.getRootObject().equals(object) || compiler.inlineCreation(object)) { result.append("// inline creation of ").append(object.getId()); } - if (object.isOverride() && object.getOverrideType() == object.getObjectClass()) { - //TC-20090309 on utilise le super code quand l'objet est de meme type - result.append("super.").append(object.getCreationMethodName()).append("();"); + + if (object.isJavaBean() && object.getJavaBeanInitCode() != null) { + init.append(object.getJavaBeanInitCode()); + } else if (object.getInitializer() != null) { + init.append(object.getInitializer()); + } + + boolean addToObjectMap = true; + String id = TypeManager.getJavaCode(object.getId()); + String constructorParams = object.getConstructorParams(); + + if (object.isOverride()) { + + if (init.length() == 0 && constructorParams == null) { + + // no init code is given, no need to add to objectMap + addToObjectMap = false; + } + } + + if (addToObjectMap && init.length() == 0) { + + // on special init, use constructor + String canonicalName = JAXXCompiler.getCanonicalName(object); + init.append("new ").append(canonicalName).append("("); + + if (constructorParams != null) { + init.append(constructorParams); + } + init.append(")"); + } + + String superCall = "super." + object.getCreationMethodName() + "();"; + + if (addToObjectMap) { + result.append(eol); + result.append("$objectMap.put("); + result.append(id); + result.append(", "); + result.append(object.getId()).append(" = "); + result.append(init); + result.append(");"); + result.append(eol); } else { - String init = object.getId() + " = "; - if (object.isJavaBean() && object.getJavaBeanInitCode() != null) { - init += object.getJavaBeanInitCode(); - } else if (object.getInitializer() != null) { - init += object.getInitializer(); - } else { - String canonicalName = JAXXCompiler.getCanonicalName(object); - init += "new " + canonicalName + "("; - String constructorParams = object.getConstructorParams(); - if (constructorParams != null) { - init += constructorParams; - } - init += ")"; + if (object.isOverride()) { + + // when override has no special init code, just use the super method + + result.append(superCall); + } - result.append(eol); - result.append("$objectMap.put(").append(TypeManager.getJavaCode(object.getId())).append(", ").append(init).append(");"); } - result.append(eol); + String initCode = object.getInitializationCode(compiler); if (initCode != null && initCode.length() > 0) { - result.append(initCode); + result.append(eol).append(initCode); } // add client properties addClientProperties(object, result, eol); - return result.toString(); + + String code = result.toString(); + + if (!compiler.inlineCreation(object) && + object.isOverride() && + superCall.equals(code.trim())) { + + // special case : when override but do nothing more + // method creation can be skipped + return null; + } + return code; } @Override @@ -220,8 +262,8 @@ if (object instanceof ScriptInitializer) { // initializer has special direct treatment : can not be in a method - // just push code to compiler - code.append(getCreationCode(compiler, object)); + // just push code to compiler + code.append(object.getInitializationCode(compiler)); // nothing to initialize of a script return lastWasMethodCall; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2010-05-18 18:11:11 UTC (rev 1925) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2010-05-20 05:35:13 UTC (rev 1926) @@ -822,7 +822,6 @@ object.appendInitializationCode(setPropertyCode); } compiler.getBindingHelper().registerDataBinding(object.getId() + "." + propertyName, binding, setPropertyCode); -// compiler.getBindingHelper().registerDataBinding(binding, object.getId() + "." + propertyName, setPropertyCode); } catch (UnsupportedAttributeException e) { compiler.reportError("class " + object.getObjectClass().getName() + " does not support attribute '" + propertyName + "'"); }

1 0

r1925 - trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding
by tchemit＠users.nuiton.org May 18, 2010

May 18, 2010

Author: tchemit Date: 2010-05-18 20:11:11 +0200 (Tue, 18 May 2010) New Revision: 1925 Url: http://nuiton.org/repositories/revision/jaxx/1925 Log: reformat Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java 2010-05-18 18:09:45 UTC (rev 1924) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/databinding/DemoUIModel.java 2010-05-18 18:11:11 UTC (rev 1925) @@ -25,6 +25,7 @@ package jaxx.demo.feature.databinding; import javax.swing.*; +import java.beans.PropertyChangeListener; import java.io.File; /** @@ -66,33 +67,33 @@ void firePropertyChange(String name, Object oldValue, Object newValue); /** - * Register a general {@link java.beans.PropertyChangeListener}. + * Register a general {@link PropertyChangeListener}. * * @param listener the listener to register */ - void addPropertyChangeListener(java.beans.PropertyChangeListener listener); + void addPropertyChangeListener(PropertyChangeListener listener); /** - * Register a {@link java.beans.PropertyChangeListener}. for the given {@code propertyName}. + * Register a {@link PropertyChangeListener}. for the given {@code propertyName}. * * @param property the property name to listen * @param listener the listener to register */ - void addPropertyChangeListener(String property, java.beans.PropertyChangeListener listener); + void addPropertyChangeListener(String property, PropertyChangeListener listener); /** - * Unregister a general {@link java.beans.PropertyChangeListener}. + * Unregister a general {@link PropertyChangeListener}. * * @param listener the listener to unregister */ - void removePropertyChangeListener(java.beans.PropertyChangeListener listener); + void removePropertyChangeListener(PropertyChangeListener listener); /** - * Unregister a {@link java.beans.PropertyChangeListener}. for the given {@code propertyName}. + * Unregister a {@link PropertyChangeListener}. for the given {@code propertyName}. * * @param property the property name to listen * @param listener the listener to unregister */ - void removePropertyChangeListener(String property, java.beans.PropertyChangeListener listener); + void removePropertyChangeListener(String property, PropertyChangeListener listener); }

1 0

r1924 - trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org May 18, 2010

May 18, 2010

Author: tchemit Date: 2010-05-18 20:09:45 +0200 (Tue, 18 May 2010) New Revision: 1924 Url: http://nuiton.org/repositories/revision/jaxx/1924 Log: use new api Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2010-05-18 18:09:18 UTC (rev 1923) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2010-05-18 18:09:45 UTC (rev 1924) @@ -103,7 +103,7 @@ @SuppressWarnings("unchecked") protected void assertError(JAXXEngine engine, String file, int nbCompiler) throws Exception { - JAXXCompilerFile[] compilers = engine.getCompilingFiles(); + JAXXCompilerFile[] compilers = engine.getCompiledFiles(); assertEquals(nbCompiler, compilers.length); List<String> errors = engine.getErrors(); assertTrue("should have found at least one error for " + file, errors != null && !errors.isEmpty());

1 0