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

[Lutinutil-commits] r802 - trunk/maven-commandline-plugin/src/resources/META-INF/services
by tchemit＠users.labs.libre-entreprise.org June 30, 2008

June 30, 2008

Author: tchemit Date: 2008-06-30 17:56:31 +0000 (Mon, 30 Jun 2008) New Revision: 802 Modified: trunk/maven-commandline-plugin/src/resources/META-INF/services/org.apache.commons.logging.LogFactory Log: try to use a commons factory with no X121 dependencies Modified: trunk/maven-commandline-plugin/src/resources/META-INF/services/org.apache.commons.logging.LogFactory =================================================================== --- trunk/maven-commandline-plugin/src/resources/META-INF/services/org.apache.commons.logging.LogFactory 2008-06-12 09:29:35 UTC (rev 801) +++ trunk/maven-commandline-plugin/src/resources/META-INF/services/org.apache.commons.logging.LogFactory 2008-06-30 17:56:31 UTC (rev 802) @@ -1 +1 @@ -org.codelutin.util.LutinLogFactory \ No newline at end of file +org.apache.commons.logging.impl.LogFactoryImpl \ No newline at end of file

1 0

[Lutinutil-commits] r801 - trunk/lutinutil
by chatellier＠users.labs.libre-entreprise.org June 12, 2008

June 12, 2008

Author: chatellier Date: 2008-06-12 09:29:35 +0000 (Thu, 12 Jun 2008) New Revision: 801 Modified: trunk/lutinutil/pom.xml Log: Update commons-collections Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-05-14 16:56:40 UTC (rev 800) +++ trunk/lutinutil/pom.xml 2008-06-12 09:29:35 UTC (rev 801) @@ -97,7 +97,7 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> + <version>3.2.1</version> <scope>compile</scope> </dependency>

1 0

[Lutinutil-commits] r800 - branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config
by tchemit＠users.labs.libre-entreprise.org May 14, 2008

May 14, 2008

