- Nuiton-utils-commits - mailman.cloud.codelutin.com

r1965 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 07 Dec '10

07 Dec '10

Author: bpoussin Date: 2010-12-07 01:42:17 +0100 (Tue, 07 Dec 2010) New Revision: 1965 Url: http://nuiton.org/repositories/revision/nuiton-utils/1965 Log: add new constructor that take filename as argument and call parse Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-07 00:35:41 UTC (rev 1964) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-12-07 00:42:17 UTC (rev 1965) @@ -591,6 +591,18 @@ } /** + * Create WikittyConfig and load particular configuration filename, parse + * method is automaticaly called + * + * @param configFilename name of wikitty config file + */ + public ApplicationConfig(String configFilename) throws ArgumentsParserException { + this(); + parse(new String[]{ + "--option", ApplicationConfig.CONFIG_FILE_NAME, configFilename}); + } + + /** * Init ApplicationConfig with current simple class name as config file * and use Properties parameter as defaults *

1 0

r1964 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 07 Dec '10

07 Dec '10

Author: bpoussin Date: 2010-12-07 01:35:41 +0100 (Tue, 07 Dec 2010) New Revision: 1964 Url: http://nuiton.org/repositories/revision/nuiton-utils/1964 Log: add substring javadoc Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-12-02 14:23:21 UTC (rev 1963) +++ trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-12-07 00:35:41 UTC (rev 1964) @@ -198,11 +198,32 @@ return result; } + /** + * substring from begin to end of s + * + * example: + * <li> substring("tatetitotu", -4) => totu + * + * @param s + * @param begin if begin &lt 0 then begin start at end of string - begin + * @return + */ static public String substring(String s, int begin) { String result = substring(s, begin, s.length()); return result; } + /** + * substring from begin to end of s + * + * example: + * <li> substring("tatetitotu", -4, -2) => to + * + * @param s + * @param begin if begin < 0 then begin start at end of string - begin + * @param end if end < 0 then end start at end of string - end + * @return + */ static public String substring(String s, int begin, int end) { if (begin < 0) { begin = s.length() + begin;

1 0

r1963 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 02 Dec '10

02 Dec '10

Author: bpoussin Date: 2010-12-02 15:23:21 +0100 (Thu, 02 Dec 2010) New Revision: 1963 Url: http://nuiton.org/repositories/revision/nuiton-utils/1963 Log: in choiceArguement method break when one object is found to return immediatly Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 09:42:21 UTC (rev 1962) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 14:23:21 UTC (rev 1963) @@ -136,9 +136,11 @@ // cas on l'on trouve une class dans arg qui une fois instancier convient result = newInstance((Class) o, args, nullIfMissing); addResult = true; + break; } else if (clazz.isInstance(o)) { // cas on l'on retrouve un objet assignable pour ce type result = o; + break; } } }

1 0

r1962 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 02 Dec '10

02 Dec '10

Author: bpoussin Date: 2010-12-02 10:42:21 +0100 (Thu, 02 Dec 2010) New Revision: 1962 Url: http://nuiton.org/repositories/revision/nuiton-utils/1962 Log: keep in available object, object created to prevent multiple instanciation Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 01:03:40 UTC (rev 1961) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 09:42:21 UTC (rev 1962) @@ -54,6 +54,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; @@ -93,12 +94,16 @@ if (constructors.length != 1) { throw new IllegalArgumentException(_("Your class %s has more than one constructor", clazz)); } + + // copy collection into modifiable list to add new object + List container = new LinkedList(args); + Constructor<E> constructor = constructors[0]; Class[] paramTypes = constructor.getParameterTypes(); Object[] params = new Object[paramTypes.length]; for (int i=0; i<paramTypes.length; i++) { - Object o = choiceArgument(paramTypes[i], args, nullIfMissing); + Object o = choiceArgument(paramTypes[i], container, nullIfMissing); params[i] = o; } @@ -122,13 +127,15 @@ * @param nullIfMissing * @return */ - static protected Object choiceArgument(Class clazz, Collection args, boolean nullIfMissing) { + static protected Object choiceArgument(Class clazz, List args, boolean nullIfMissing) { Object result = null; + boolean addResult = false; for (Object o : args) { if (o != null) { if ((o instanceof Class) && clazz.isAssignableFrom((Class) o)) { // cas on l'on trouve une class dans arg qui une fois instancier convient result = newInstance((Class) o, args, nullIfMissing); + addResult = true; } else if (clazz.isInstance(o)) { // cas on l'on retrouve un objet assignable pour ce type result = o; @@ -136,6 +143,13 @@ } } + if (addResult) { + // on ajoute en tete pour qu'il soit retrouve dans les premiers + // et non pas reinstancier une nouvelle fois si on en a besoin + // a nouveau + args.add(0, result); + } + // si on ne retrouve rien, result est reste a null if (result == null && !nullIfMissing) { throw new IllegalArgumentException(_(

