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

r1945 - trunk
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 12:27:55 +0200 (Wed, 02 Jun 2010) New Revision: 1945 Url: http://nuiton.org/repositories/revision/jaxx/1945 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 03:02:59 UTC (rev 1944) +++ trunk/pom.xml 2010-06-02 10:27:55 UTC (rev 1945) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>jaxx</artifactId>

1 0

r1944 - trunk/jaxx-runtime/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 05:02:59 +0200 (Wed, 02 Jun 2010) New Revision: 1944 Url: http://nuiton.org/repositories/revision/jaxx/1944 Log: add new loadUIConfig (simplier) method to load ui configuration from a given properties Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2010-06-01 13:38:43 UTC (rev 1943) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2010-06-02 03:02:59 UTC (rev 1944) @@ -24,6 +24,44 @@ */ package jaxx.runtime; +import jaxx.runtime.swing.Item; +import jaxx.runtime.swing.JAXXComboBox; +import jaxx.runtime.swing.renderer.BooleanCellRenderer; +import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; +import jaxx.runtime.swing.renderer.EnumTableCellRenderer; +import jaxx.runtime.swing.renderer.I18nTableCellRenderer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.jxlayer.JXLayer; +import org.jdesktop.swingx.JXTreeTable; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JLayeredPane; +import javax.swing.JList; +import javax.swing.JRootPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.text.AbstractDocument; +import javax.swing.text.JTextComponent; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -38,16 +76,8 @@ import java.beans.PropertyDescriptor; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Field; import java.net.URI; -import java.util.List; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; -import javax.swing.text.AbstractDocument; -import javax.swing.text.JTextComponent; -import java.lang.reflect.Field; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; @@ -55,26 +85,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.tree.TreeNode; -import javax.swing.tree.TreePath; -import jaxx.runtime.swing.renderer.BooleanCellRenderer; -import jaxx.runtime.swing.renderer.EmptyNumberTableCellRenderer; -import jaxx.runtime.swing.renderer.EnumTableCellRenderer; -import jaxx.runtime.swing.renderer.I18nTableCellRenderer; -import jaxx.runtime.swing.Item; -import jaxx.runtime.swing.JAXXComboBox; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.swingx.JXTreeTable; - import static org.nuiton.i18n.I18n._; /** @@ -87,9 +104,7 @@ */ public class SwingUtil extends JAXXUtil { - /** - * to use log facility, just put in your code: log.info(\"...\"); - */ + /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(SwingUtil.class); public static final String DEFAULT_ICON_PATH = "/icons/"; @@ -274,7 +289,7 @@ } return (O) parent; } - + public static int computeTableColumnWidth(JTable table, Font font, int columnIndex, String suffix) { @@ -457,7 +472,7 @@ i.add((Container) c); String name = c.getName(); if (c instanceof JComponent && - name != null && !"".equals(name)) { + name != null && !"".equals(name)) { allNamedComponent.put(name, (JComponent) c); } } @@ -587,6 +602,42 @@ } /** + * Load the ui.properties file and set in {@link UIManager} colors and + * icons found. + * + * @param incoming the ui resources to load. + * @since 2.1 + */ + public static void loadUIConfig(Properties incoming) { + + for (Entry<Object, Object> entry : incoming.entrySet()) { + String key = (String) entry.getKey(); + if (key.startsWith(ICON_PREFIX)) { + ImageIcon icon; + try { + icon = createImageIcon((String) entry.getValue()); + UIManager.put(key.substring(ICON_PREFIX.length()), icon); + } catch (Exception e) { + log.warn("could not load icon " + entry.getValue()); + } + continue; + } + if (key.startsWith(COLOR_PREFIX)) { + String value = (String) entry.getValue(); + String[] rgb = value.split(","); + UIManager.put( + key.substring(COLOR_PREFIX.length()), + new Color( + Integer.valueOf(rgb[0]), + Integer.valueOf(rgb[1]), + Integer.valueOf(rgb[2]) + ) + ); + } + } + } + + /** * Iterate the components of a {@link JTabbedPane} in natural order. * <p/> * Says using method {@link JTabbedPane#getComponent(int)} @@ -623,8 +674,11 @@ public static abstract class TabbedPaneIterator<O> implements Iterator<O> { final JTabbedPane tabs; + boolean reverse; + int index; + int increment; protected abstract O get(int index, Component comp); @@ -876,7 +930,7 @@ } } - public static void openLink(String url) { + public static void openLink(String url) { try { if (!Desktop.isDesktopSupported()) { @@ -924,9 +978,9 @@ /** * Expand all childs of a tree table. + * <p/> + * FIXME : Voir pour enlever le copier coller * - * FIXME : Voir pour enlever le copier coller - * * @param treeTable the tree to expand */ public static void expandTreeTable(final JXTreeTable treeTable) { @@ -976,13 +1030,13 @@ }); } } - }); + }); } /** * Add a listener of tree table selection model to expand a new selected * node when it is selected. - * + * <p/> * FIXME : Voir pour enlever le copier coller * * @param treeTable the tree to treate @@ -1038,6 +1092,7 @@ } } } + /** * Set the height of a given component. *

