jdillon 2003/08/29 14:40:49
Modified: modules/common/src/java/org/apache/geronimo/common/propertyeditor
PropertyEditors.java
Added: modules/common/src/java/org/apache/geronimo/common/propertyeditor
ArrayPropertyEditorAdapter.java
Log:
o Added generic support for editing array types if there is an editor for
the component type registered
Revision Changes Path
1.3 +13 -2
incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
Index: PropertyEditors.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertyEditors.java 28 Aug 2003 10:16:39 -0000 1.2
+++ PropertyEditors.java 29 Aug 2003 21:40:49 -0000 1.3
@@ -101,7 +101,18 @@
throw new NullArgumentException("type");
}
- return PropertyEditorManager.findEditor(type);
+ PropertyEditor editor = PropertyEditorManager.findEditor(type);
+
+ // Try to use adapter for array types
+ if (editor == null && type.isArray()) {
+ Class ctype = type.getComponentType();
+ editor = findEditor(ctype);
+ if (editor != null) {
+ editor = new ArrayPropertyEditorAdapter(ctype, editor);
+ }
+ }
+
+ return editor;
}
/**
1.1
incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/propertyeditor/ArrayPropertyEditorAdapter.java
Index: ArrayPropertyEditorAdapter.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.common.propertyeditor;
import java.util.LinkedList;
import java.util.List;
import java.beans.PropertyEditor;
import java.lang.reflect.Array;
import org.apache.geronimo.common.NullArgumentException;
/**
* Adapter for editing array types.
*
* @version $Revision: 1.1 $ $Date: 2003/08/29 21:40:49 $
*/
public class ArrayPropertyEditorAdapter
extends ArrayPropertyEditorSupport
{
protected Class type;
protected PropertyEditor editor;
public ArrayPropertyEditorAdapter(final Class type, final PropertyEditor
editor)
{
if (type == null) {
throw new NullArgumentException("type");
}
if (editor == null) {
throw new NullArgumentException("editor");
}
this.type = type;
this.editor = editor;
}
protected Object convertValue(final String value) throws Exception
{
assert value != null;
editor.setAsText(value);
return editor.getValue();
}
protected Object createArray(final List list)
{
assert list != null;
int len = list.size();
Object array = Array.newInstance(type, len);
for (int i=0; i<len; i++) {
Array.set(array, i, list.get(i));
}
return array;
}
}
