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

r2217 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/spi
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:14:13 +0100 (Wed, 16 Feb 2011) New Revision: 2217 Url: http://nuiton.org/repositories/revision/jaxx/2217 Log: Evolution #1343: Introduce a JXLayerHandler to deal with new api of JXLayer Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java 2011-02-16 21:13:07 UTC (rev 2216) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/spi/DefaultInitializer.java 2011-02-16 21:14:13 UTC (rev 2217) @@ -61,6 +61,7 @@ import jaxx.compiler.tags.swing.JToolBarHandler; import jaxx.compiler.tags.swing.JTreeHandler; import jaxx.compiler.tags.swing.JWindowHandler; +import jaxx.compiler.tags.swing.JXLayerHandler; import jaxx.compiler.tags.swing.RowHandler; import jaxx.compiler.tags.swing.TabHandler; import jaxx.compiler.tags.swing.TableHandler; @@ -77,6 +78,7 @@ import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.LocaleEditor; import jaxx.runtime.validator.swing.SwingValidator; +import org.jdesktop.jxlayer.JXLayer; import javax.swing.JCheckBox; import javax.swing.JCheckBoxMenuItem; @@ -186,6 +188,9 @@ registerBean(JFrame.class, JWindowHandler.class); registerBean(JWindow.class, JWindowHandler.class); + // JXLayer + registerBean(JXLayer.class, JXLayerHandler.class); + registerBean(Application.class, ApplicationHandler.class); registerBean(JInternalFrame.class, JInternalFrameHandler.class);

1 0

r2216 - trunk/jaxx-compiler/src/main/java/jaxx/compiler
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:13:07 +0100 (Wed, 16 Feb 2011) New Revision: 2216 Url: http://nuiton.org/repositories/revision/jaxx/2216 Log: add convinient method to know if a compiler contains a script field Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-16 21:11:00 UTC (rev 2215) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXCompiler.java 2011-02-16 21:13:07 UTC (rev 2216) @@ -1933,4 +1933,14 @@ public void setNeedSwingUtil(boolean needSwingUtil) { this.needSwingUtil = needSwingUtil; } + + public boolean containsScriptField(String fieldName) { + FieldDescriptor[] scriptFields = getScriptFields(); + for (FieldDescriptor f : scriptFields) { + if (fieldName.equals(f.getName())) { + return true; + } + } + return false; + } }

1 0

r2215 - trunk/jaxx-compiler/src/main/java/jaxx/compiler
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:11:00 +0100 (Wed, 16 Feb 2011) New Revision: 2215 Url: http://nuiton.org/repositories/revision/jaxx/2215 Log: open api to make possible to change ChildRef creation Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-16 21:09:42 UTC (rev 2214) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompiledObject.java 2011-02-16 21:11:00 UTC (rev 2215) @@ -151,6 +151,15 @@ this.delegateCode = delegateCode; } + + public String getConstraints() { + return constraints; + } + + public String getDelegateCode() { + return delegateCode; + } + public CompiledObject getChild() { return child; } @@ -684,15 +693,19 @@ child.setParent(this); - ChildRef ref = new ChildRef(child, - constraints, - child.getJavaCode(), - delegateCode - ); + ChildRef ref = newChildRef(child, constraints, delegateCode); childs.add(ref); } } + protected ChildRef newChildRef(CompiledObject child, String constraints, String delegateCode) { + return new ChildRef(child, + constraints, + child.getJavaCode(), + delegateCode + ); + } + @Override public String toString() { return getObjectClass().getName() + "[id='" + id + "']";

1 0

r2214 - trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:09:42 +0100 (Wed, 16 Feb 2011) New Revision: 2214 Url: http://nuiton.org/repositories/revision/jaxx/2214 Log: Evolution #1339: Updates to JXLayer 3.0.4 Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2011-02-16 21:01:10 UTC (rev 2213) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2011-02-16 21:09:42 UTC (rev 2214) @@ -350,7 +350,8 @@ Constructor<? extends AbstractBeanValidatorUI> cons = uiClass.getConstructor(String.class); AbstractBeanValidatorUI ui = cons.newInstance(fieldname); - ui.setEnabled(true); + +// ui.setEnabled(true); addBeanValidatorListener(ui); jx.setUI(ui); }

