Merge pull request #7 from baranowb/Generic-Array-PE

Generic Array Property editor
jboss · Apr 3, 2012 · 4aa37c0 · 4aa37c0
2 parents a8c4243 + 7f08cb1
commit 4aa37c0
Show file tree

Hide file tree

Showing 17 changed files with 262 additions and 588 deletions.
diff --git a/src/main/java/org/jboss/common/beans/property/ArrayPropertyEditorSupport.java b/src/main/java/org/jboss/common/beans/property/ArrayPropertyEditorSupport.java
diff --git a/src/main/java/org/jboss/common/beans/property/BooleanArrayEditor.java b/src/main/java/org/jboss/common/beans/property/BooleanArrayEditor.java
@@ -27,42 +27,14 @@
  *
  * @author baranowb
  */
-public class BooleanArrayEditor extends ArrayPropertyEditorSupport<boolean[]> {
+public class BooleanArrayEditor extends GenericArrayPropertyEditor<boolean[]> {
 
     public BooleanArrayEditor() {
         super(boolean[].class);
     }
 
     private static final String[] BOOLEAN_TAGS = { "true", "false" };
 
-    /**
-     * Build a boolean[] from comma or eol seperated elements
-     *
-     */
-    @Override
-    public void setAsText(final String text) {
-        if (PropertyEditors.isNull(text)) {
-            setValue(null);
-            return;
-        }
-        String[] tokens = super.tokenize(text);
-        boolean[] theValue = new boolean[tokens.length];
-
-        for (int index = 0; index < tokens.length; index++) {
-            theValue[index] = Boolean.parseBoolean(tokens[index]);
-        }
-        setValue(theValue);
-    }
-
-    /**
-     * @return a comma seperated string of the array elements
-     */
-    @Override
-    public String getAsText() {
-        boolean[] theValue = (boolean[]) getValue();
-        return super.encode(theValue);
-    }
-
     @Override
     public String[] getTags() {
         return BOOLEAN_TAGS;

diff --git a/src/main/java/org/jboss/common/beans/property/ByteArrayEditor.java b/src/main/java/org/jboss/common/beans/property/ByteArrayEditor.java
@@ -26,41 +26,9 @@
  *
  * @author baranowb
  */
-public class ByteArrayEditor extends ArrayPropertyEditorSupport<byte[]> {
+public class ByteArrayEditor extends GenericArrayPropertyEditor<byte[]> {
 
     public ByteArrayEditor() {
         super(byte[].class);
     }
-
-    /**
-     * Build a byte[] from comma or eol seperated elements
-     *
-     */
-    @Override
-    public void setAsText(final String text) {
-        if (PropertyEditors.isNull(text)) {
-            setValue(null);
-            return;
-        }
-        String[] tokens = super.tokenize(text);
-        byte[] theValue = new byte[tokens.length];
-
-        for (int index = 0; index < tokens.length; index++) {
-            try {
-                theValue[index] = Byte.decode(tokens[index]);
-            } catch (NumberFormatException e) {
-                throw new IllegalArgumentException("Failed to parse byte.", e);
-            }
-        }
-        setValue(theValue);
-    }
-
-    /**
-     * @return a comma seperated string of the array elements
-     */
-    @Override
-    public String getAsText() {
-        byte[] theValue = (byte[]) getValue();
-        return super.encode(theValue);
-    }
 }
diff --git a/src/main/java/org/jboss/common/beans/property/CharacterArrayEditor.java b/src/main/java/org/jboss/common/beans/property/CharacterArrayEditor.java
@@ -28,7 +28,7 @@
  * @todo REVIEW: look at possibly parsing escape sequences?
  * @author baranowb
  */
-public class CharacterArrayEditor extends ArrayPropertyEditorSupport<char[]> {
+public class CharacterArrayEditor extends GenericArrayPropertyEditor<char[]> {
 
     public CharacterArrayEditor() {
         super(char[].class);
@@ -55,13 +55,4 @@ public void setAsText(final String text) {
         }
         setValue(theValue);
     }
-
-    /**
-     * @return a comma seperated string of the array elements
-     */
-    @Override
-    public String getAsText() {
-        char[] theValue = (char[]) getValue();
-        return super.encode(theValue);
-    }
 }