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

r2005 - in trunk: . maven-jaxx-plugin
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 14:17:03 +0200 (Tue, 29 Jun 2010) New Revision: 2005 Url: http://nuiton.org/repositories/revision/jaxx/2005 Log: Evolution #740: Use nuiton-utils 1.3.1 fix plexus runtime dependency Modified: trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-06-29 11:28:06 UTC (rev 2004) +++ trunk/maven-jaxx-plugin/pom.xml 2010-06-29 12:17:03 UTC (rev 2005) @@ -131,6 +131,13 @@ <classifier>tests</classifier> </dependency> +  + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>compile</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-29 11:28:06 UTC (rev 2004) +++ trunk/pom.xml 2010-06-29 12:17:03 UTC (rev 2005) @@ -367,6 +367,14 @@ </exclusions> </dependency> +  + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + <scope>compile</scope> + </dependency> + </dependencies> </dependencyManagement> @@ -390,7 +398,7 @@  <projectId>jaxx</projectId> - <lutinutil.version>1.3.1</lutinutil.version> + <lutinutil.version>1.3.2-SNAPSHOT</lutinutil.version> <i18n.version>1.2.3-SNAPSHOT</i18n.version>

1 0

r2004 - in trunk: . maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 13:28:06 +0200 (Tue, 29 Jun 2010) New Revision: 2004 Url: http://nuiton.org/repositories/revision/jaxx/2004 Log: Evolution #732: Use mavenpom 2.2.2 Evolution #733: Use maven-helper-plugin 1.2.6 Evolution #734: Use i18n 1.2.3 Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java trunk/pom.xml Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2010-06-28 14:13:48 UTC (rev 2003) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2010-06-29 11:28:06 UTC (rev 2004) @@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginWithEncoding; import org.nuiton.util.FileUtil; import java.io.File; @@ -37,7 +38,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ -public abstract class AbstractJaxxMojo extends AbstractPlugin { +public abstract class AbstractJaxxMojo extends AbstractPlugin implements PluginWithEncoding { public abstract File getTargetDirectory(); @@ -51,13 +52,18 @@ * @readonly */ private MavenProject project; + /** - * Encoding pour la generation des fichiers + * Encoding pour la generation des fichiers. + * + * Note: If nothing is filled here, we will use the system + * property {@code file.encoding}. * * @parameter expression="${jaxx.encoding}" default-value="${project.build.sourceEncoding}" * @since 2.0.0 */ private String encoding; + /** * verbose flag * @@ -74,6 +80,7 @@ * @parameter expression="${jaxx.force}" default-value="false" */ private boolean force; + /** * Flag to activate help id detection while parsing jaxx files. * @@ -87,7 +94,7 @@ @Override protected boolean checkPackaging() { // not accept pom modules - return !acceptPackaging(Packaging.pom); + return hasClassPath(); } @Override @@ -110,10 +117,12 @@ this.verbose = verbose; } + @Override public String getEncoding() { return encoding; } + @Override public void setEncoding(String encoding) { this.encoding = encoding; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-28 14:13:48 UTC (rev 2003) +++ trunk/pom.xml 2010-06-29 11:28:06 UTC (rev 2004) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -392,7 +392,7 @@ <lutinutil.version>1.3.1</lutinutil.version> - <i18n.version>1.2.2</i18n.version> + <i18n.version>1.2.3-SNAPSHOT</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0

