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

[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