1 0

r1943 - in trunk: . jaxx-runtime/src/main/java/jaxx/runtime/swing/editor jaxx-runtime/src/main/java/jaxx/runtime/validator jaxx-runtime/src/main/java/jaxx/runtime/validator/field jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 15:38:43 +0200 (Tue, 01 Jun 2010) New Revision: 1943 Url: http://nuiton.org/repositories/revision/jaxx/1943 Log: - Evolution #653: Use nuiton-utils 1.3.1 and his new Converter api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java trunk/pom.xml Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor; import org.apache.commons.beanutils.Converter; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.DefaultCellEditor; import javax.swing.JTable; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -28,7 +28,7 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.event.EventListenerList; import java.beans.*; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -68,7 +68,7 @@ @Override public void validate(Object object) throws ValidationException { String fieldName = getFieldName(); - Object value = this.getFieldValue(fieldName, object); + Object value = getFieldValue(fieldName, object); if (value==null) { // no value defined addFieldError(fieldName, object); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -31,7 +31,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; /** * Extends {@link FieldExpressionValidator} to add some extra parameters available Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -29,6 +29,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,22 +38,30 @@ /** * le modele d'une categorie d'options. - * + * <p/> * Une categorie est un ensemble d'options. * * @author tchemit */ -public class CategoryModel implements Iterable<OptionModel> { +public class CategoryModel implements Iterable<OptionModel>, Serializable { + private static final long serialVersionUID = 1L; + public static final String RELOAD_PROPERTY_NAME = "reload"; + public static final String MODIFIED_PROPERTY_NAME = "modified"; + public static final String VALID_PROPERTY_NAME = "valid"; + /** category short name (i18n key) */ protected String category; + /** category long name (i18n key) */ protected String categoryLabel; + /** options of the category */ protected List<OptionModel> entries; + /** suport of modification */ protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor.config.model; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.table.AbstractTableModel; import java.beans.PropertyChangeEvent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -36,6 +36,7 @@ */ public class OptionModel implements OptionDef { + private static final long serialVersionUID = 1L; /** * la definition de l'option ( venant de la config) */ @@ -44,11 +45,11 @@ * un drapeau pour savoir si l'option est valide (n'est pas utilisé actuellement) */ protected boolean valid = true; + /** * un drapeau pour savoir si l'option a été sauvée */ protected boolean saved; - /** * la valeur non modifié de l'option */ @@ -61,6 +62,7 @@ * le nom de la propriété javaBean (peut etre null, si option sans support javaBean) */ protected String propertyName; + /** * l'editeur utilise pour modifier graphiquement l'option */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/pom.xml 2010-06-01 13:38:43 UTC (rev 1943) @@ -393,7 +393,8 @@  <projectId>jaxx</projectId> - <lutinutil.version>1.3</lutinutil.version> + <lutinutil.version>1.3.1-SNAPSHOT</lutinutil.version> + <i18n.version>1.2.2</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0

r1942 - in trunk/maven-jaxx-plugin/src/test: java/org/nuiton/jaxx/plugin resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 03:06:33 +0200 (Tue, 01 Jun 2010) New Revision: 1942 Url: http://nuiton.org/repositories/revision/jaxx/1942 Log: fix test Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx Removed: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-05-30 12:11:41 UTC (rev 1941) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-06-01 01:06:33 UTC (rev 1942) @@ -88,22 +88,15 @@ String[] files = mojo.files; assertNumberJaxxFiles(2); - String withLogFile; - String withnoLogFile; - if (files[0].endsWith("WithLog.jaxx")) { - withLogFile = files[0]; - withnoLogFile = files[1]; - } else { - withLogFile = files[1]; - withnoLogFile = files[0]; - } + String withLogFile = files[0]; checkPattern(mojo, "Log log = LogFactory.getLog(", true, withLogFile); checkPattern(mojo, "import org.apache.commons.logging.Log;", true, withLogFile); checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", true, withLogFile); - checkPattern(mojo, "Log log = LogFactory.getLog(", false, withnoLogFile); - checkPattern(mojo, "import org.apache.commons.logging.Log;", false, withnoLogFile); - checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", false, withnoLogFile); + withLogFile = files[1]; + checkPattern(mojo, "Log log = LogFactory.getLog(", true, withLogFile); + checkPattern(mojo, "import org.apache.commons.logging.Log;", true, withLogFile); + checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", true, withLogFile); } @Test Deleted: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx 2010-05-30 12:11:41 UTC (rev 1941) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx 2010-06-01 01:06:33 UTC (rev 1942) @@ -1 +0,0 @@ -<WithLog id='testId' text='test.text'/> \ No newline at end of file Copied: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx (from rev 1941, trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx) =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx 2010-06-01 01:06:33 UTC (rev 1942) @@ -0,0 +1 @@ +<WithLog id='testId' text='test.text'/> \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Added: svn:mergeinfo +

1 0