r2003 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors jaxx-demo/src/main/java/jaxx/demo/tree jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: tchemit Date: 2010-06-28 16:13:48 +0200 (Mon, 28 Jun 2010) New Revision: 2003 Url: http://nuiton.org/repositories/revision/jaxx/2003 Log: make DataProvider traverse every method Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-28 13:50:33 UTC (rev 2002) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-28 14:13:48 UTC (rev 2003) @@ -65,7 +65,7 @@ } @Override - public JaxxTreeDemoNode createNode(People data) { + public JaxxTreeDemoNode createNode(People data, DataProvider dataProvider) { // Create actor static nodes JaxxTreeDemoNode actorsNode = new JaxxTreeDemoNode( Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-28 13:50:33 UTC (rev 2002) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-28 14:13:48 UTC (rev 2003) @@ -60,7 +60,7 @@ } @Override - public JaxxTreeDemoNode createNode(Movie data) { + public JaxxTreeDemoNode createNode(Movie data, DataProvider dataProvider) { // Create movies static nodes JaxxTreeDemoNode moviesNode = new JaxxTreeDemoNode( Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2010-06-28 13:50:33 UTC (rev 2002) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2010-06-28 14:13:48 UTC (rev 2003) @@ -53,7 +53,7 @@ } @Override - public DemoNode createNode(Object data) { + public DemoNode createNode(Object data, DataProvider dataProvider) { DemoNode node = null; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-28 13:50:33 UTC (rev 2002) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-28 14:13:48 UTC (rev 2003) @@ -83,10 +83,11 @@ /** * Hook to create a child node given his {@code data}. * - * @param data the data of the node to create + * @param data the data of the node to create + * @param dataProvider the data provider * @return the created node */ - public abstract N createNode(T data); + public abstract N createNode(T data, DataProvider dataProvider); /** * Returns the type of data associated with nodes to create. @@ -133,7 +134,7 @@ } // on charge les fils - addChildNodes(parentNode, datas); + addChildNodes(parentNode, datas, dataProvider); // notifie le modele d'un ajout de noeuds JaxxTreeHelper.notifyChildNodesInserted(model, parentNode); @@ -145,10 +146,13 @@ * * This method is invoked by the {@link #loadChilds(DefaultTreeModel, JaxxNode, DataProvider)}. * - * @param parentNode the node where to insert - * @param datas the data used to create node + * @param parentNode the node where to insert + * @param datas the data used to create node + * @param dataProvider the data provider */ - protected void addChildNodes(N parentNode, List<T> datas) { + protected void addChildNodes(N parentNode, + List<T> datas, + DataProvider dataProvider) { // creation des noeuds fils if (datas != null) { @@ -156,7 +160,7 @@ if (log.isInfoEnabled()) { log.info("[" + parentNode + "] Will add child node for " + o); } - N node = createNode(o); + N node = createNode(o, dataProvider); parentNode.add(node); } }

1 0