Author: tchemit Date: 2008-05-14 16:56:40 +0000 (Wed, 14 May 2008) New Revision: 800 Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Property.java Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java Log: propri?\195?\169t?\195?\169 typ?\195?\169 + r?\195?\169cup?\195?\169ration Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java 2008-05-13 23:02:14 UTC (rev 799) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java 2008-05-14 16:56:40 UTC (rev 800) @@ -20,16 +20,26 @@ * @author chemit * @see IdentityConfig */ -public enum IdentityConfigProperty { +public enum IdentityConfigProperty implements Property{ /** property <code>name</code>, first name of user */ - firstName, + firstName(String.class), /** property <code>type</code>, lastname of user */ - lastName, + lastName(String.class), /** property <code>email</code>, email of user */ - email + email(String.class); + private Class<?> type; + //TODO add locale + encoding + + public Class<?> getType() { + return type; + } + + IdentityConfigProperty(Class<?> type) { + this.type = type; + } } \ No newline at end of file Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Property.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Property.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Property.java 2008-05-14 16:56:40 UTC (rev 800) @@ -0,0 +1,21 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util.config; + +/** @author chemit */ +public interface Property { + + Class<?> getType(); +} Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-05-13 23:02:14 UTC (rev 799) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-05-14 16:56:40 UTC (rev 800) @@ -15,6 +15,7 @@ package org.codelutin.util.config; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,10 +68,13 @@ } public void setProperty(E key, Object value) { - if (value == null && properties.containsKey(key)) { - // never keep a reference on a null value property - properties.remove(key); + if (value == null) { + if (properties.containsKey(key)) { + // never keep a reference on a null value property + properties.remove(key); + } } else { + log.info("key:" + key + ", value:" + value + ", type:" + value.getClass().getSimpleName()); properties.put(key, value); } } @@ -84,7 +88,7 @@ for (E key : keys) { Object value = null; try { - value = BeanUtils.getProperty(src, key.name()); + value = BeanUtilsBean.getInstance().getPropertyUtils().getProperty(src, key.name()); setProperty(key, value); } catch (Exception e) { //TODO

1 0

[Lutinutil-commits] r799 - branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 23:02:14 +0000 (Tue, 13 May 2008) New Revision: 799 Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java Log: use EnumSet instead of Set Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-05-13 22:48:44 UTC (rev 798) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-05-13 23:02:14 UTC (rev 799) @@ -15,7 +15,6 @@ package org.codelutin.util.config; import java.util.EnumMap; -import java.util.Set; import java.util.EnumSet; /** @@ -29,7 +28,7 @@ Object getProperty(E key); - Set<E> getUniverse(); + EnumSet<E> getUniverse(); void setProperties(EnumMap<E, Object> properties);

1 0

[Lutinutil-commits] r798 - branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config
by tchemit＠users.labs.libre-entreprise.org May 13, 2008

May 13, 2008

Author: tchemit Date: 2008-05-13 22:48:44 +0000 (Tue, 13 May 2008) New Revision: 798 Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java Log: permettre de choisir les propri?\195?\169t?\195?\169s ?\195?\160 binder r?\195?\169cup?\195?\169ration de la valeur d'une propri?\195?\169t?\195?\169 Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-05-13 12:25:15 UTC (rev 797) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-05-13 22:48:44 UTC (rev 798) @@ -16,6 +16,7 @@ import java.util.EnumMap; import java.util.Set; +import java.util.EnumSet; /** * config contract based on a Enum to obtain properties @@ -26,6 +27,8 @@ EnumMap<E, Object> getProperties(); + Object getProperty(E key); + Set<E> getUniverse(); void setProperties(EnumMap<E, Object> properties); @@ -34,6 +37,11 @@ void copyFrom(Object src); + void copyFrom(Object src, EnumSet<E> keys); + void copyTo(Object dst); + void copyTo(Object dst, EnumSet<E> keys); + + } \ No newline at end of file Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-05-13 12:25:15 UTC (rev 797) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-05-13 22:48:44 UTC (rev 798) @@ -18,10 +18,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.lang.reflect.InvocationTargetException; import java.util.EnumMap; +import java.util.EnumSet; import java.util.Map; -import java.util.Set; /** * simple config implementation based on a Enum to obtain properties @@ -34,11 +33,14 @@ protected EnumMap<E, Object> properties; - protected final Set<E> universe; + protected final EnumSet<E> universe; + protected final Class<E> klass; + public SimpleConfig(Class<E> klass) { + this.klass = klass; this.properties = new EnumMap<E, Object>(klass); - this.universe = java.util.Collections.unmodifiableSet(java.util.EnumSet.allOf(klass)); + this.universe = java.util.EnumSet.allOf(klass); } public SimpleConfig(Class<E> klass, EnumMap<E, Object> properties) { @@ -50,7 +52,11 @@ return properties.clone(); } - public Set<E> getUniverse() { + public Object getProperty(E key) { + return properties.get(key); + } + + public EnumSet<E> getUniverse() { return universe; } @@ -69,36 +75,38 @@ } } + @SuppressWarnings({"unchecked"}) public void copyFrom(Object src) { - for (E key : universe) { + copyFrom(src, getUniverse()); + } + + public void copyFrom(Object src, EnumSet<E> keys) { + for (E key : keys) { Object value = null; try { value = BeanUtils.getProperty(src, key.name()); setProperty(key, value); - } catch (IllegalAccessException e) { + } catch (Exception e) { //TODO log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); - } catch (InvocationTargetException e) { - //TODO - log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); - } catch (NoSuchMethodException e) { - //TODO - log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); } } } public void copyTo(Object dst) { - for (E key : universe) { + copyTo(dst, getUniverse()); + } + + + public void copyTo(Object dst, EnumSet<E> keys) { + for (E key : keys) { Object value = properties.get(key); try { + log.info("save " + key); BeanUtils.setProperty(dst, key.name(), value); - } catch (IllegalAccessException e) { + } catch (Exception e) { //TODO log.warn("could not set property <" + key + ":" + value + "> to object " + dst, e); - } catch (InvocationTargetException e) { - //TODO - log.warn("could not set property <" + key + ":" + value + "> to object " + dst, e); } } } @@ -115,4 +123,5 @@ } return super.toString() + '<' + sb.toString().substring(2) + '>'; } + }

1 0

[Lutinutil-commits] r796 - trunk/lutinutil/src/java/org/codelutin/util
by thimel＠users.labs.libre-entreprise.org April 28, 2008

April 28, 2008

Author: thimel Date: 2008-04-28 13:47:10 +0000 (Mon, 28 Apr 2008) New Revision: 796 Modified: trunk/lutinutil/src/java/org/codelutin/util/Resource.java Log: Added getURLOrNull when no ressource found by the normal way in getConfigProperties Modified: trunk/lutinutil/src/java/org/codelutin/util/Resource.java =================================================================== --- trunk/lutinutil/src/java/org/codelutin/util/Resource.java 2008-04-27 12:50:56 UTC (rev 795) +++ trunk/lutinutil/src/java/org/codelutin/util/Resource.java 2008-04-28 13:47:10 UTC (rev 796) @@ -178,6 +178,9 @@ if (inClasspath == null) { inClasspath = Resource.class.getResource(filename); } + if (inClasspath == null) { + inClasspath = getURLOrNull(filename); + } if(inClasspath != null){ log.info("Chargement du fichier de config: " + inClasspath); result.load(inClasspath.openStream());

1 0

[Lutinutil-commits] r795 - branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 12:50:56 +0000 (Sun, 27 Apr 2008) New Revision: 795 Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java Log: copy all properties, not only non null, introduce universe of config properties Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-04-27 12:40:27 UTC (rev 794) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-04-27 12:50:56 UTC (rev 795) @@ -20,6 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.EnumMap; +import java.util.EnumSet; +import java.util.Map; /** * simple config implementation based on a Enum to obtain properties @@ -28,12 +30,15 @@ */ public class SimpleConfig<E extends Enum<E>> implements Config<E> { - static protected final Log log = LogFactory.getLog(SimpleConfig.class); + static protected final Log log = LogFactory.getLog(Config.class); - protected java.util.EnumMap<E, Object> properties; + protected EnumMap<E, Object> properties; + protected final EnumSet<E> universe; + public SimpleConfig(Class<E> klass) { - this.properties = new java.util.EnumMap<E, Object>(klass); + this.properties = new EnumMap<E, Object>(klass); + this.universe = java.util.EnumSet.allOf(klass); } public SimpleConfig(Class<E> klass, EnumMap<E, Object> properties) { @@ -41,12 +46,12 @@ setProperties(properties); } - public java.util.EnumMap<E, Object> getProperties() { + public EnumMap<E, Object> getProperties() { return properties.clone(); } - public void setProperties(java.util.EnumMap<E, Object> properties) { - for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + public void setProperties(EnumMap<E, Object> properties) { + for (Map.Entry<E, Object> entry : properties.entrySet()) { setProperty(entry.getKey(), entry.getValue()); } } @@ -61,36 +66,35 @@ } public void copyFrom(Object src) { - for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { - E key = entry.getKey(); + for (E key : universe) { + Object value = null; try { - Object value = BeanUtils.getProperty(src, key.name()); + value = BeanUtils.getProperty(src, key.name()); setProperty(key, value); } catch (IllegalAccessException e) { //TODO - log.warn("could not retreave property " + key + " on object " + src, e); + log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); } catch (InvocationTargetException e) { //TODO - log.warn("could not retreave property " + key + " on object " + src, e); + log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); } catch (NoSuchMethodException e) { //TODO - log.warn("could not retreave property " + key + " on object " + src, e); + log.warn("could not retreave property <" + key + ":" + value + "> on object " + src, e); } - } } public void copyTo(Object dst) { - for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { - Object value = entry.getValue(); + for (E key : universe) { + Object value = properties.get(key); try { - BeanUtils.setProperty(dst, entry.getKey().name(), value); + BeanUtils.setProperty(dst, key.name(), value); } catch (IllegalAccessException e) { //TODO - log.warn("could not set property " + entry.getKey() + " to object " + dst, e); + log.warn("could not set property <" + key + ":" + value + "> to object " + dst, e); } catch (InvocationTargetException e) { //TODO - log.warn("could not set property " + entry.getKey() + " to object " + dst, e); + log.warn("could not set property <" + key + ":" + value + "> to object " + dst, e); } } } @@ -101,7 +105,7 @@ if (properties.isEmpty()) { sb.append(" empty"); } else { - for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + for (Map.Entry<E, Object> entry : properties.entrySet()) { sb.append(", ").append(entry.getKey()).append(':').append(entry.getValue()); } }

1 0

[Lutinutil-commits] r794 - branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 12:40:27 +0000 (Sun, 27 Apr 2008) New Revision: 794 Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java Log: add copyFrom and copyTo method to bind config to another object via introspection. add constructor Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-04-27 12:00:51 UTC (rev 793) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-04-27 12:40:27 UTC (rev 794) @@ -29,4 +29,8 @@ void setProperty(E key, Object value); + void copyFrom(Object src); + + void copyTo(Object dst); + } \ No newline at end of file Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-04-27 12:00:51 UTC (rev 793) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-04-27 12:40:27 UTC (rev 794) @@ -14,8 +14,13 @@ */ package org.codelutin.util.config; -import org.codelutin.util.config.Config; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import java.lang.reflect.InvocationTargetException; +import java.util.EnumMap; + /** * simple config implementation based on a Enum to obtain properties * @@ -23,12 +28,19 @@ */ public class SimpleConfig<E extends Enum<E>> implements Config<E> { + static protected final Log log = LogFactory.getLog(SimpleConfig.class); + protected java.util.EnumMap<E, Object> properties; public SimpleConfig(Class<E> klass) { this.properties = new java.util.EnumMap<E, Object>(klass); } + public SimpleConfig(Class<E> klass, EnumMap<E, Object> properties) { + this(klass); + setProperties(properties); + } + public java.util.EnumMap<E, Object> getProperties() { return properties.clone(); } @@ -41,12 +53,48 @@ public void setProperty(E key, Object value) { if (value == null && properties.containsKey(key)) { + // never keep a reference on a null value property properties.remove(key); } else { properties.put(key, value); } } + public void copyFrom(Object src) { + for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + E key = entry.getKey(); + try { + Object value = BeanUtils.getProperty(src, key.name()); + setProperty(key, value); + } catch (IllegalAccessException e) { + //TODO + log.warn("could not retreave property " + key + " on object " + src, e); + } catch (InvocationTargetException e) { + //TODO + log.warn("could not retreave property " + key + " on object " + src, e); + } catch (NoSuchMethodException e) { + //TODO + log.warn("could not retreave property " + key + " on object " + src, e); + } + + } + } + + public void copyTo(Object dst) { + for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + Object value = entry.getValue(); + try { + BeanUtils.setProperty(dst, entry.getKey().name(), value); + } catch (IllegalAccessException e) { + //TODO + log.warn("could not set property " + entry.getKey() + " to object " + dst, e); + } catch (InvocationTargetException e) { + //TODO + log.warn("could not set property " + entry.getKey() + " to object " + dst, e); + } + } + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); Modified: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java 2008-04-27 12:00:51 UTC (rev 793) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java 2008-04-27 12:40:27 UTC (rev 794) @@ -18,6 +18,8 @@ import static org.codelutin.util.config.IdentityConfigProperty.firstName; import static org.codelutin.util.config.IdentityConfigProperty.lastName; +import java.util.EnumMap; + /** @author chemit */ public class SimpleIdentityConfig extends SimpleConfig<IdentityConfigProperty> implements IdentityConfig { @@ -32,6 +34,10 @@ setEmail(email); } + public SimpleIdentityConfig(EnumMap<IdentityConfigProperty, Object> properties) { + super(IdentityConfigProperty.class, properties); + } + public String getFirstName() { return (String) properties.get(firstName); }

1 0

[Lutinutil-commits] r793 - in branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util: . config
by tchemit＠users.labs.libre-entreprise.org April 27, 2008

April 27, 2008

Author: tchemit Date: 2008-04-27 12:00:51 +0000 (Sun, 27 Apr 2008) New Revision: 793 Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfig.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java Log: add config based on an Enum of properties add identity config and his implentation Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/Config.java 2008-04-27 12:00:51 UTC (rev 793) @@ -0,0 +1,32 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util.config; + +import java.util.EnumMap; + +/** + * config contract based on a Enum to obtain properties + * + * @author chemit + */ +public interface Config<E extends Enum<E>> { + + EnumMap<E, Object> getProperties(); + + void setProperties(EnumMap<E, Object> properties); + + void setProperty(E key, Object value); + +} \ No newline at end of file Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfig.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfig.java 2008-04-27 12:00:51 UTC (rev 793) @@ -0,0 +1,37 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util.config; + + +/** + * Definition of an identity + * + * @author chemit + */ +public interface IdentityConfig extends Config<IdentityConfigProperty> { + + String getFirstName(); + + String getLastName(); + + String getEmail(); + + void setFirstName(String firstName); + + void setLastName(String lastName); + + void setEmail(String email); + +} \ No newline at end of file Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/IdentityConfigProperty.java 2008-04-27 12:00:51 UTC (rev 793) @@ -0,0 +1,35 @@ +/** + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##% + */ +package org.codelutin.util.config; + +/** + * Enumaration of properties to be used in a {@link org.codelutin.util.config.IdentityConfig} + * + * @author chemit + * @see IdentityConfig + */ +public enum IdentityConfigProperty { + + /** property <code>name</code>, first name of user */ + firstName, + + /** property <code>type</code>, lastname of user */ + lastName, + + /** property <code>email</code>, email of user */ + email + + //TODO add locale + encoding +} \ No newline at end of file Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleConfig.java 2008-04-27 12:00:51 UTC (rev 793) @@ -0,0 +1,62 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util.config; + +import org.codelutin.util.config.Config; + +/** + * simple config implementation based on a Enum to obtain properties + * + * @author chemit + */ +public class SimpleConfig<E extends Enum<E>> implements Config<E> { + + protected java.util.EnumMap<E, Object> properties; + + public SimpleConfig(Class<E> klass) { + this.properties = new java.util.EnumMap<E, Object>(klass); + } + + public java.util.EnumMap<E, Object> getProperties() { + return properties.clone(); + } + + public void setProperties(java.util.EnumMap<E, Object> properties) { + for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + setProperty(entry.getKey(), entry.getValue()); + } + } + + public void setProperty(E key, Object value) { + if (value == null && properties.containsKey(key)) { + properties.remove(key); + } else { + properties.put(key, value); + } + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + if (properties.isEmpty()) { + sb.append(" empty"); + } else { + for (java.util.Map.Entry<E, Object> entry : properties.entrySet()) { + sb.append(", ").append(entry.getKey()).append(':').append(entry.getValue()); + } + } + return super.toString() + '<' + sb.toString().substring(2) + '>'; + } +} Added: branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java =================================================================== --- branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java (rev 0) +++ branches/lutinutil-sans-vcs/lutinutil/src/java/org/codelutin/util/config/SimpleIdentityConfig.java 2008-04-27 12:00:51 UTC (rev 793) @@ -0,0 +1,59 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util.config; + +import static org.codelutin.util.config.IdentityConfigProperty.email; +import static org.codelutin.util.config.IdentityConfigProperty.firstName; +import static org.codelutin.util.config.IdentityConfigProperty.lastName; + +/** @author chemit */ +public class SimpleIdentityConfig extends SimpleConfig<IdentityConfigProperty> implements IdentityConfig { + + public SimpleIdentityConfig() { + super(IdentityConfigProperty.class); + } + + public SimpleIdentityConfig(String firstName, String lastName, String email) { + this(); + setFirstName(firstName); + setLastName(lastName); + setEmail(email); + } + + public String getFirstName() { + return (String) properties.get(firstName); + } + + public String getLastName() { + return (String) properties.get(lastName); + } + + public String getEmail() { + return (String) properties.get(email); + } + + public void setFirstName(String newFirstName) { + setProperty(firstName, newFirstName); + } + + public void setLastName(String newLastName) { + setProperty(lastName, newLastName); + } + + public void setEmail(String newEmail) { + setProperty(email, newEmail); + } + +}

1 0

[Lutinutil-commits] r792 - branches/lutinutil-sans-vcs/lutinutil
by tchemit＠users.labs.libre-entreprise.org April 18, 2008

April 18, 2008

Author: tchemit Date: 2008-04-18 17:19:08 +0000 (Fri, 18 Apr 2008) New Revision: 792 Modified: branches/lutinutil-sans-vcs/lutinutil/ Log: svn ignore Property changes on: branches/lutinutil-sans-vcs/lutinutil ___________________________________________________________________ Name: svn:ignore - target velocity.log maven.log .eclipse .classpath lutinutil.iml lutinutil.ipr + target velocity.log maven.log .eclipse .classpath lutinutil.iml lutinutil.ipr lutinutil.iws

1 0