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

r2308 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/beans
by tchemit＠users.nuiton.org 23 Sep '11

23 Sep '11

Author: tchemit Date: 2011-09-23 13:49:08 +0200 (Fri, 23 Sep 2011) New Revision: 2308 Url: http://nuiton.org/repositories/revision/jaxx/2308 Log: clean code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java 2011-09-23 11:26:38 UTC (rev 2307) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/beans/JAXXIntrospector.java 2011-09-23 11:49:08 UTC (rev 2308) @@ -31,7 +31,6 @@ import java.beans.BeanDescriptor; import java.beans.BeanInfo; -import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyChangeListener; import java.beans.PropertyDescriptor; @@ -67,9 +66,8 @@ * * @param classDescriptor the class to introspect * @return the <code>JAXXBeanInfo</code> for the bean class - * @throws IntrospectionException if an error occurs */ - public static JAXXBeanInfo getJAXXBeanInfo(ClassDescriptor classDescriptor) throws IntrospectionException { + public static JAXXBeanInfo getJAXXBeanInfo(ClassDescriptor classDescriptor) { JAXXIntrospector introspector = new JAXXIntrospector(classDescriptor); return introspector.createBeanInfo(); } @@ -88,7 +86,7 @@ if (explicitBeanInfo != null) { PropertyDescriptor[] explicitProperties = explicitBeanInfo.getPropertyDescriptors(); for (PropertyDescriptor explicitProperty : explicitProperties) { - Class type = explicitProperty.getPropertyType(); + Class<?> type = explicitProperty.getPropertyType(); Method readMethod = explicitProperty.getReadMethod(); Method writeMethod = explicitProperty.getWriteMethod(); try { @@ -158,9 +156,10 @@ if (explicitBeanInfo != null) { BeanDescriptor explicitBeanDescriptor = explicitBeanInfo.getBeanDescriptor(); if (explicitBeanDescriptor != null) { - Enumeration/*<String>*/ attributeNames = explicitBeanDescriptor.attributeNames(); + Enumeration<String> attributeNames = + explicitBeanDescriptor.attributeNames(); while (attributeNames.hasMoreElements()) { - String name = (String) attributeNames.nextElement(); + String name = attributeNames.nextElement(); beanDescriptor.setValue(name, explicitBeanDescriptor.getValue(name)); } } @@ -173,7 +172,7 @@ private static BeanInfo getExplicitBeanInfo(ClassDescriptor classDescriptor) { try { - Class beanClass = Class.forName(classDescriptor.getName(), true, classDescriptor.getClassLoader()); // see if there is a class by that name in this package + Class<?> beanClass = Class.forName(classDescriptor.getName(), true, classDescriptor.getClassLoader()); // see if there is a class by that name in this package Method findExplicitBeanInfo = Introspector.class.getDeclaredMethod("findExplicitBeanInfo", new Class[]{Class.class}); findExplicitBeanInfo.setAccessible(true); return (BeanInfo) findExplicitBeanInfo.invoke(null, beanClass);

1 0

r2307 - in trunk/jaxx-demo/src: license main/java/jaxx/demo/feature/nav
by tchemit＠users.nuiton.org 23 Sep '11

23 Sep '11

Author: tchemit Date: 2011-09-23 13:26:38 +0200 (Fri, 23 Sep 2011) New Revision: 2307 Url: http://nuiton.org/repositories/revision/jaxx/2307 Log: fix compilation + optimize thrid parties Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java Modified: trunk/jaxx-demo/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-09-23 10:25:01 UTC (rev 2306) +++ trunk/jaxx-demo/src/license/THIRD-PARTY.properties 2011-09-23 11:26:38 UTC (rev 2307) @@ -1,7 +1,8 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD License +# - BSD +# - BSD style # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License @@ -9,13 +10,14 @@ # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jul 31 15:14:09 CEST 2011 -asm--asm--3.1--jar=http://asm.ow2.org/license.html -asm--asm-commons--3.1--jar=http://asm.ow2.org/license.html -asm--asm-tree--3.1--jar=http://asm.ow2.org/license.html -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javassist--javassist--3.8.0.GA--jar=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) +#Fri Sep 23 13:25:29 CEST 2011 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA=Lesser General Public License v2.1,Mozilla Public License 1.1 (MPL) Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2011-09-23 10:25:01 UTC (rev 2306) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2011-09-23 11:26:38 UTC (rev 2307) @@ -84,7 +84,7 @@ DecoratorProvider provider = contentUI.getContextValue(DecoratorProvider.class); JXPathDecorator<Movie> decorator = - (JXPathDecorator<Movie>) provider.getDecorator(Movie.class); + (JXPathDecorator<Movie>) provider.getDecoratorByType(Movie.class); contentUI.getListHeader().init(decorator, new ArrayList<Movie>()); } @@ -92,7 +92,7 @@ DecoratorProvider provider = contentUI.getContextValue(DecoratorProvider.class); JXPathDecorator<People> decorator = - (JXPathDecorator<People>) provider.getDecorator(People.class); + (JXPathDecorator<People>) provider.getDecoratorByType(People.class); contentUI.getListHeader().init(decorator, new ArrayList<People>()); }

1 0

r2306 - in trunk: . jaxx-demo jaxx-tutorial jaxx-tutorial-validation
by tchemit＠users.nuiton.org 23 Sep '11

23 Sep '11