r2002 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors jaxx-demo/src/main/java/jaxx/demo/tree jaxx-runtime/src/main/java/jaxx/runtime/swing/tree
by tchemit＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: tchemit Date: 2010-06-28 15:50:33 +0200 (Mon, 28 Jun 2010) New Revision: 2002 Url: http://nuiton.org/repositories/revision/jaxx/2002 Log: make child loadors have another generic type to defined how to load datas. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoHelper.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -45,7 +45,6 @@ public static String ACTORS_CATEGORY_NODE = "actors"; public JaxxTreeDemoHelper(JaxxTreeDemoDataProvider provider) { - super(); setDataProvider(provider); } @@ -64,7 +63,7 @@ String.class, n_(MOVIES_CATEGORY_NODE), null, - new MoviesNodeLoadors() + getChildLoador(MoviesNodeLoadors.class) ); // Create peoples category node @@ -72,7 +71,7 @@ String.class, n_(ACTORS_CATEGORY_NODE), null, - new ActorsNodeLoadors() + getChildLoador(ActorsNodeLoadors.class) ); // Add to root @@ -80,13 +79,8 @@ root.add(peoplesCategoryNode); // Create model - DefaultTreeModel model = getModel(); - if (model == null) { - model = createModel(root); - } else { - model.setRoot(root); - } - + DefaultTreeModel model = createModel(root); + // Populate childs nodes root.populateChilds(model, getDataProvider()); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/JaxxTreeDemoNode.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -34,11 +34,16 @@ */ public class JaxxTreeDemoNode extends JaxxNode<JaxxTreeDemoNode> { + private static final long serialVersionUID = 1L; + public JaxxTreeDemoNode(String id) { super(id); } - public JaxxTreeDemoNode(Class<?> internalClass, String id, String context, JaxxNodeChildLoador<?, JaxxTreeDemoNode> jaxxDemoNodeJaxxNodeChildLoador) { - super(internalClass, id, context, jaxxDemoNodeJaxxNodeChildLoador); + public JaxxTreeDemoNode(Class<?> internalClass, + String id, + String context, + JaxxNodeChildLoador<?, ?, JaxxTreeDemoNode> loador) { + super(internalClass, id, context, loador); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/ActorsNodeLoadors.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -37,7 +37,9 @@ * @author sletellier <letellier(a)codelutin.com> * @since 2.1 */ -public class ActorsNodeLoadors extends JaxxNodeChildLoador<People, JaxxTreeDemoNode> { +public class ActorsNodeLoadors extends JaxxNodeChildLoador<People,People, JaxxTreeDemoNode> { + + private static final long serialVersionUID = 1L; public ActorsNodeLoadors() { super(People.class); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/tree/loadors/MoviesNodeLoadors.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -40,7 +40,9 @@ * @author sletellier <letellier(a)codelutin.com> * @since 2.1 */ -public class MoviesNodeLoadors extends JaxxNodeChildLoador<Movie, JaxxTreeDemoNode> { +public class MoviesNodeLoadors extends JaxxNodeChildLoador<Movie, Movie, JaxxTreeDemoNode> { + + private static final long serialVersionUID = 1L; public MoviesNodeLoadors() { super(Movie.class); @@ -73,7 +75,7 @@ String.class, n_(JaxxTreeDemoHelper.ACTORS_CATEGORY_NODE), null, - new ActorsNodeLoadors() + JaxxTreeDemoHelper.getChildLoador(ActorsNodeLoadors.class) ); // Add actors nodes to movies node Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNode.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -38,7 +38,11 @@ private static final long serialVersionUID = 1L; public DemoNode(String id) { - super(String.class, id, null, DemoTreeHelper.getChildLoador(DemoNodeLoador.class)); + super(String.class, + id, + null, + DemoTreeHelper.getChildLoador(DemoNodeLoador.class) + ); } @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoNodeLoador.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -34,7 +34,7 @@ * @author tchemit <tchemit(a)codelutin.com> * @since 2.1 */ -public class DemoNodeLoador extends JaxxNodeChildLoador<Object, DemoNode> { +public class DemoNodeLoador extends JaxxNodeChildLoador<Object,Object, DemoNode> { private static final long serialVersionUID = 1L; @@ -68,7 +68,8 @@ } if (node == null) { - throw new IllegalArgumentException("Data [" + data + "] can not be use to build a node"); + throw new IllegalArgumentException( + "Data [" + data + "] can not be use to build a node"); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNode.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -118,7 +118,7 @@ protected boolean loaded; /** Optional child loador to lazy create childs of the node. */ - protected final JaxxNodeChildLoador<?, N> childLoador; + protected final JaxxNodeChildLoador<?, ?, N> childLoador; protected JaxxNode(String id) { this(String.class, id, null, null); @@ -127,7 +127,7 @@ public JaxxNode(Class<?> internalClass, String id, String context, - JaxxNodeChildLoador<?, N> childLoador) { + JaxxNodeChildLoador<?, ?, N> childLoador) { this.internalClass = internalClass; this.id = id; this.context = context; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxNodeChildLoador.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -46,11 +46,14 @@ * a such object rathen than duplicate same code in helper... * * @author tchemit <chemit(a)codelutin.com> + * @param <T> type of data used to create nodes (can be just a String type to use only ids) + * @param <O> type of data associated with nodes + * @param <N> type of node to used (to make possible full co-variance and no cast in fal implementations). * @see JaxxTreeHelper * @see JaxxNode * @since 2.1 */ -public abstract class JaxxNodeChildLoador<O, N extends JaxxNode<N>> implements Serializable { +public abstract class JaxxNodeChildLoador<T, O, N extends JaxxNode<N>> implements Serializable { /** Logger */ static private final Log log = LogFactory.getLog(JaxxNodeChildLoador.class); @@ -63,7 +66,9 @@ } /** - * Obtain the list of data to put in childs. + * Obtain the list of data used to create nodes. + * + * If type {@code T} is {@code O}, we directly use the data associated with nodes. * * @param parentClass type of parent * @param parentId id of parent @@ -71,7 +76,7 @@ * @return the list of data * @throws Exception if any problem */ - public abstract List<O> getData(Class<?> parentClass, + public abstract List<T> getData(Class<?> parentClass, String parentId, DataProvider dataProvider) throws Exception; @@ -81,35 +86,39 @@ * @param data the data of the node to create * @return the created node */ - public abstract N createNode(O data); -// public abstract N createNode(N parentNode, O data); + public abstract N createNode(T data); + /** + * Returns the type of data associated with nodes to create. + * + * @return the type of data associated with created nodes. + */ public Class<O> getBeanType() { return beanType; } /** - * Charge les fils du noeud parent donne. + * Load childs of the given {@code parentnode}. * - * @param model le model de l'arbre a impacter - * @param parentNode le noeud parent - * @param source le service pour recuperer les donnees + * @param model the model owner of nodes + * @param parentNode the parent node where to insert nodes + * @param dataProvider data provider * @throws Exception pour tout probleme de recuperation de donnees */ public void loadChilds(DefaultTreeModel model, N parentNode, - DataProvider source) throws Exception { + DataProvider dataProvider) throws Exception { N containerNode = parentNode.getContainerNode(); - List<O> datas; + List<T> datas; if (containerNode == null) { // pas d'ancetre, il doit s'agir d'un premier noeud de données // depuis le noeud root // recuperation des objets fils (sans connaitre de parent) - datas = getData(null, null, source); + datas = getData(null, null, dataProvider); } else { if (log.isDebugEnabled()) { @@ -120,7 +129,7 @@ // recuperation des objets fils datas = getData(containerNode.getInternalClass(), containerNode.getId(), - source); + dataProvider); } // on charge les fils @@ -130,11 +139,20 @@ JaxxTreeHelper.notifyChildNodesInserted(model, parentNode); } - protected void addChildNodes(N parentNode, List<O> datas) { + /** + * Add childs to given {@code parentNode} using retrive {@code datas} from + * the data provider. + * + * This method is invoked by the {@link #loadChilds(DefaultTreeModel, JaxxNode, DataProvider)}. + * + * @param parentNode the node where to insert + * @param datas the data used to create node + */ + protected void addChildNodes(N parentNode, List<T> datas) { // creation des noeuds fils if (datas != null) { - for (O o : datas) { + for (T o : datas) { if (log.isInfoEnabled()) { log.info("[" + parentNode + "] Will add child node for " + o); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-27 07:01:41 UTC (rev 2001) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/tree/JaxxTreeHelper.java 2010-06-28 13:50:33 UTC (rev 2002) @@ -182,11 +182,11 @@ protected TreeModelListener treeModelListener; /** Cache of child loadors. */ - protected static Set<? super JaxxNodeChildLoador<?, ?>> childLoadors; + protected static Set<? super JaxxNodeChildLoador<?, ?, ?>> childLoadors; - protected static Set<? super JaxxNodeChildLoador<?, ?>> getChildLoadors() { + protected static Set<? super JaxxNodeChildLoador<?, ?, ?>> getChildLoadors() { if (childLoadors == null) { - childLoadors = new HashSet<JaxxNodeChildLoador<?, ?>>(); + childLoadors = new HashSet<JaxxNodeChildLoador<?, ?, ?>>(); } return childLoadors; } @@ -201,12 +201,12 @@ * @param <L> the type of loador to get * @return the loador from cache */ - public static <L extends JaxxNodeChildLoador<?, ?>> L getChildLoador(Class<L> type) { - Set<? super JaxxNodeChildLoador<?, ?>> cache = getChildLoadors(); - JaxxNodeChildLoador<?, ?> result = null; + public static <L extends JaxxNodeChildLoador<?, ?, ?>> L getChildLoador(Class<L> type) { + Set<? super JaxxNodeChildLoador<?, ?, ?>> cache = getChildLoadors(); + JaxxNodeChildLoador<?, ?, ?> result = null; for (Object loador : cache) { if (type.equals(loador.getClass())) { - result = (JaxxNodeChildLoador<?, ?>) loador; + result = (JaxxNodeChildLoador<?, ?, ?>) loador; break; } } @@ -671,8 +671,8 @@ * @param dataProvider the data provider used to populate nodes */ public void loadAllNodes(DefaultTreeModel model, - JaxxNode<?> node, - DataProvider dataProvider) { + JaxxNode<?> node, + DataProvider dataProvider) { if (!checkModel()) { return; } @@ -781,11 +781,11 @@ /** * Register a new root node. - * + * * If internal {@link #model} does not exists, creates a new one from his given root {@code node}, * otherwise just set the new root on the existing model. * - * + * * Note: As a side-effect, the model will be keep in field {@link #model} * and the {@link #treeModelListener} will be registred on this model. * @@ -799,7 +799,7 @@ } else { model.setRoot(node); } - + // notify structure has changed model.nodeStructureChanged(getRootNode()); return model;