1 0

r1961 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 02 Dec '10

02 Dec '10

Author: bpoussin Date: 2010-12-02 02:03:40 +0100 (Thu, 02 Dec 2010) New Revision: 1961 Url: http://nuiton.org/repositories/revision/nuiton-utils/1961 Log: add new method newInstance that try to find argument for constructor in collection of object and class Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-11-29 20:12:17 UTC (rev 1960) +++ trunk/src/main/java/org/nuiton/util/ObjectUtil.java 2010-12-02 01:03:40 UTC (rev 1961) @@ -53,6 +53,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; @@ -77,6 +78,73 @@ private ObjectUtil() {} /** + * Invoke constructor on clazz to create new instance. Try to find argument + * for constructor in args parameter. + * + * @param clazz class of object to instanciate + * @param args all possible parameter that constructor can used + * @param nullIfMissing if no suitable class or object found in args, + * use null value (no exception) + * @return new instance + * @throws IllegalArgumentException if something is wrong during instanciation + */ + static public <E> E newInstance(Class<E> clazz, Collection args, boolean nullIfMissing) { + Constructor<E>[] constructors = (Constructor<E>[])clazz.getConstructors(); + if (constructors.length != 1) { + throw new IllegalArgumentException(_("Your class %s has more than one constructor", clazz)); + } + Constructor<E> constructor = constructors[0]; + Class[] paramTypes = constructor.getParameterTypes(); + Object[] params = new Object[paramTypes.length]; + + for (int i=0; i<paramTypes.length; i++) { + Object o = choiceArgument(paramTypes[i], args, nullIfMissing); + params[i] = o; + } + + try { + E result = constructor.newInstance(params); + return result; + } catch (Exception eee) { + throw new IllegalArgumentException(_( + "Class %s can't be instanciated with %s", + clazz, Arrays.toString(params)), eee); + } + } + + /** + * Permet de matcher un type d'agument attendu clazz parmi un ensemble + * possible de candidat. Les candidats peuvent etre des classes qu'il faudra + * instancier pour satisfaire le type demande. + * + * @param clazz + * @param args + * @param nullIfMissing + * @return + */ + static protected Object choiceArgument(Class clazz, Collection args, boolean nullIfMissing) { + Object result = null; + for (Object o : args) { + if (o != null) { + if ((o instanceof Class) && clazz.isAssignableFrom((Class) o)) { + // cas on l'on trouve une class dans arg qui une fois instancier convient + result = newInstance((Class) o, args, nullIfMissing); + } else if (clazz.isInstance(o)) { + // cas on l'on retrouve un objet assignable pour ce type + result = o; + } + } + } + + // si on ne retrouve rien, result est reste a null + if (result == null && !nullIfMissing) { + throw new IllegalArgumentException(_( + "Can't find assignable argument for %s in %s", clazz, args)); + } + return result; + } + + /** * Create new object from string like org.nuiton.Toto(name=machine, int=10) * where machine and int is properties on org.nuiton.Toto object. * Conversion between 10 in string and 10 as integer as automaticaly done

1 0

r1960 - trunk
by tchemit＠users.nuiton.org 29 Nov '10

29 Nov '10

