[picocontainer-scm] [5622] java/2.x/trunk/pico/container/src/test/org/picocontainer/converters: small improvement

Revision 5622
Author paul
Date 2010-02-19 15:12:34 -0600 (Fri, 19 Feb 2010)

Log Message

small improvement

Modified Paths

- java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/BuiltInConverter.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/BuiltInConverterTestCase.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/ConverterTestCase.java

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/BuiltInConverter.java (5621 => 5622)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/BuiltInConverter.java 2010-02-19 21:04:25 UTC (rev 5621)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/converters/BuiltInConverter.java 2010-02-19 21:12:34 UTC (rev 5622)
@@ -1,67 +1,49 @@
package org.picocontainer.converters;

+import org.picocontainer.ConverterSet;
+
import java.io.File;
import java.io.Serializable;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.Map;
-import org.picocontainer.ConverterSet;

@SuppressWarnings("serial")
public class BuiltInConverter implements ConverterSet, Serializable {

- private final Map<Class, Converter> stringConverters = new HashMap<Class, Converter>();
+ private final Map<Class, Converter> converters = new HashMap<Class, Converter>();

public BuiltInConverter() {
addBuiltInConverters();
}

protected void addBuiltInConverters() {
- IntegerConverter intConverter = new IntegerConverter();
- addConverter(Integer.class, intConverter);
- addConverter(Integer.TYPE, intConverter);
-
- DoubleConverter doubleConverter = new DoubleConverter();
- addConverter(Double.class, doubleConverter);
- addConverter(Double.TYPE, doubleConverter);
-
- BooleanConverter booleanConverter = new BooleanConverter();
- addConverter(Boolean.class, booleanConverter);
- addConverter(Boolean.TYPE, booleanConverter);
-
- LongConverter longConverter = new LongConverter();
- addConverter(Long.class, longConverter);
- addConverter(Long.TYPE, longConverter);
+ addConverter(new IntegerConverter(), Integer.class, Integer.TYPE);
+ addConverter(new DoubleConverter(), Double.class, Double.TYPE);
+ addConverter(new BooleanConverter(), Boolean.class, Boolean.TYPE);
+ addConverter(new LongConverter(), Long.class, Long.TYPE);
+ addConverter(new FloatConverter(), Float.class, Float.TYPE);
+ addConverter(new CharacterConverter(), Character.class, Character.TYPE);
+ addConverter(new ByteConverter(), Byte.class, Byte.TYPE);
+ addConverter(new ShortConverter(), Short.class, Short.TYPE);
+ addConverter(new FileConverter(), File.class);
+ }

- FloatConverter floatConverter = new FloatConverter();
- addConverter(Float.class, floatConverter);
- addConverter(Float.TYPE, floatConverter);
-
- CharacterConverter charConverter = new CharacterConverter();
- addConverter(Character.class, charConverter);
- addConverter(Character.TYPE, charConverter);
-
- ByteConverter byteConverter = new ByteConverter();
- addConverter(Byte.class, byteConverter);
- addConverter(Byte.TYPE, byteConverter);
-
- ShortConverter shortConverter = new ShortConverter();
- addConverter(Short.class, shortConverter);
- addConverter(Short.TYPE, shortConverter);
-
- addConverter(File.class, new FileConverter());
+ private void addConverter(Converter converter, Class<?> type, Class<?> type2) {
+ addConverter(converter, type);
+ addConverter(converter, type2);
}

- protected void addConverter(Class<?> key, Converter converter) {
- stringConverters.put(key, converter);
+ protected void addConverter(Converter converter, Class<?> key) {
+ converters.put(key, converter);
}

public boolean canConvert(Type type) {
- return stringConverters.containsKey(type);
+ return converters.containsKey(type);
}

public Object convert(String paramValue, Type type) {
- Converter converter = stringConverters.get(type);
+ Converter converter = converters.get(type);
if (converter== null) {
return null;
}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/BuiltInConverterTestCase.java (5621 => 5622)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/BuiltInConverterTestCase.java 2010-02-19 21:04:25 UTC (rev 5621)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/BuiltInConverterTestCase.java 2010-02-19 21:12:34 UTC (rev 5622)
@@ -1,11 +1,9 @@
package org.picocontainer.converters;

import org.junit.Test;
-import org.picocontainer.Converting;

import javax.swing.*;
import java.io.File;
-import java.lang.reflect.Type;

import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
@@ -46,7 +44,7 @@
@Test
public void canAddAConverter() {
BuiltInConverter bic = new BuiltInConverter();
- bic.addConverter(JPanel.class, new JPanelConverter());
+ bic.addConverter(new JPanelConverter(), JPanel.class);
assertTrue(bic.convert("anything", JPanel.class) instanceof JPanel);

}
@@ -57,7 +55,7 @@
@Override
protected void addBuiltInConverters() {
super.addBuiltInConverters();
- super.addConverter(JPanel.class, new JPanelConverter());
+ super.addConverter(new JPanelConverter(), JPanel.class);
}
};
assertEquals(Boolean.TRUE, bic.convert("TRUE", Boolean.class));

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/ConverterTestCase.java (5621 => 5622)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/ConverterTestCase.java 2010-02-19 21:04:25 UTC (rev 5621)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/converters/ConverterTestCase.java 2010-02-19 21:12:34 UTC (rev 5622)
@@ -27,7 +27,7 @@
return new BuiltInConverter() {
@Override
protected void addBuiltInConverters() {
- addConverter(Boolean.class, new MyConverter());
+ addConverter(new MyConverter(), Boolean.class);

}
};
@@ -48,7 +48,7 @@
return new BuiltInConverter() {
@Override
protected void addBuiltInConverters() {
- addConverter(Boolean.class, new MyConverter());
+ addConverter(new MyConverter(), Boolean.class);

}
};
@@ -76,7 +76,7 @@
return new BuiltInConverter() {
@Override
protected void addBuiltInConverters() {
- addConverter(Boolean.class, new BooleanConverter());
+ addConverter(new BooleanConverter(), Boolean.class);

}
};
@@ -88,7 +88,7 @@
return new BuiltInConverter() {
@Override
protected void addBuiltInConverters() {
- addConverter(Short.class, new ShortConverter());
+ addConverter(new ShortConverter(), Short.class);

}
};

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email