1 0

r2001 - in trunk: . jaxx-compiler/src/license jaxx-runtime/src/license jaxx-widgets/src/license maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: tchemit Date: 2010-06-27 09:01:41 +0200 (Sun, 27 Jun 2010) New Revision: 2001 Url: http://nuiton.org/repositories/revision/jaxx/2001 Log: consolidate THIRD-PARTY Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-27 06:35:31 UTC (rev 2000) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-27 07:01:41 UTC (rev 2001) @@ -13,7 +13,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jun 25 10:56:39 CEST 2010 +#Sat Jun 26 13:19:17 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-27 06:35:31 UTC (rev 2000) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-27 07:01:41 UTC (rev 2001) @@ -13,7 +13,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jun 25 10:56:39 CEST 2010 +#Sat Jun 26 13:19:17 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-widgets/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-27 06:35:31 UTC (rev 2000) +++ trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-27 07:01:41 UTC (rev 2001) @@ -13,7 +13,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jun 25 10:56:40 CEST 2010 +#Sat Jun 26 13:19:17 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-27 06:35:31 UTC (rev 2000) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-27 07:01:41 UTC (rev 2001) @@ -15,7 +15,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jun 25 10:56:40 CEST 2010 +#Sat Jun 26 13:19:17 CEST 2010 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:35:31 UTC (rev 2000) +++ trunk/pom.xml 2010-06-27 07:01:41 UTC (rev 2001) @@ -397,11 +397,8 @@ <jxlayer.version>3.0.3</jxlayer.version> <javahelp.version>2.0.02</javahelp.version> - <license.version>2.3-SNAPSHOT</license.version> <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> - <license.useMissingFile>true</license.useMissingFile> - <license.failIfWarning>true</license.failIfWarning> </properties> <build>

