JIMS: plug jallowClassReloading

Change-Id: I17204827093e268bb48aabbfddc5149518f8f1b0

diff --git a/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jallowClassReloading.cpp b/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jallowClassReloading.cpp
index a644358..8393e30 100644 (file)
--- a/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jallowClassReloading.cpp
+++ b/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jallowClassReloading.cpp
@@ -27,7 +27,8 @@ int sci_jallowClassReloading(char * fname, unsigned long fname_len)
     try
     {
         const int envId = ScilabJavaEnvironment::start();
-        //        return ScilabGateway::setAllowReload(fname, envId, pvApiCtx);
+        JavaOptionsSetter setter = ScilabJavaEnvironment::getInstance().getOptionsHelper().getSetter(JavaOptionsSetter::ALLOWRELOAD);
+        return ScilabGateway::getsetOptions(fname, envId, setter, pvApiCtx);
     }
     catch (std::exception & e)
     {

diff --git a/scilab/modules/external_objects_java/src/cpp/JavaOptionsHelper.hxx b/scilab/modules/external_objects_java/src/cpp/JavaOptionsHelper.hxx
index f479328..f289362 100644 (file)
--- a/scilab/modules/external_objects_java/src/cpp/JavaOptionsHelper.hxx
+++ b/scilab/modules/external_objects_java/src/cpp/JavaOptionsHelper.hxx
@@ -28,11 +28,10 @@ namespace org_scilab_modules_external_objects_java
 class JavaOptionsHelper : public OptionsHelper
 {
     bool showPrivate;
-    bool attachModule;
 
 public :
 
-    JavaOptionsHelper () : OptionsHelper(), showPrivate(false), attachModule(false)
+    JavaOptionsHelper () : OptionsHelper(), showPrivate(false)
     {
 
     }
@@ -49,16 +48,6 @@ public :
         return showPrivate;
     }
 
-    void setAttachModule(const bool _attachModule)
-    {
-        attachModule = _attachModule;
-    }
-
-    bool getAttachModule() const
-    {
-        return attachModule;
-    }
-
     JavaOptionsSetter getSetter(unsigned int type)
     {
         return JavaOptionsSetter(*this, type);

diff --git a/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.cpp b/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.cpp
index 6864f39..28d85b1 100644 (file)
--- a/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.cpp
+++ b/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.cpp
@@ -18,7 +18,6 @@ using namespace org_modules_external_objects;
 namespace org_scilab_modules_external_objects_java
 {
 const unsigned int JavaOptionsSetter::SHOWPRIVATE = LAST_OPTION_INDEX + 2;
-const unsigned int JavaOptionsSetter::ATTACHMODULE = LAST_OPTION_INDEX + 3;
 
 JavaOptionsSetter::JavaOptionsSetter(JavaOptionsHelper & _helper, unsigned int _type) : ScilabOptionsSetter(_helper, _type) { }
 
@@ -29,9 +28,6 @@ void JavaOptionsSetter::set(const bool state)
         case SHOWPRIVATE:
             reinterpret_cast<JavaOptionsHelper *>(&helper)->setShowPrivate(state);
             break;
-        case ATTACHMODULE:
-            reinterpret_cast<JavaOptionsHelper *>(&helper)->setAttachModule(state);
-            break;
         default:
             ScilabOptionsSetter::set(state);
     }
@@ -43,8 +39,6 @@ bool JavaOptionsSetter::get() const
     {
         case SHOWPRIVATE:
             return reinterpret_cast<JavaOptionsHelper *>(&helper)->getShowPrivate();
-        case ATTACHMODULE:
-            return reinterpret_cast<JavaOptionsHelper *>(&helper)->getAttachModule();
         default:
             return ScilabOptionsSetter::get();
     }

diff --git a/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.hxx b/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.hxx
index 00ab66f..001ee49 100644 (file)
--- a/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.hxx
+++ b/scilab/modules/external_objects_java/src/cpp/JavaOptionsSetter.hxx
@@ -31,7 +31,6 @@ class EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP JavaOptionsSetter : public ScilabOptio
 public:
 
     static const unsigned int SHOWPRIVATE;
-    static const unsigned int ATTACHMODULE;
 
     JavaOptionsSetter(JavaOptionsHelper & _helper, unsigned int _type);
     ~JavaOptionsSetter() { }