March 2009 - Buix-commits - mailman.cloud.codelutin.com

r1262 - in jaxx/trunk/jaxx-runtime-validator/src: main/java/jaxx/runtime/validator/field test/java/jaxx/runtime/validator test/java/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 10 Mar '09

10 Mar '09

Author: tchemit Date: 2009-03-10 22:57:22 +0000 (Tue, 10 Mar 2009) New Revision: 1262 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java Log: improve CollectionUniqueKeyValidator Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-03-09 00:39:23 UTC (rev 1261) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-03-10 22:57:22 UTC (rev 1262) @@ -18,8 +18,8 @@ */ public class CollectionUniqueKeyValidator extends FieldExpressionValidator { + public enum Mode { - public enum Mode { /** au moins une entrée de la collection doit etre valide */ AT_LEAST_ONE, /** exactement une entrée dela collection doit être valide */ @@ -29,17 +29,36 @@ /** aucune valeur de la collection doivent etre valides */ NONE } - /** * 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; + /** + * 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 + * à exclure lors de la recherche de la violation de clef unique. + */ + protected String againstIndexExpression; public String[] getKeys() { return keys; } + public String getAgainstProperty() { + return againstProperty; + } + + public String getAgainstIndexExpression() { + return againstIndexExpression; + } + public void setKeys(String[] keys) { if (keys != null && keys.length == 1 && keys[0].indexOf(",") != -1) { this.keys = keys[0].split(","); @@ -48,6 +67,14 @@ } } + public void setAgainstProperty(String againstProperty) { + this.againstProperty = againstProperty; + } + + public void setAgainstIndexExpression(String againstIndexExpression) { + this.againstIndexExpression = againstIndexExpression; + } + @Override public void validate(Object object) throws ValidationException { @@ -59,26 +86,55 @@ Collection<?> col = getCollection(object); - if (col.size() < 2) { + Object againstBean = againstProperty == null ? null : getFieldValue(againstProperty, object); + + Integer againstIndex = (Integer) (againstIndexExpression == null ? -1 : getFieldValue(againstIndexExpression, object)); + if (againstIndex == null) { + againstIndex = -1; + } + if (againstBean == null && col.size() < 2) { // la liste ne contient pas deux entrées donc c'est valide return; } boolean answer = true; + Integer againstHashCode = againstBean == null ? null : getUniqueKeyHashCode(againstBean); + List<Integer> hashCodes = new ArrayList<Integer>(); + int index = 0; for (Object o : col) { Integer hash = getUniqueKeyHashCode(o); - if (hashCodes.contains(hash)) { - // on a deja rencontre cette clef unique, - // donc la validation a echouee - answer = false; - break; + if (againstBean == null) { + if (hashCodes.contains(hash)) { + // on a deja rencontre cette clef unique, + // donc la validation a echouee + answer = false; + break; + } + } else { + // utilisation de againstBean + if (againstIndex != -1) { + if (index != againstIndex && hash.equals(againstHashCode)) { + // on a deja rencontre cette clef unique, + // donc la validation a echouee + answer = false; + break; + } + } else { + if (!againstBean.equals(o) && hash.equals(againstHashCode)) { + // on a deja rencontre cette clef unique, + // donc la validation a echouee + answer = false; + break; + } + } } - // nouveau hashcode enregistre hashCodes.add(hash); + // index suivant + index++; } if (!answer) { @@ -137,5 +193,4 @@ public String getValidatorType() { return "collectionUniqueKey"; } - } \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java 2009-03-09 00:39:23 UTC (rev 1261) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java 2009-03-10 22:57:22 UTC (rev 1262) @@ -59,6 +59,8 @@ protected String stringValue; + protected ValidatorBeanEntry entry; + PropertyChangeSupport p; public ValidatorBean() { @@ -101,6 +103,10 @@ return notExistingDirectory; } + public ValidatorBeanEntry getEntry() { + return entry; + } + public Collection<ValidatorBeanEntry> getEntries() { return entries; } @@ -142,4 +148,11 @@ p.firePropertyChange("entries", null, entries); } + public void setEntry(ValidatorBeanEntry entry) { + this.entry = entry; + p.firePropertyChange("entry", null, entry); + } + + + } \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-03-09 00:39:23 UTC (rev 1261) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-03-10 22:57:22 UTC (rev 1262) @@ -21,6 +21,7 @@ assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + assertFieldInError("entries", "collectionUniqueKey.five.failed", false); // add a entry bean.setEntries(Arrays.asList(beanEntry)); @@ -29,7 +30,17 @@ assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + assertFieldInError("entries", "collectionUniqueKey.five.failed", false); + // add violating property + bean.setEntry(beanEntry3); + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + assertFieldInError("entries", "collectionUniqueKey.five.failed", true); + + // two entries with same key bean.setEntries(Arrays.asList(beanEntry, beanEntry));

1 0

r1261 - jaxx/trunk/jaxx-example/src/main/java/jaxx/demo
by tchemit＠users.labs.libre-entreprise.org 09 Mar '09

09 Mar '09

Author: tchemit Date: 2009-03-09 00:39:23 +0000 (Mon, 09 Mar 2009) New Revision: 1261 Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx Log: update BlockingLAyerUI example with block mode Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx =================================================================== --- jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx 2009-03-09 00:39:02 UTC (rev 1260) +++ jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx 2009-03-09 00:39:23 UTC (rev 1261) @@ -4,6 +4,7 @@ blockIcon='{SwingUtil.createImageIcon("action-block.png")}' acceptIcon='{SwingUtil.createImageIcon("action-accept.png")}' useIcon='true' + blockingColor='{new Color(50,50,50)}' acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { @@ -13,16 +14,32 @@ <script><![CDATA[ import jaxx.runtime.SwingUtil; -public void setLayer(boolean active) { +public void initLayer() { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { - jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - if ( ui != null && boxed == c) { + jaxx.runtime.swing.BlockingLayerUI ui = layerUI.clone(); + if ( boxed == c) { ui.setUseIcon(false); - } + ui.setBlock(true); + } SwingUtil.getLayer(boxed).setUI(ui); + //ui.setDirty(true); } } +public void setLayer(boolean active) { + for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { + jaxx.runtime.swing.BlockingLayerUI ui = (jaxx.runtime.swing.BlockingLayerUI)SwingUtil.getLayer(boxed).getUI(); + if ( boxed == c) { + ui.setBlock(active); + } else { + ui.setUseIcon(active); + } + //ui.setBlock(active && boxed == c); + //ui.setUseIcon(active && boxed != c); + //ui.setDirty(true); + } +} + protected void accept(ActionEvent e, String suffix) { JButton source = (JButton) e.getSource(); String clickedMessage = (String) source.getClientProperty("clickedText"); Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx =================================================================== --- jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx 2009-03-09 00:39:02 UTC (rev 1260) +++ jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/JAXXDemo.jaxx 2009-03-09 00:39:23 UTC (rev 1261) @@ -9,7 +9,8 @@ // init i18n org.codelutin.i18n.I18n.init(); -boxedDecoratorDemo.setLayer(true); +boxedDecoratorDemo.initLayer(); +//boxedDecoratorDemo.setLayer(true); ]]></script> <JSplitPane>

1 0

r1260 - in jaxx/trunk/jaxx-compiler-api: . src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 09 Mar '09

09 Mar '09

Author: tchemit Date: 2009-03-09 00:39:02 +0000 (Mon, 09 Mar 2009) New Revision: 1260 Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/DefaultCompiledObjectDecorator.java jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java Log: - must get the goal property from the event id to make possible inheritance - improve override properties create method : when same type do not re-instanciate it Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-03-09 00:35:43 UTC (rev 1259) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-03-09 00:39:02 UTC (rev 1260) @@ -1,4 +1,6 @@ 1.3 ??? 200902?? + * 20090309 [chemit] - must get the goal property from the event id to make possible inheritance + - improve override properties create method : when same type do not re-instanciate it * 20090229 [chemit] - fix bug in ClassDescriptorLoader when searching for an arrayof primitive type - add a profile mode * 20090228 [chemit] - fix bug in MethodDescriptor when no returnType defined (constructor method) in getReturnType method invocation Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/DefaultCompiledObjectDecorator.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/DefaultCompiledObjectDecorator.java 2009-03-09 00:35:43 UTC (rev 1259) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/DefaultCompiledObjectDecorator.java 2009-03-09 00:39:02 UTC (rev 1260) @@ -41,27 +41,34 @@ return object.getInitializationCode(compiler); } StringBuffer result = new StringBuffer(); - result.append(object.getId()); - result.append(" = "); - if (object.isJavaBean() && object.getJavaBeanInitCode() != null) { - result.append(object.getJavaBeanInitCode()).append(";"); + 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("();"); } else { - String constructorParams = object.getConstructorParams(); - if (constructorParams != null) { - //TC - 20081017 compiledObject can have generics - result.append(" new ").append(JAXXCompiler.getCanonicalName(object)).append("(").append(constructorParams).append(");"); - //result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + result.append(object.getId()); + result.append(" = "); + if (object.isJavaBean() && object.getJavaBeanInitCode() != null) { + result.append(object.getJavaBeanInitCode()).append(";"); } else { - //TC - 20081017 compiledObject can have generics - result.append("new ").append(JAXXCompiler.getCanonicalName(object)).append("();"); + String constructorParams = object.getConstructorParams(); + if (constructorParams != null) { + //TC - 20081017 compiledObject can have generics + result.append(" new ").append(JAXXCompiler.getCanonicalName(object)).append("(").append(constructorParams).append(");"); + //result.append("(").append(getCanonicalName(object.getObjectClass())).append(") new ").append(getCanonicalName(object.getObjectClass())).append("(").append(constructorParams).append(");"); + } else { + //TC - 20081017 compiledObject can have generics + result.append("new ").append(JAXXCompiler.getCanonicalName(object)).append("();"); + } } + result.append(JAXXCompiler.getLineSeparator()); + result.append("$objectMap.put(").append(TypeManager.getJavaCode(object.getId())).append(", ").append(object.getId()).append(");"); } result.append(JAXXCompiler.getLineSeparator()); String initCode = object.getInitializationCode(compiler); if (initCode != null && initCode.length() > 0) { result.append(initCode); } - result.append("$objectMap.put(").append(TypeManager.getJavaCode(object.getId())).append(", ").append(object.getId()).append(");"); + return result.toString(); } Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-03-09 00:35:43 UTC (rev 1259) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-03-09 00:39:02 UTC (rev 1260) @@ -628,7 +628,12 @@ if (getOptions().isOptimize()) { result = "$ev" + eventHandlerMethodNames.size(); } else { - result = "do" + org.apache.commons.lang.StringUtils.capitalize(handler.getListenerMethod().getName()) + "__on__" + handler.getObjectCode(); + //TC-20090309 must get the goal property from the event id + // to make possible inheritance + String id = handler.getEventId().substring(0,handler.getEventId().indexOf(".")); + + result = "do" + org.apache.commons.lang.StringUtils.capitalize(handler.getListenerMethod().getName()) + "__on__" + id; + //result = "do" + org.apache.commons.lang.StringUtils.capitalize(handler.getListenerMethod().getName()) + "__on__" + handler.getObjectCode(); } eventHandlerMethodNames.put(handler, result); }

1 0

r1259 - in jaxx/trunk/jaxx-runtime-swing: . src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org 09 Mar '09

09 Mar '09

Author: tchemit Date: 2009-03-09 00:35:43 +0000 (Mon, 09 Mar 2009) New Revision: 1259 Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java Log: in BlockingLayerUI, add a new state 'block' to enable/disable blocking mode with a blockingColor Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-04 23:12:53 UTC (rev 1258) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-09 00:35:43 UTC (rev 1259) @@ -1,4 +1,5 @@ 1.3 ?? 200903?? + * 20090309 [chemit] - in BlockingLayerUI, add a new state 'block' to enable/disable blocking mode with a blockingColor * 20090303 [chemit] - in BlockingLayerUI, add a new state 'useIcon' to enable/disable use of the action icon - add a simple WizardModel * 20090301 [chemit] - add usefull methods in JAXXButtonGroup Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2009-03-04 23:12:53 UTC (rev 1258) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2009-03-09 00:35:43 UTC (rev 1259) @@ -1,8 +1,12 @@ package jaxx.runtime.swing; +import java.awt.AlphaComposite; +import java.awt.Color; import java.awt.Component; import java.awt.Graphics2D; +import java.awt.Insets; import java.awt.Point; +import java.awt.Rectangle; import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -34,6 +38,7 @@ 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 @@ -48,6 +53,10 @@ */ protected BufferedImage acceptIcon; /** + * Optinal color to put fill background when blocking + */ + protected Color blockingColor; + /** * Internal state to known when we can accept click */ protected boolean canClick; @@ -60,6 +69,10 @@ * By default, this is active. */ protected boolean useIcon = true; + /** + * Internal state when should block event and paint layer + */ + protected boolean block; public void setAcceptAction(Action acceptAction) { this.acceptAction = acceptAction; @@ -86,6 +99,28 @@ } } + public void setBlock(boolean block) { + boolean oldvalue = this.block; + this.block = block; + firePropertyChange(BLOCK_PROPERTY, oldvalue, block); + if (oldvalue != block) { + setDirty(true); + } + } + + @Override + public void setDirty(boolean isDirty) { + super.setDirty(isDirty); + } + + public void setBlockIcon(BufferedImage blockIcon) { + this.blockIcon = blockIcon; + } + + public void setBlockingColor(Color blockingColor) { + this.blockingColor = blockingColor; + } + public BufferedImage getBlockIcon() { return blockIcon; } @@ -99,7 +134,11 @@ } public void setUseIcon(boolean useIcon) { + boolean oldvalue = this.useIcon; this.useIcon = useIcon; + if (oldvalue != useIcon) { + setDirty(true); + } } @Override @@ -109,13 +148,17 @@ clone.acceptIcon = acceptIcon; clone.blockIcon = blockIcon; clone.useIcon = useIcon; + clone.block = block; + clone.blockingColor = blockingColor; clone.setCanClick(false); return clone; } @Override protected void processKeyEvent(KeyEvent e, JXLayer<JComponent> l) { - e.consume(); + if (useIcon || block) { + e.consume(); + } } @Override @@ -123,7 +166,9 @@ if (useIcon) { updateCanClickState(l, e); } - e.consume(); + if (useIcon || block) { + e.consume(); + } } @Override @@ -143,12 +188,32 @@ break; } } - e.consume(); + if (useIcon || block) { + e.consume(); + } + } @Override protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { super.paintLayer(g2, l); + if (block && blockingColor != null) { + // to be in sync with the view if the layer has a border + /*Insets layerInsets = l.getInsets(); + g2.translate(layerInsets.left, layerInsets.top); + + JComponent view = l.getView(); + // To prevent painting on view's border + Insets insets = view.getInsets(); + g2.clip(new Rectangle(insets.left, insets.top, + view.getWidth() - insets.left - insets.right, + view.getHeight() - insets.top - insets.bottom)); + */ + + g2.setColor(blockingColor); + g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, .1f)); + g2.fillRect(0, 0, l.getWidth(), l.getHeight()); + } if (useIcon && getCurrentIcon() != null) { g2.drawImage(getCurrentIcon(), l.getWidth() - getCurrentIcon().getWidth() - 1, 0, null); }

1 0

r1258 - jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: tchemit Date: 2009-03-04 23:12:53 +0000 (Wed, 04 Mar 2009) New Revision: 1258 Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java Log: methode setSteps rendue publique Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java 2009-03-03 19:33:22 UTC (rev 1257) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java 2009-03-04 23:12:53 UTC (rev 1258) @@ -119,6 +119,21 @@ return steps; } + /** + * Change l'univers des etapes. + * + * Note: on presume ici que l'étape courante est toujours la meme. + * + * @param steps le nouvel univers des etapes + */ + public void setSteps(E... steps) { + List<E> oldValue = this.steps; + this.steps = java.util.Collections.unmodifiableList(java.util.Arrays.asList(steps)); + firePropertyChange(STEPS_PROPERTY_NAME, oldValue, this.steps); + // la propriete nextStep peut avoir changee + firePropertyChange(NEXT_STEP_PROPERTY_NAME, null, getNextStep()); + } + public boolean validate(E s) { return step != null; } @@ -159,21 +174,6 @@ validate(); } - /** - * Change l'univers des etapes. - * - * Note: on presume ici que l'étape courante est toujours la meme. - * - * @param steps le nouvel univers des etapes - */ - protected void setSteps(E... steps) { - List<E> oldValue = this.steps; - this.steps = java.util.Collections.unmodifiableList(java.util.Arrays.asList(steps)); - firePropertyChange(STEPS_PROPERTY_NAME, oldValue, this.steps); - // la propriete nextStep peut avoir changee - firePropertyChange(NEXT_STEP_PROPERTY_NAME, null, getNextStep()); - } - protected void validate() { if (step == null) { // pas de validation quand aucune etape n'est sélectionnée

1 0

r1257 - jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: tchemit Date: 2009-03-03 19:33:22 +0000 (Tue, 03 Mar 2009) New Revision: 1257 Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java Log: add a simple wizrd model Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java 2009-03-03 19:33:04 UTC (rev 1256) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java 2009-03-03 19:33:22 UTC (rev 1257) @@ -10,6 +10,7 @@ * @param <E> le type de l'énumération contenant les etapes. * * @author tony + * @since 1.3 */ public class WizardModel<E extends Enum<E>> {

1 0

r1256 - in jaxx/trunk/jaxx-runtime-swing: . src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: tchemit Date: 2009-03-03 19:33:04 +0000 (Tue, 03 Mar 2009) New Revision: 1256 Added: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt Log: add a simple wizrd model Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-03 16:38:42 UTC (rev 1255) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-03 19:33:04 UTC (rev 1256) @@ -1,5 +1,6 @@ 1.3 ?? 200903?? * 20090303 [chemit] - in BlockingLayerUI, add a new state 'useIcon' to enable/disable use of the action icon + - add a simple WizardModel * 20090301 [chemit] - add usefull methods in JAXXButtonGroup 1.2 letellier 2009022? Added: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java (rev 0) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/WizardModel.java 2009-03-03 19:33:04 UTC (rev 1256) @@ -0,0 +1,190 @@ +package jaxx.runtime.swing; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.List; + +/** + * Un modèle de wizard. + * + * @param <E> le type de l'énumération contenant les etapes. + * + * @author tony + */ +public class WizardModel<E extends Enum<E>> { + + public static final String STEPS_PROPERTY_NAME = "steps"; + public static final String STEP_PROPERTY_NAME = "step"; + public static final String PREVIOUS_STEP_PROPERTY_NAME = "previousStep"; + public static final String NEXT_STEP_PROPERTY_NAME = "nextStep"; + public static final String VALID_STEP_PROPERTY_NAME = "validStep"; + /** + * le type d'une etape du model (doit etre une enumeration) + */ + protected final Class<E> stepClass; + /** + * Toutes les étapes à passer + */ + protected List<E> steps; + /** + * L'étape courante + */ + protected E step; + /** + * drapeau pour valider l'état de l'étape courante + */ + protected boolean validStep; + /** + * pour propager les changements dans le modèle vers l'ui + */ + protected PropertyChangeSupport pcs; + + public WizardModel(Class<E> stepClass, E... steps) { + this.stepClass = stepClass; + this.pcs = new PropertyChangeSupport(this); + this.steps = new java.util.ArrayList<E>(); + if (steps.length > 0) { + setSteps(steps); + } + } + + public void start() { + if (steps.isEmpty()) { + throw new IllegalStateException("can not start, no step found"); + } + step = null; + E startStep = steps.get(0); + setStep(startStep); + } + + public void gotoNextStep() { + E nextStep = getNextStep(); + if (nextStep == null) { + throw new IllegalStateException("no next step to go"); + } + setStep(nextStep); + } + + public void gotoPreviousStep() { + E previousStep = getPreviousStep(); + if (previousStep == null) { + throw new IllegalStateException("no previous step to go"); + } + setStep(previousStep); + } + + public void gotoStep(E e) { + if (e == null) { + throw new NullPointerException("step can not be null"); + } + if (!steps.contains(e)) { + throw new IllegalStateException("step " + e + " is not in universe of steps (" + steps + ")"); + } + setStep(e); + } + + public E getStep() { + return step; + } + + public int getStepIndex(E s) { + int index = steps.indexOf(s); + return index; + } + + public boolean isValidStep() { + return validStep; + } + + public E getPreviousStep() { + int index = getStepIndex(step); + if (index < 1) { + // si pas de step ou sur premier step + return null; + } + return steps.get(index - 1); + } + + public E getNextStep() { + int index = getStepIndex(step); + if (index == -1 || index == steps.size() - 1) { + // si pas de step positionne ou dernier etape + return null; + } + return steps.get(index + 1); + } + + public List<E> getSteps() { + return steps; + } + + public boolean validate(E s) { + return step != null; + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListeners() { + for (PropertyChangeListener l : pcs.getPropertyChangeListeners()) { + pcs.removePropertyChangeListener(l); + } + } + protected Class<E> getStepClass() { + return stepClass; + } + + protected void setStep(E step) { + E oldValue = this.step; + this.step = step; + firePropertyChange(STEP_PROPERTY_NAME, oldValue, step); + // la propriete nextStep peut avoir changee + firePropertyChange(NEXT_STEP_PROPERTY_NAME, null, getNextStep()); + // la propriete previousStep peut avoir changee + firePropertyChange(PREVIOUS_STEP_PROPERTY_NAME, null, getPreviousStep()); + validate(); + } + + /** + * Change l'univers des etapes. + * + * Note: on presume ici que l'étape courante est toujours la meme. + * + * @param steps le nouvel univers des etapes + */ + protected void setSteps(E... steps) { + List<E> oldValue = this.steps; + this.steps = java.util.Collections.unmodifiableList(java.util.Arrays.asList(steps)); + firePropertyChange(STEPS_PROPERTY_NAME, oldValue, this.steps); + // la propriete nextStep peut avoir changee + firePropertyChange(NEXT_STEP_PROPERTY_NAME, null, getNextStep()); + } + + protected void validate() { + if (step == null) { + // pas de validation quand aucune etape n'est sélectionnée + return; + } + boolean validate = validate(step); + this.validStep = validate; + // toujours forcer la propagation + firePropertyChange(VALID_STEP_PROPERTY_NAME, null, validStep); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } +}

1 0

r1255 - jaxx/trunk/jaxx-example/src/main/java/jaxx/demo
by tchemit＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: tchemit Date: 2009-03-03 16:38:42 +0000 (Tue, 03 Mar 2009) New Revision: 1255 Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx Log: in BlockingLayerUI, add a new state 'useIcon' to enable/disable use of the action icon Modified: jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx =================================================================== --- jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx 2009-03-03 16:38:17 UTC (rev 1254) +++ jaxx/trunk/jaxx-example/src/main/java/jaxx/demo/BoxedDecoratorDemo.jaxx 2009-03-03 16:38:42 UTC (rev 1255) @@ -3,6 +3,7 @@ <jaxx.runtime.swing.BlockingLayerUI id='layerUI' blockIcon='{SwingUtil.createImageIcon("action-block.png")}' acceptIcon='{SwingUtil.createImageIcon("action-accept.png")}' + useIcon='true' acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; @Override public void actionPerformed(ActionEvent e) { @@ -15,6 +16,9 @@ public void setLayer(boolean active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; + if ( ui != null && boxed == c) { + ui.setUseIcon(false); + } SwingUtil.getLayer(boxed).setUI(ui); } } @@ -41,7 +45,7 @@ onActionPerformed='accept(event, "from button (no layer)")'/> <JButton text='button B' decorator='boxed' _clickedText='"button B was clicked"' onActionPerformed='accept(event, "from button (no layer)")'/> - <JButton text='button C' decorator='boxed' _clickedText='"button C was clicked"' + <JButton id='c' text='button C (full block)' decorator='boxed' _clickedText='"button C was clicked"' onActionPerformed='accept(event, "from button (no layer)");'/> </JPanel> </cell>

1 0

r1254 - in jaxx/trunk/jaxx-runtime-swing: . src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: tchemit Date: 2009-03-03 16:38:17 +0000 (Tue, 03 Mar 2009) New Revision: 1254 Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java Log: in BlockingLayerUI, add a new state 'useIcon' to enable/disable use of the action icon Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-03 07:50:33 UTC (rev 1253) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-03-03 16:38:17 UTC (rev 1254) @@ -1,4 +1,5 @@ 1.3 ?? 200903?? + * 20090303 [chemit] - in BlockingLayerUI, add a new state 'useIcon' to enable/disable use of the action icon * 20090301 [chemit] - add usefull methods in JAXXButtonGroup 1.2 letellier 2009022? Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2009-03-03 07:50:33 UTC (rev 1253) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2009-03-03 16:38:17 UTC (rev 1254) @@ -51,6 +51,15 @@ * 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 + * will be possible. + * + * By default, this is active. + */ + protected boolean useIcon = true; public void setAcceptAction(Action acceptAction) { this.acceptAction = acceptAction; @@ -89,12 +98,17 @@ return canClick; } + public void setUseIcon(boolean useIcon) { + this.useIcon = useIcon; + } + @Override public BlockingLayerUI clone() { BlockingLayerUI clone = new BlockingLayerUI(); clone.acceptAction = acceptAction; clone.acceptIcon = acceptIcon; clone.blockIcon = blockIcon; + clone.useIcon = useIcon; clone.setCanClick(false); return clone; } @@ -106,25 +120,28 @@ @Override protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { - updateCanClickState(l, e); + if (useIcon) { + updateCanClickState(l, e); + } e.consume(); } @Override protected void processMouseEvent(MouseEvent e, JXLayer<JComponent> l) { - - switch (e.getID()) { - case MouseEvent.MOUSE_ENTERED: - updateCanClickState(l, e); - break; - case MouseEvent.MOUSE_EXITED: - setCanClick(false); - break; - case MouseEvent.MOUSE_CLICKED: - if (canClick) { - acceptEvent(e, l); - } - break; + if (useIcon) { + switch (e.getID()) { + case MouseEvent.MOUSE_ENTERED: + updateCanClickState(l, e); + break; + case MouseEvent.MOUSE_EXITED: + setCanClick(false); + break; + case MouseEvent.MOUSE_CLICKED: + if (canClick) { + acceptEvent(e, l); + } + break; + } } e.consume(); } @@ -132,7 +149,7 @@ @Override protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { super.paintLayer(g2, l); - if (getCurrentIcon() != null) { + if (useIcon && getCurrentIcon() != null) { g2.drawImage(getCurrentIcon(), l.getWidth() - getCurrentIcon().getWidth() - 1, 0, null); } }

1 0

r1253 - in jaxx/trunk/jaxx-runtime-api: . src/main/java/jaxx/runtime
by tchemit＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: tchemit Date: 2009-03-03 07:50:33 +0000 (Tue, 03 Mar 2009) New Revision: 1253 Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultApplicationContext.java jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java Log: add pcs in ApplicationContext add method in Util to filter JAXX property changed listeners Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-03-01 20:36:23 UTC (rev 1252) +++ jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-03-03 07:50:33 UTC (rev 1253) @@ -1,4 +1,8 @@ -1.2 ??? 2009???? +1.3 ??? 200903?? + * 20090302 [chemit] - add pcs in ApplicationContext + - add method in Util to filter JAXX property changed listeners + +1.2 letellier 2009022? * 2009021 [chemit] - introduce DefaultApplicationContext iwth annotation system. 1.1 chemit 20090220 Modified: jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultApplicationContext.java =================================================================== --- jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultApplicationContext.java 2009-03-01 20:36:23 UTC (rev 1252) +++ jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/DefaultApplicationContext.java 2009-03-03 07:50:33 UTC (rev 1253) @@ -1,5 +1,7 @@ package jaxx.runtime; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.lang.annotation.*; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -81,6 +83,7 @@ public DefaultApplicationContext() { super(); forwards = new HashMap<Class, Class>(); + pcs = new PropertyChangeSupport(this); } public DefaultApplicationContext(JAXXObject ui) { @@ -89,6 +92,9 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(DefaultApplicationContext.class); + /** to manage properties modifications */ + protected PropertyChangeSupport pcs; + @SuppressWarnings({"unchecked"}) @Override public <T> T getContextValue(Class<T> clazz, String name) { @@ -178,6 +184,34 @@ super.removeContextValue(klazz, name); } + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + public synchronized boolean hasListeners(String propertyName) { + return pcs.hasListeners(propertyName); + } + + public synchronized PropertyChangeListener[] getPropertyChangeListeners(String propertyName) { + return pcs.getPropertyChangeListeners(propertyName); + } + + public synchronized PropertyChangeListener[] getPropertyChangeListeners() { + return pcs.getPropertyChangeListeners(); + } + protected Object newInstance(Class<?> clazz) throws IllegalArgumentException { Object value = null; @@ -240,4 +274,8 @@ throw new IllegalArgumentException(ex); } } + + protected void firePropertyChange(String name, Object oldValue, Object newValue) { + pcs.firePropertyChange(name, oldValue, newValue); + } } Modified: jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java =================================================================== --- jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-03-01 20:36:23 UTC (rev 1252) +++ jaxx/trunk/jaxx-runtime-api/src/main/java/jaxx/runtime/Util.java 2009-03-03 07:50:33 UTC (rev 1253) @@ -12,6 +12,8 @@ import javax.swing.UIManager; import java.awt.Component; import java.awt.Dimension; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeListenerProxy; import java.io.IOException; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationHandler; @@ -409,6 +411,45 @@ return createIcon(iconPath + "i18n/" + name + ".png"); } + /** + * detects all PropertychangedListener added by Jaxx uis + * (should be a {@link DataBindingListener} + * + * @param propertyNames the array of property names to find + * @param listeners the array of listeners to filter + * @return the filtered listeners + */ + public static PropertyChangeListener[] findJaxxPropertyChangeListener(String[] propertyNames, PropertyChangeListener... listeners) { + if (listeners == null || listeners.length == 0) { + return new PropertyChangeListener[0]; + } + List<String> pNames = Arrays.asList(propertyNames); + + List<PropertyChangeListener> toRemove = new ArrayList<PropertyChangeListener>(); + + for (PropertyChangeListener listener : listeners) { + String pName = null; + PropertyChangeListenerProxy plistener = null; + if (listener instanceof PropertyChangeListenerProxy) { + plistener = (PropertyChangeListenerProxy) listener; + if (!pNames.contains(plistener.getPropertyName())) { + // not on the good property + continue; + } + listener = (PropertyChangeListener) plistener.getListener(); + pName = plistener.getPropertyName(); + } + if (plistener != null && pName != null && listener instanceof DataBindingListener) { + if (log.isDebugEnabled()) { + log.debug("find config listener to remove [" + pName + "] : " + listener); + } + toRemove.add(plistener); + //toRemove.add(listener); + } + } + return toRemove.toArray(new PropertyChangeListener[toRemove.size()]); + } + private static String getIconPath() { String iconPath = UIManager.getString(DEFAULT_ICON_PATH_PROPERTY); if (iconPath == null) {

1 0