1 0

r2000 - trunk
by tchemit＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: tchemit Date: 2010-06-27 08:35:31 +0200 (Sun, 27 Jun 2010) New Revision: 2000 Url: http://nuiton.org/repositories/revision/jaxx/2000 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-26 11:16:44 UTC (rev 1999) +++ trunk/pom.xml 2010-06-27 06:35:31 UTC (rev 2000) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>jaxx</artifactId>

1 0

r1999 - trunk
by tchemit＠users.nuiton.org 26 Jun '10

26 Jun '10

Author: tchemit Date: 2010-06-26 13:16:44 +0200 (Sat, 26 Jun 2010) New Revision: 1999 Url: http://nuiton.org/repositories/revision/jaxx/1999 Log: add merge of licenses in thrid-party Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-25 17:58:27 UTC (rev 1998) +++ trunk/pom.xml 2010-06-26 11:16:44 UTC (rev 1999) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -45,13 +47,10 @@ <module>jaxx-compiler</module> -  <module>maven-jaxx-plugin</module> <module>jaxx-widgets</module> -  -  </modules> <dependencyManagement> @@ -208,7 +207,7 @@ <artifactId>commons-io</artifactId> <version>1.4</version> </dependency> - + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -402,6 +401,9 @@ <javahelp.version>2.0.02</javahelp.version> <license.version>2.3-SNAPSHOT</license.version> <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> + + <license.useMissingFile>true</license.useMissingFile> + <license.failIfWarning>true</license.failIfWarning> </properties> <build> @@ -417,6 +419,17 @@ </plugin> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>${license.version}</version> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> + </licenseMerges> + </configuration> + </plugin> + + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency>

