Author: chatellier Date: 2010-06-16 14:19:31 +0000 (Wed, 16 Jun 2010) New Revision: 3059 Log: Fix parameter edition for non primitive types in user script (Double...) Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2010-06-15 11:39:27 UTC (rev 3058) +++ isis-fish/trunk/changelog.txt 2010-06-16 14:19:31 UTC (rev 3059) @@ -1,5 +1,6 @@ isis-fish (3.3.0.4) stable; urgency=low + * Fix parameter edition for non primitive types in user script (Double...) * Add simulation parameter cache to not keep simulation prescript on memory -- jeu. avril 29 18:47:58 CEST 2010 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2010-06-15 11:39:27 UTC (rev 3058) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2010-06-16 14:19:31 UTC (rev 3059) @@ -79,7 +79,7 @@ private static enum TypeClassMapping { /** for simple int. */ - Int(int.class), + Int(int.class, Integer.class), /** for a topia entity. */ Topia(TopiaEntity.class), /** for a mounth. */ @@ -87,24 +87,26 @@ /** for a simple date. */ Date(Date.class), /** for a simple boolean. */ - Double(double.class), + Double(double.class, Double.class), /** for a simple boolean. */ - Boolean(boolean.class), + Boolean(boolean.class, Boolean.class), /** for a file location. */ File(java.io.File.class), /** for a simple String. */ String(java.lang.String.class); - private final Class<?> klazz; + private final Class<?>[] klazz; - private TypeClassMapping(Class<?> klazz) { + private TypeClassMapping(Class<?>... klazz) { this.klazz = klazz; } protected static TypeClassMapping getMapping(Class<?> klazz) { for (TypeClassMapping t : TypeClassMapping.values()) { - if (t.klazz.isAssignableFrom(klazz)) { - return t; + for (Class<?> loopKlazz : t.klazz) { + if (loopKlazz.isAssignableFrom(klazz)) { + return t; + } } } throw new RuntimeException(