1 0

r2213 - trunk/jaxx-demo/src/license
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:01:10 +0100 (Wed, 16 Feb 2011) New Revision: 2213 Url: http://nuiton.org/repositories/revision/jaxx/2213 Log: update third-parties Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-02-16 21:00:01 UTC (rev 2212) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-02-16 21:01:10 UTC (rev 2213) @@ -3,17 +3,18 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - GNU Lesser General Public License # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 26 15:09:36 CET 2011 +#Wed Feb 16 19:45:34 WET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.help--javahelp--2.0.02--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -org.nuiton.thirdparty--rsyntaxtextarea--1.4.1--jar=Lesser General Public License (LGPL) v 3.0 javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) -ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1 \ No newline at end of file +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1

1 0

r2212 - trunk
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 22:00:01 +0100 (Wed, 16 Feb 2011) New Revision: 2212 Url: http://nuiton.org/repositories/revision/jaxx/2212 Log: Evolution #1265: Updates to mavenpom 2.5.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-16 20:58:45 UTC (rev 2211) +++ trunk/pom.xml 2011-02-16 21:00:01 UTC (rev 2212) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.5.1</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2211 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 21:58:45 +0100 (Wed, 16 Feb 2011) New Revision: 2211 Url: http://nuiton.org/repositories/revision/jaxx/2211 Log: reformat code Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2011-02-16 20:57:24 UTC (rev 2210) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2011-02-16 20:58:45 UTC (rev 2211) @@ -65,7 +65,7 @@ void $afterCompleteSetup() { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { if (boxed == buttonD) { - SwingUtil.getLayer(boxed).setUI(layerUI2); + SwingUtil.setLayerUI(boxed, layerUI2); continue; } @@ -73,7 +73,7 @@ if (boxed == buttonC) { ui.setBlock(true); } - SwingUtil.getLayer(boxed).setUI(ui); + SwingUtil.setLayerUI(boxed, ui); } } @@ -82,7 +82,7 @@ if (boxed == buttonD) { continue; } - BlockingLayerUI ui = (BlockingLayerUI)SwingUtil.getLayer(boxed).getUI(); + BlockingLayerUI ui = (BlockingLayerUI) SwingUtil.getLayer(boxed).getUI(); if (boxed == buttonC) { ui.setBlock(active); }

1 0

