Bug 13003 fixed: EOJ: add a converter to handle string to enum

Change-Id: I7a5a753f75e85753977a60fa97f2358f0e3b8804

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index ac38871..c751cc6 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -38,6 +38,8 @@ Scilab Bug Fixes
 
 * Bug #12979 fixed - exportUI did not work with vectorial export.
 
+* Bug #13003 fixed - EOJ: add a converter to handle string to enum.
+
 * Bug #13004 fixed - Debug infos were printed on an error with eoj.
 
 

diff --git a/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/FunctionArguments.java b/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/FunctionArguments.java
index f5511ad..12c303e 100644 (file)
--- a/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/FunctionArguments.java
+++ b/scilab/modules/external_objects_java/src/java/org/scilab/modules/external_objects_java/FunctionArguments.java
@@ -87,6 +87,19 @@ public final class FunctionArguments {
                 return from.isArray() && to.isAssignableFrom(ArrayList.class);
             }
         });
+
+        // Converter to convert a String to a Enum
+        registerConverter(new Converter() {
+            @Override
+            public Object convert(Object original, Class<?> to) {
+                return Enum.valueOf((Class) to, (String) original);
+            }
+
+            @Override
+            public boolean canConvert(Class<?> from, Class<?> to) {
+                return String.class.isAssignableFrom(from) && to.isEnum();
+            }
+        });
     }
 
     /**

diff --git a/scilab/modules/external_objects_java/tests/unit_tests/enum.dia.ref b/scilab/modules/external_objects_java/tests/unit_tests/enum.dia.ref
new file mode 100644 (file)
index 0000000..e67475c
--- /dev/null
+++ b/scilab/modules/external_objects_java/tests/unit_tests/enum.dia.ref
@@ -0,0 +1,12 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+c = jcompile("Test", ["public class Test {";
+"public enum foo { ONE, TWO, THREE; }";
+"public static double bar(foo x) { return (double) x.ordinal(); }}"]); 
+assert_checkequal(c.bar("ONE"), 0);
+assert_checkequal(c.bar("TWO"), 1);
+assert_checkequal(c.bar("THREE"), 2);

diff --git a/scilab/modules/external_objects_java/tests/unit_tests/enum.tst b/scilab/modules/external_objects_java/tests/unit_tests/enum.tst
new file mode 100644 (file)
index 0000000..4451c11
--- /dev/null
+++ b/scilab/modules/external_objects_java/tests/unit_tests/enum.tst
@@ -0,0 +1,14 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+c = jcompile("Test", ["public class Test {";
+"public enum foo { ONE, TWO, THREE; }";
+"public static double bar(foo x) { return (double) x.ordinal(); }}"]);
+
+assert_checkequal(c.bar("ONE"), 0);
+assert_checkequal(c.bar("TWO"), 1);
+assert_checkequal(c.bar("THREE"), 2);