Author: tchemit Date: 2010-11-29 21:12:17 +0100 (Mon, 29 Nov 2010) New Revision: 1960 Url: http://nuiton.org/repositories/revision/nuiton-utils/1960 Log: Evolution #1065: Updates to i18n 2.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-23 11:34:08 UTC (rev 1959) +++ trunk/pom.xml 2010-11-29 20:12:17 UTC (rev 1960) @@ -115,7 +115,7 @@ <properties> - <nuitonI18nVersion>2.0</nuitonI18nVersion> + <nuitonI18nVersion>2.0.1-SNAPSHOT</nuitonI18nVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1959 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 23 Nov '10

23 Nov '10

Author: sletellier Date: 2010-11-23 12:34:08 +0100 (Tue, 23 Nov 2010) New Revision: 1959 Url: http://nuiton.org/repositories/revision/nuiton-utils/1959 Log: Remove SNAPSHOT version Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-11-23 10:32:58 UTC (rev 1958) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-11-23 11:34:08 UTC (rev 1959) @@ -507,7 +507,7 @@ * caracteriser une action. * * @author sletellier - * @since 1.5.2-SNAPSHOT + * @since 1.5.2 */ public interface ActionDef extends Serializable {

1 0

r1958 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 23 Nov '10

23 Nov '10

Author: sletellier Date: 2010-11-23 11:32:58 +0100 (Tue, 23 Nov 2010) New Revision: 1958 Url: http://nuiton.org/repositories/revision/nuiton-utils/1958 Log: - Add loadDefaultOptions method to load all options extends OptionDef - Add interface ActionDef - Add loadActions to load actions extends ActionDef Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-11-22 14:09:46 UTC (rev 1957) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-11-23 10:32:58 UTC (rev 1958) @@ -379,6 +379,38 @@ protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); /** + * Load default options of enum pass in param (enum must extend {@link OptionDef}) + * + * @param optionClass to load + * @param <O> type of enum extend {@link OptionDef} + */ + protected <O extends OptionDef> void loadDefaultOptions(Class<O> optionClass) { + + // load default option (included configuration file name : important) + for (O o : optionClass.getEnumConstants()) { + if (o.getDefaultValue() != null) { + setDefaultOption(o.getKey(), o.getDefaultValue()); + } + } + } + + /** + * Load actions of enum pass in param (enum must extend {@link ActionDef}) + * + * @param actionClass to load + * @param <A> type of enum extend {@link ActionDef} + */ + protected <A extends ActionDef> void loadActions(Class<A> actionClass) { + + // load actions + for (A a : actionClass.getEnumConstants()) { + for (String alias : a.getAliases()) { + addActionAlias(alias, a.getAction()); + } + } + } + + /** * Action to save user configuration. * <p/> * Add it as a listener of the configuration for a given property. @@ -471,6 +503,26 @@ } /** + * Le contrat de marquage des action, on utilise cette interface pour + * caracteriser une action. + * + * @author sletellier + * @since 1.5.2-SNAPSHOT + */ + public interface ActionDef extends Serializable { + + /** + * @return action to run + */ + String getAction(); + + /** + * @return aliases used to execute action + */ + String[] getAliases(); + } + + /** * Defines a runtime action to be launched via the {@link #doAction()} * method. *

1 0

r1957 - trunk
by tchemit＠users.nuiton.org 22 Nov '10

22 Nov '10

Author: tchemit Date: 2010-11-22 15:09:46 +0100 (Mon, 22 Nov 2010) New Revision: 1957 Url: http://nuiton.org/repositories/revision/nuiton-utils/1957 Log: use i18n 2.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:30:43 UTC (rev 1956) +++ trunk/pom.xml 2010-11-22 14:09:46 UTC (rev 1957) @@ -115,7 +115,7 @@ <properties> - <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1956 - trunk
by tchemit＠users.nuiton.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:30:43 +0100 (Sun, 21 Nov 2010) New Revision: 1956 Url: http://nuiton.org/repositories/revision/nuiton-utils/1956 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 07:50:39 UTC (rev 1955) +++ trunk/pom.xml 2010-11-21 14:30:43 UTC (rev 1956) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0