r2210 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags/swing jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/swing jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 21:57:24 +0100 (Wed, 16 Feb 2011) New Revision: 2210 Url: http://nuiton.org/repositories/revision/jaxx/2210 Log: Evolution #1339: Updates to JXLayer 3.0.4 Evolution #1343: Introduce a JXLayerHandler to deal with new api of JXLayer Added: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java Added: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java (rev 0) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -0,0 +1,87 @@ +package jaxx.compiler.tags.swing; + +import jaxx.compiler.CompiledObject; +import jaxx.compiler.CompilerException; +import jaxx.compiler.JAXXCompiler; +import jaxx.compiler.reflect.ClassDescriptor; +import jaxx.compiler.reflect.ClassDescriptorHelper; +import jaxx.compiler.tags.DefaultComponentHandler; +import org.apache.commons.collections.CollectionUtils; +import org.jdesktop.jxlayer.JXLayer; + +import java.awt.Component; + +/** + * To deal with JXLayer, since from version 3.0.4, we can not use any longer + * the {@link JXLayer#add(Component)} ! but must now use the + * method {@link JXLayer#setView(Component)}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class JXLayerHandler extends DefaultComponentHandler { + + public static final String ATTRIBUTE_ORIENTATION = "orientation"; + + public static final String ORIENTATION_VALUE_HORIZONTAL = "horizontal"; + + public static final String ORIENTATION_VALUE_VERTICAL = "vertical"; + + public static final String ORIENTATION_VALUE_VERTICAL_SPLIT = "vertical_split"; + + public static final String ORIENTATION_VALUE_HORIZONTAL_SPLIT = "horizontal_split"; + + public JXLayerHandler(ClassDescriptor beanClass) { + super(beanClass); + ClassDescriptorHelper.checkSupportClass(getClass(), beanClass, JXLayer.class); + } + + @Override + public CompiledObject createCompiledObject(String id, JAXXCompiler compiler) throws CompilerException { + return new CompiledObject(id, getBeanClass(), compiler) { + + @Override + public void addChild(CompiledObject child, + String constraints, + JAXXCompiler compiler) throws CompilerException { + + if (constraints != null) { + compiler.reportError("JXLayer does not accept constraints"); + return; + } + if (CollectionUtils.isNotEmpty(getChilds())) { + + // already one child, authrozied only one child... + compiler.reportError("JXLayer is limited to one children"); + return; + } + super.addChild(child, constraints, compiler); + + } + + @Override + protected ChildRef newChildRef(CompiledObject child, String constraints, String delegateCode) { + return new ChildRef(child, + constraints, + child.getJavaCode(), + delegateCode) { + @Override + public void addToAdditionCode(StringBuffer buffer, boolean isRootObject) { + //TC-20091026 do not prefix if on root object + String prefix; + if (isRootObject) { + prefix = ""; + } else { + prefix = getJavaCode() + getDelegateCode() + "."; + } + buffer.append(prefix); + buffer.append("setView("); + buffer.append(getChildJavaCode()); + buffer.append(");"); + buffer.append(JAXXCompiler.getLineSeparator()); + } + }; + } + }; + } +} \ No newline at end of file Property changes on: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.jxlayer.plaf.LayerUI; import org.jdesktop.swingx.JXTreeTable; import javax.swing.DefaultComboBoxModel; @@ -399,13 +400,13 @@ * @param component the component to box * @return the {@link JXLayer} boxing the component */ - public static JXLayer<?> boxComponentWithJxLayer(JComponent component) { - JXLayer<?> layer = getLayer(component); + public static <V extends JComponent> JXLayer<V> boxComponentWithJxLayer(V component) { + JXLayer<V> layer = getLayer(component); if (layer != null) { return layer; } - layer = new JXLayer<JComponent>(); - layer.add(component); + layer = new JXLayer<V>(); + layer.setView(component); return layer; } @@ -426,14 +427,18 @@ return result; } - @SuppressWarnings("unchecked") - public static JXLayer<JComponent> getLayer(JComponent comp) { + public static <V extends JComponent> JXLayer<V> getLayer(V comp) { if (!isLayered(comp)) { return null; } - return (JXLayer<JComponent>) comp.getParent(); + return (JXLayer<V>) comp.getParent(); } + public static void setLayerUI(JComponent comp, LayerUI<JComponent> ui) { + JXLayer<JComponent> layer = getLayer(comp); + layer.setUI(ui); + } + public static boolean isLayered(JComponent comp) { Container parent = comp.getParent(); return parent != null && parent instanceof JXLayer<?>; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -186,7 +186,7 @@ } @Override - protected void processKeyEvent(KeyEvent e, JXLayer<JComponent> l) { + protected void processKeyEvent(KeyEvent e, JXLayer<? extends JComponent> l) { if (useIcon) { e.consume(); return; @@ -208,7 +208,7 @@ } @Override - protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { if (useIcon) { updateCanClickState(l, e); e.consume(); @@ -230,7 +230,7 @@ } @Override - protected void processMouseEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseEvent(MouseEvent e, JXLayer<? extends JComponent> l) { if (useIcon) { switch (e.getID()) { case MouseEvent.MOUSE_ENTERED: @@ -279,7 +279,7 @@ } @Override - protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { + protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { super.paintLayer(g2, l); if (block && blockingColor != null) { // to be in sync with the view if the layer has a border @@ -303,7 +303,7 @@ } } - protected void acceptEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void acceptEvent(MouseEvent e, JXLayer<? extends JComponent> l) { if (acceptAction != null) { acceptAction.putValue("layer", l); Component source = l.getView(); @@ -325,7 +325,7 @@ return icon; } - protected void updateCanClickState(JXLayer<JComponent> l, MouseEvent e) { + protected void updateCanClickState(JXLayer<? extends JComponent> l, MouseEvent e) { // udpate toolTipText Point layerLocation = l.getView().getLocation(); Point mousePoint = e.getPoint(); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/BlockingLayerUI2.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -144,17 +144,17 @@ } @Override - protected void processKeyEvent(KeyEvent e, JXLayer<JComponent> l) { + protected void processKeyEvent(KeyEvent e, JXLayer<? extends JComponent> l) { e.consume(); } @Override - protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { e.consume(); } @Override - protected void processMouseEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseEvent(MouseEvent e, JXLayer<? extends JComponent> l) { switch (e.getID()) { case MouseEvent.MOUSE_ENTERED: setCanClick(true); @@ -172,7 +172,7 @@ } @Override - protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { + protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { super.paintLayer(g2, l); if (blockingColor != null) { // to be in sync with the view if the layer has a border @@ -196,7 +196,7 @@ } } - protected void acceptEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void acceptEvent(MouseEvent e, JXLayer<? extends JComponent> l) { if (acceptAction != null) { acceptAction.putValue("layer", l); Component source = l.getView(); Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -43,6 +43,8 @@ /** Logger */ private static final Log log = LogFactory.getLog(AbstractBeanValidatorUI.class); + private static final long serialVersionUID = 1L; + /** * Actual scope to display in the layer. * <p/> Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -45,6 +45,8 @@ */ public class IconValidationUI extends AbstractBeanValidatorUI { + private static final long serialVersionUID = 1L; + // The icon to be shown at the layer's corner protected EnumMap<NuitonValidatorScope, BufferedImage> icons; @@ -73,7 +75,7 @@ } @Override - protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { + protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { super.paintLayer(g2, l); // There is no need to take insets into account for this painter NuitonValidatorScope scope = getScope(); Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -45,6 +45,8 @@ */ public class ImageValidationUI extends AbstractBeanValidatorUI { + private static final long serialVersionUID = 1L; + protected EnumMap<NuitonValidatorScope, BufferedImage> icons; public ImageValidationUI(String field) { @@ -81,7 +83,7 @@ } @Override - protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { + protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { super.paintLayer(g2, l); NuitonValidatorScope scope = getScope(); if (scope != null) { Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2011-02-16 20:55:44 UTC (rev 2209) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2011-02-16 20:57:24 UTC (rev 2210) @@ -44,12 +44,14 @@ */ public class TranslucentValidationUI extends AbstractBeanValidatorUI { + private static final long serialVersionUID = 1L; + public TranslucentValidationUI(String field) { super(field); } @Override - protected void paintLayer(Graphics2D g2, JXLayer<JComponent> l) { + protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { // paints the layer as is super.paintLayer(g2, l);