1 0

r1998 - in trunk: jaxx-compiler/src/license jaxx-runtime/src/license jaxx-widgets/src/license maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org 25 Jun '10

25 Jun '10

Author: tchemit Date: 2010-06-25 19:58:27 +0200 (Fri, 25 Jun 2010) New Revision: 1998 Url: http://nuiton.org/repositories/revision/jaxx/1998 Log: update third-party Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties trunk/jaxx-runtime/src/license/THIRD-PARTY.properties trunk/jaxx-widgets/src/license/THIRD-PARTY.properties trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/jaxx-compiler/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-24 15:36:53 UTC (rev 1997) +++ trunk/jaxx-compiler/src/license/THIRD-PARTY.properties 2010-06-25 17:58:27 UTC (rev 1998) @@ -6,13 +6,14 @@ # - Common Public License Version 1.0 # - 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 # - The Apache Software License, Version 2.0 # - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 20 23:31:04 CEST 2010 +#Fri Jun 25 10:56:39 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-runtime/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-24 15:36:53 UTC (rev 1997) +++ trunk/jaxx-runtime/src/license/THIRD-PARTY.properties 2010-06-25 17:58:27 UTC (rev 1998) @@ -6,13 +6,14 @@ # - Common Public License Version 1.0 # - 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 # - The Apache Software License, Version 2.0 # - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 20 23:31:04 CEST 2010 +#Fri Jun 25 10:56:39 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/jaxx-widgets/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-24 15:36:53 UTC (rev 1997) +++ trunk/jaxx-widgets/src/license/THIRD-PARTY.properties 2010-06-25 17:58:27 UTC (rev 1998) @@ -6,13 +6,14 @@ # - Common Public License Version 1.0 # - 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 # - The Apache Software License, Version 2.0 # - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 20 23:35:21 CEST 2010 +#Fri Jun 25 10:56:40 CEST 2010 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-24 15:36:53 UTC (rev 1997) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-25 17:58:27 UTC (rev 1998) @@ -10,12 +10,13 @@ # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 # - The OpenSymphony Software License 1.1 +# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jun 24 17:21:21 CEST 2010 -classworlds--classworlds--1.1-alpha-2=http://classworlds.codehaus.org/license.html +#Fri Jun 25 10:56:40 CEST 2010 +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0

1 0

r1997 - trunk/maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: tchemit Date: 2010-06-24 17:36:53 +0200 (Thu, 24 Jun 2010) New Revision: 1997 Url: http://nuiton.org/repositories/revision/jaxx/1997 Log: fix thrid-party Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-24 15:20:53 UTC (rev 1996) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-24 15:36:53 UTC (rev 1997) @@ -14,8 +14,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jun 24 17:17:42 CEST 2010 -classworlds--classworlds--1.1-alpha-2= +#Thu Jun 24 17:21:21 CEST 2010 +classworlds--classworlds--1.1-alpha-2=http://classworlds.codehaus.org/license.html commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0

1 0

r1996 - trunk/maven-jaxx-plugin/src/license
by tchemit＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: tchemit Date: 2010-06-24 17:20:53 +0200 (Thu, 24 Jun 2010) New Revision: 1996 Url: http://nuiton.org/repositories/revision/jaxx/1996 Log: fix missing third-party licenses Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties Modified: trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-24 14:53:40 UTC (rev 1995) +++ trunk/maven-jaxx-plugin/src/license/THIRD-PARTY.properties 2010-06-24 15:20:53 UTC (rev 1996) @@ -14,13 +14,13 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jun 20 23:41:12 CEST 2010 +#Thu Jun 24 17:17:42 CEST 2010 classworlds--classworlds--1.1-alpha-2= commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1= -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4= -org.codehaus.plexus--plexus-velocity--1.1.7= -oro--oro--2.0.8= +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0