Author: tchemit Date: 2008-10-27 18:27:59 +0000 (Mon, 27 Oct 2008) New Revision: 1005 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java Log: use our code format (block for 1 instruction) remove unecessary else after a return or a throw Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/ColorConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -15,21 +15,20 @@ public Object convertFromString(String string, Class type) { - if (type != Color.class) + if (type != Color.class) { throw new IllegalArgumentException("unsupported type: " + type); + } if (string.length() == 7 && string.charAt(0) == '#') { return new Color(Integer.parseInt(string.substring(1), 16)); - } else { - try { - Field color = Color.class.getField(string); - return color.get(null); - } - catch (NoSuchFieldException e) { - throw new IllegalArgumentException("colors must be of the form #xxxxxx ('#' followed by six hexadecimal digits), or the name of a constant field in java.awt.Color (found: '" + string + "')"); - } - catch (IllegalAccessException e) { - throw new RuntimeException(e); - } } + try { + Field color = Color.class.getField(string); + return color.get(null); + } + catch (NoSuchFieldException e) { + throw new IllegalArgumentException("colors must be of the form #xxxxxx ('#' followed by six hexadecimal digits), or the name of a constant field in java.awt.Color (found: '" + string + "')"); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/InsetsConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -15,19 +15,22 @@ public Object convertFromString(String string, Class type) { - if (type != Insets.class) + if (type != Insets.class) { throw new IllegalArgumentException("unsupported type: " + type); + } StringTokenizer tokenizer = new StringTokenizer(string, ","); int count = tokenizer.countTokens(); if (count == 1) { int i = Integer.parseInt(tokenizer.nextToken().trim()); return new Insets(i, i, i, i); - } else if (count == 4) { + } + if (count == 4) { int[] insets = new int[count]; - for (int i = 0; tokenizer.hasMoreTokens(); i++) + for (int i = 0; tokenizer.hasMoreTokens(); i++) { insets[i] = Integer.parseInt(tokenizer.nextToken().trim()); + } return new Insets(insets[0], insets[1], insets[2], insets[3]); - } else - throw new IllegalArgumentException("unable to convert string '" + string + "' to Insets"); + } + throw new IllegalArgumentException("unable to convert string '" + string + "' to Insets"); } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/KeyStrokeConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -13,8 +13,9 @@ public Object convertFromString(String string, Class type) { - if (type != KeyStroke.class) + if (type != KeyStroke.class) { throw new IllegalArgumentException("unsupported type: " + type); + } return KeyStroke.getKeyStroke(string); } } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeConverter.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -5,7 +5,7 @@ package jaxx.types; public interface TypeConverter { - public String getJavaCode(Object object); + String getJavaCode(Object object); - public Object convertFromString(String string, Class type); + Object convertFromString(String string, Class type); } \ No newline at end of file Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java 2008-10-27 17:04:20 UTC (rev 1004) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/types/TypeManager.java 2008-10-27 18:27:59 UTC (rev 1005) @@ -24,21 +24,22 @@ public static String getJavaCode(Object object) { - if (object == null) + if (object == null) { return "null"; - else { - TypeConverter converter = getTypeConverter(object.getClass()); - if (converter == null) - throw new IllegalArgumentException("unsupported type: " + object.getClass()); - return converter.getJavaCode(object); } + TypeConverter converter = getTypeConverter(object.getClass()); + if (converter == null) { + throw new IllegalArgumentException("unsupported type: " + object.getClass()); + } + return converter.getJavaCode(object); } public static Object convertFromString(String string, Class type) { TypeConverter converter = getTypeConverter(type); - if (converter == null) + if (converter == null) { throw new IllegalArgumentException("unsupported type: " + type); + } return converter.convertFromString(string, type); } } \ No newline at end of file