Author: tchemit Date: 2011-09-23 12:25:01 +0200 (Fri, 23 Sep 2011) New Revision: 2306 Url: http://nuiton.org/repositories/revision/jaxx/2306 Log: use codehaus webstart plugin Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-09-23 10:10:33 UTC (rev 2305) +++ trunk/jaxx-demo/pom.xml 2011-09-23 10:25:01 UTC (rev 2306) @@ -326,7 +326,7 @@  <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -355,7 +355,7 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-09-23 10:10:33 UTC (rev 2305) +++ trunk/jaxx-tutorial/pom.xml 2011-09-23 10:25:01 UTC (rev 2306) @@ -197,7 +197,7 @@  <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -226,7 +226,7 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-09-23 10:10:33 UTC (rev 2305) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-09-23 10:25:01 UTC (rev 2306) @@ -283,7 +283,7 @@  <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -312,7 +312,7 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-23 10:10:33 UTC (rev 2305) +++ trunk/pom.xml 2011-09-23 10:25:01 UTC (rev 2306) @@ -457,17 +457,6 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> - </plugin> - - <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> @@ -479,14 +468,13 @@ </plugin> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <configuration> - <jnlp> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> + <gzip>true</gzip> + <unsign>true</unsign> + <canUnsign>false</canUnsign> + <pack200>true</pack200> <jnlpExtensions> <!--jnlpExtension> <name>sun</name>

1 0

r2305 - trunk
by tchemit＠users.nuiton.org 23 Sep '11

23 Sep '11

Author: tchemit Date: 2011-09-23 12:10:33 +0200 (Fri, 23 Sep 2011) New Revision: 2305 Url: http://nuiton.org/repositories/revision/jaxx/2305 Log: T?\195?\162che #1758: Updates to m-helper-p 1.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 17:24:10 UTC (rev 2304) +++ trunk/pom.xml 2011-09-23 10:10:33 UTC (rev 2305) @@ -96,7 +96,7 @@  <projectId>jaxx</projectId> - + <helperPluginVersion>1.3.1-SNAPSHOT</helperPluginVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion>

1 0

r2304 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:24:10 +0200 (Thu, 22 Sep 2011) New Revision: 2304 Url: http://nuiton.org/repositories/revision/jaxx/2304 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-20 11:27:33 UTC (rev 2303) +++ trunk/pom.xml 2011-09-22 17:24:10 UTC (rev 2304) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2303 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags
by tchemit＠users.nuiton.org 20 Sep '11

20 Sep '11

Author: tchemit Date: 2011-09-20 13:27:33 +0200 (Tue, 20 Sep 2011) New Revision: 2303 Url: http://nuiton.org/repositories/revision/jaxx/2303 Log: Evolution #1744: treat imageIcon as icon and actionIcon Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-09-17 12:48:19 UTC (rev 2302) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2011-09-20 11:27:33 UTC (rev 2303) @@ -73,6 +73,8 @@ public static final String ICON_ATTRIBUTE = "icon"; + public static final String ICON_IMAGE_ATTRIBUTE = "iconImage"; + public static final String NAME_ATTRIBUTE = "name"; public static final String WIDTH_ATTRIBUTE = "width"; @@ -327,6 +329,19 @@ stringValue = "{" + type + ".createImageIcon(\"" + stringValue + "\")}"; } } + } else if (ICON_IMAGE_ATTRIBUTE.equals(propertyName)) { + if (!(stringValue.startsWith("{") || stringValue.endsWith("}"))) { + // this is a customized icon, add the icon creation code +// compiler.setNeedSwingUtil(true); + String type = + compiler.getImportedType(SwingUtil.class); + + if (compiler.getConfiguration().isUseUIManagerForIcon()) { + stringValue = "{" + type + ".getUIManagerIcon(\"" + stringValue + "\").getImage()}"; + } else { + stringValue = "{" + type + ".createImageIcon(\"" + stringValue + "\").getImage()}"; + } + } } else if (ACTION_ICON_ATTRIBUTE.equals(propertyName)) { // customized actionIcon property if (stringValue.startsWith("{") && stringValue.endsWith("}")) {

1 0

r2302 - trunk
by tchemit＠users.nuiton.org 17 Sep '11

17 Sep '11

Author: tchemit Date: 2011-09-17 14:48:19 +0200 (Sat, 17 Sep 2011) New Revision: 2302 Url: http://nuiton.org/repositories/revision/jaxx/2302 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:06:01 UTC (rev 2301) +++ trunk/pom.xml 2011-09-17 12:48:19 UTC (rev 2302) @@ -97,7 +97,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <eugeneVersion>2.3.2</eugeneVersion> <xworkVersion>2.2.1.1</xworkVersion>

1 0

r2301 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:06:01 +0200 (Fri, 09 Sep 2011) New Revision: 2301 Url: http://nuiton.org/repositories/revision/jaxx/2301 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:15 UTC (rev 2300) +++ trunk/pom.xml 2011-09-09 16:06:01 UTC (rev 2301) @@ -116,6 +116,13 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> + + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> <dependencyManagement> <dependencies>

1 0

r2300 - trunk
by maven-release＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: maven-release Date: 2011-09-09 17:50:15 +0200 (Fri, 09 Sep 2011) New Revision: 2300 Url: http://nuiton.org/repositories/revision/jaxx/2300 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-19 16:29:02 UTC (rev 2299) +++ trunk/pom.xml 2011-09-09 15:50:15 UTC (rev 2300) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <artifactId>jaxx</artifactId>

1 0