1 0

r2209 - in trunk: . jaxx-compiler jaxx-demo maven-jaxx-plugin
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 21:55:44 +0100 (Wed, 16 Feb 2011) New Revision: 2209 Url: http://nuiton.org/repositories/revision/jaxx/2209 Log: Evolution #1322: Updates to i18n 2.3.1 Evolution #1339: Updates to JXLayer 3.0.4 Evolution #1340: Updates to rsyntaxtextarea R239 a.k.a version 1.4.2 Evolution #1341: Updates to javaHelp 2.0.05 Evolution #1342: Updates to plexus-velocity 1.1.8 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/jaxx-compiler/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -109,7 +109,6 @@    - <packaging>jar</packaging> <build> @@ -148,13 +147,13 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> + <version>${plexusPluginVersion}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> + <version>${coberturaPluginVersion}</version> </plugin> </plugins> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/jaxx-demo/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -118,10 +118,15 @@ </dependency> <dependency> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> </dependency> +  + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/maven-jaxx-plugin/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -214,7 +214,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-16 10:41:47 UTC (rev 2208) +++ trunk/pom.xml 2011-02-16 20:55:44 UTC (rev 2209) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -83,6 +83,37 @@ </roles> </developer> </developers> + + + <name>JAXX</name> + <description>JAXX Project</description> + <inceptionYear>2008</inceptionYear> + <url>http://maven-site.nuiton.org/jaxx</url> + + <packaging>pom</packaging> + + <properties> + +  + <projectId>jaxx</projectId> + + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonI18nVersion>2.3.1</nuitonI18nVersion> + <eugeneVersion>2.3.2</eugeneVersion> + <xworkVersion>2.2.1.1</xworkVersion> + <jxLayerVersion>3.0.4</jxLayerVersion> + <javaHelpVersion>2.0.05</javaHelpVersion> + <swingXVersion>1.6.2-2</swingXVersion> + + </properties> + + +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + </scm> <dependencyManagement> <dependencies> @@ -292,10 +323,16 @@ </dependency>  - <dependency> +  + + <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>r239</version> </dependency>  @@ -309,14 +346,14 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> + <version>${swingXVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> - <version>1.1.7</version> + <version>1.1.8</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -395,34 +432,9 @@ </dependencyManagement>  -  -  - - <name>JAXX</name> - <description>JAXX Project</description> - <inceptionYear>2008</inceptionYear> - <url>http://maven-site.nuiton.org/jaxx</url> - -    - <packaging>pom</packaging> - - <properties> - -  - <projectId>jaxx</projectId> - - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> - <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <eugeneVersion>2.3.2</eugeneVersion> - <xworkVersion>2.2.1.1</xworkVersion> - <jxLayerVersion>3.0.3</jxLayerVersion> - <javaHelpVersion>2.0.02</javaHelpVersion> - - </properties> - <build> <pluginManagement> @@ -438,7 +450,6 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> - <version>${licensePluginVersion}</version> <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> @@ -461,7 +472,6 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> <configuration> <jnlp> <mainClass>${maven.jar.main.class}</mainClass> @@ -509,13 +519,6 @@   -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> - </scm> - <profiles>

