Author: tchemit Date: 2008-08-05 11:08:02 +0000 (Tue, 05 Aug 2008) New Revision: 813 Added: trunk/lutinjaxx/jaxx-swing-action/changelog Modified: trunk/lutinjaxx/core/pom.xml trunk/lutinjaxx/jaxx-swing-action/pom.xml trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionAnnotationProcessing.java trunk/lutinjaxx/jaxx-swing-tab/pom.xml trunk/lutinjaxx/jaxx-swing/pom.xml trunk/lutinjaxx/maven/pom.xml trunk/lutinjaxx/pom.xml trunk/lutinjaxx/runtime/pom.xml trunk/lutinjaxx/util/pom.xml Log: passage version 0.3-SNAPSHOT pour corriger 2 bugs sur l'annotation processor : (voir changelog) ajout changelog Modified: trunk/lutinjaxx/core/pom.xml =================================================================== --- trunk/lutinjaxx/core/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/core/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>core</artifactId> <name>core</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library core</description> <build> Modified: trunk/lutinjaxx/jaxx-swing/pom.xml =================================================================== --- trunk/lutinjaxx/jaxx-swing/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/jaxx-swing/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>jaxx-swing</artifactId> <name>jaxx-swing</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx library swing extension</description> <dependencies> Added: trunk/lutinjaxx/jaxx-swing-action/changelog =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/changelog (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/changelog 2008-08-05 11:08:02 UTC (rev 813) @@ -0,0 +1,7 @@ +jaxx-swing-action (0.4) stable; urgency=high + + * bug correction when have to compile actions but not the baseAction, providerConfig was null + * bug correction when action herites from another not base action, the action has te be treated after the mother action + * usemaven-i18n-plugin v0.4 + + -- Tony Chemit <chemit@codelutin.com> Fri, 05 Aug 2008 02:02:02 +0200 Modified: trunk/lutinjaxx/jaxx-swing-action/pom.xml =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/jaxx-swing-action/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>jaxx-swing-action</artifactId> <name>jaxx-swing-action</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library swing actions extension</description> <build> Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionAnnotationProcessing.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionAnnotationProcessing.java 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionAnnotationProcessing.java 2008-08-05 11:08:02 UTC (rev 813) @@ -116,16 +116,23 @@ String className = e.toString(); if (processedClass.contains(className)) { + printWarning("class already processed " + className); // do not process class twice continue; } - printDebug("process class " + className); - registerActionsForClass(annotation.asType(), e); - processedClass.add(className); + + boolean wasTreated = registerActionsForClass(annotation.asType(), e); + if (wasTreated) { + printDebug("process class " + className); + processedClass.add(className); + } else { + printDebug("class was not processed " + e); + } } } if ((roundEnv.processingOver())) { + printDebug("round is over " + roundEnv); try { if (providerConfig == null) { // baseActionClass was not compiled at this time, must find it back @@ -165,16 +172,21 @@ } } - protected void registerActionsForClass(TypeMirror annotationType, Element e) { + protected boolean registerActionsForClass(TypeMirror annotationType, Element e) { + boolean doTreate = false; for (AnnotationMirror mirror : e.getAnnotationMirrors()) { if (!mirror.getAnnotationType().equals(annotationType)) { // do not treate other annotations continue; } + doTreate = true; + printDebug("found a annotation to treate : " + mirror + " for action : " + e.toString()); for (String name : getActionNames(mirror)) { actions.put("action." + name, e.toString()); + printDebug("registerActionForClass " + name + " : " + e.toString()); } } + return doTreate; } protected void parseOptions() { Modified: trunk/lutinjaxx/jaxx-swing-tab/pom.xml =================================================================== --- trunk/lutinjaxx/jaxx-swing-tab/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/jaxx-swing-tab/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>jaxx-swing-tab</artifactId> <name>jaxx-swing-tab</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library swing tab extension</description> <build> Modified: trunk/lutinjaxx/maven/pom.xml =================================================================== --- trunk/lutinjaxx/maven/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/maven/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>maven-jaxx-plugin</artifactId> @@ -63,7 +63,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description> Maven 2 plugin to generate java source from ui interface definitions Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -39,7 +39,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>pom</name> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library main pom</description> <inceptionYear>2008</inceptionYear> Modified: trunk/lutinjaxx/runtime/pom.xml =================================================================== --- trunk/lutinjaxx/runtime/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/runtime/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>runtime</artifactId> <name>runtime</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library runtime</description> <build> Modified: trunk/lutinjaxx/util/pom.xml =================================================================== --- trunk/lutinjaxx/util/pom.xml 2008-08-05 10:39:58 UTC (rev 812) +++ trunk/lutinjaxx/util/pom.xml 2008-08-05 11:08:02 UTC (rev 813) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.jaxx</groupId> <artifactId>pom</artifactId> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> </parent> <artifactId>util</artifactId> <name>util</name> <packaging>jar</packaging> - <version>0.3</version> + <version>0.3-SNAPSHOT</version> <description>Jaxx lutin library utility</description> <build>