1 0

r2208 - trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing
by tchemit＠users.nuiton.org Feb. 16, 2011

Feb. 16, 2011

Author: tchemit Date: 2011-02-16 11:41:47 +0100 (Wed, 16 Feb 2011) New Revision: 2208 Url: http://nuiton.org/repositories/revision/jaxx/2208 Log: fix demos Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx 2011-02-15 19:53:57 UTC (rev 2207) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JProgressBarDemo.jaxx 2011-02-16 10:41:47 UTC (rev 2208) @@ -25,47 +25,61 @@ <jaxx.demo.DemoPanel layout='{new BorderLayout()}'> <import> + java.awt.Color + javax.swing.Timer javax.swing.UIManager - java.awt.Color </import> - <script><![CDATA[ - import javax.swing.Timer; - - int red = 0; - int green = 0; - int blue = 0; - int speed = 2; - int redDirection = 1; - int greenDirection = 1; - int blueDirection = 1; - - Timer redTimer = new Timer(5, new ActionListener() { - public void actionPerformed(ActionEvent e) { - red = Math.max(0, Math.min(255, red + speed * redDirection)); - if (red == 0 || red == 255) - redDirection = -redDirection; - } - }); - Timer greenTimer = new Timer(50, new ActionListener() { - public void actionPerformed(ActionEvent e) { - green = Math.max(0, Math.min(255, green + speed * greenDirection)); - if (green == 0 || green == 255) - greenDirection = -greenDirection; - } - }); + <Integer id='red' javaBean='0'/> + <Integer id='green' javaBean='0'/> + <Integer id='blue' javaBean='0'/> + <Integer id='speed' initializer='2'/> + <Integer id='redDirection' initializer='1'/> + <Integer id='greenDirection' initializer='1'/> + <Integer id='blueDirection' initializer='1'/> + <Timer id='redTimer' constructorParams='5, null' + onActionPerformed='changeRedValue()'/> + <Timer id='greenTimer' constructorParams='50, null' + onActionPerformed='changeGreenValue()'/> + <Timer id='blueTimer' constructorParams='500, null' + onActionPerformed='changeBlueValue()'/> - Timer blueTimer = new Timer(500, new ActionListener() { - public void actionPerformed(ActionEvent e) { - blue = Math.max(0, Math.min(255, blue + speed * blueDirection)); - if (blue == 0 || blue == 255) - blueDirection = -blueDirection; - } - }); - + + <script><![CDATA[ +void startTimers() { redTimer.start(); greenTimer.start(); blueTimer.start(); +} + +void stopTimers() { + redTimer.stop(); + greenTimer.stop(); + blueTimer.stop(); +} + +void $afterCompleteSetup() { + startTimers(); +} + +protected void changeRedValue() { + setRed(Math.max(0, Math.min(255, red + speed * redDirection))); + if (red == 0 || red == 255) { + redDirection = -redDirection; + } +} +protected void changeGreenValue() { + setGreen(Math.max(0, Math.min(255, green + speed * greenDirection))); + if (green == 0 || green == 255) { + greenDirection = -greenDirection; + } +} +protected void changeBlueValue() { + setBlue(Math.max(0, Math.min(255, blue + speed * blueDirection))); + if (blue == 0 || blue == 255) { + blueDirection = -blueDirection; + } +} ]]></script> <Table insets='6' constraints='BorderLayout.CENTER'> @@ -73,39 +87,36 @@ <cell columns='3'> <JLabel text='Welcome to the JAXX framework!' font='{UIManager.getFont("Label.font").deriveFont(18f)}' - foreground='{new Color(red, green, blue)}'/> + foreground='{new Color(getRed(), getGreen(), getBlue())}'/> </cell> </row> - <row> <cell columns='3' fill='horizontal'> - <JProgressBar foreground='{new Color(red, 0, 0)}' value='{red}' - maximum='255'/> + <JProgressBar id='redProgressBar' + foreground='{new Color(getRed(), 0, 0)}' + value='{getRed()}' maximum='255'/> </cell> </row> - <row> <cell columns='3' fill='horizontal'> - <JProgressBar foreground='{new Color(0, green, 0)}' value='{green}' - maximum='255'/> + <JProgressBar id='greenProgressBar' + foreground='{new Color(0, getGreen(), 0)}' + value='{getGreen()}' maximum='255'/> </cell> </row> - <row> <cell columns='3' fill='horizontal'> - <JProgressBar foreground='{new Color(0, 0, blue)}' value='{blue}' - maximum='255'/> + <JProgressBar id='blueProgressBar' + foreground='{new Color(0, 0, getBlue())}' + value='{getBlue()}' maximum='255'/> </cell> </row> - <row> <cell weightx='1' anchor='east'> - <JButton text='Start' - onActionPerformed='redTimer.start(); greenTimer.start(); blueTimer.start()'/> + <JButton text='Start' onActionPerformed='startTimers()'/> </cell> <cell> - <JButton text='Stop' - onActionPerformed='redTimer.stop(); greenTimer.stop(); blueTimer.stop()'/> + <JButton text='Stop' onActionPerformed='stopTimers()'/> </cell> </row> </Table> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx 2011-02-15 19:53:57 UTC (rev 2207) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JRadioButtonMenuItemDemo.jaxx 2011-02-16 10:41:47 UTC (rev 2208) @@ -54,5 +54,4 @@ <JLabel id='demoMessage' text='Font size: {fontSize.getSelectedValue()}' horizontalAlignment='center' font='{updateFont(fontSize.getSelectedValue())}'/> -  </JMenuItemDemo> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx 2011-02-15 19:53:57 UTC (rev 2207) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JTextAreaDemo.jaxx 2011-02-16 10:41:47 UTC (rev 2208) @@ -24,15 +24,15 @@ --> <jaxx.demo.DemoPanel> - <Table anchor='northwest'> + <Table constraints='BorderLayout.CENTER'> <row> <cell> <JLabel text='Normal text:' displayedMnemonic='N' labelFor='{textArea}'/> </cell> - <cell weightx='1' fill='both'> - <JScrollPane height='120'> + <cell weightx='1' fill='both' anchor='east'> + <JScrollPane> <JTextArea id='textArea' text='Try typing some text here.'/> </JScrollPane> </cell> @@ -40,21 +40,15 @@ <row> <cell> - <JLabel text='Upper case text:'/> + <JLabel text='Upper case text:' labelFor='{upperTextArea}'/> </cell> <cell weightx='1' fill='both'> - <JScrollPane height='120'> - <JTextArea editable='false' background='{null}' + <JScrollPane> + <JTextArea id='upperTextArea' editable='false' background='{null}' text='{textArea.getText().toUpperCase()}'/> </JScrollPane> </cell> </row> - - <row> - <cell weighty='1'> - <JPanel/> - </cell> - </row> </Table> </jaxx.demo.DemoPanel>

1 0