Xcos: put ANNOTATION at the end on sortAndFill

On saved files, the objects are sorted per kind. It is much more easier to
get the blocks first while debugging content. As the sorting is only
performed on the enum value, moving it will perform the job.

On the Xcos GUI and as the ANNOTATION will be decoded after the block, they
will appears "on top" of the BLOCK and LINK objects which is expected.

Change-Id: I966d4229e79f44021c416334c0105b30f894a7cb

diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index 2fce661..6ffc063 100755 (executable)
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -76,6 +76,10 @@ then
     echo "  git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/IndentScanner.java' "
     echo "  git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/MatchingBlockScanner.java' "
     echo "  git config --add astyle.ignored 'scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java' "
+    echo "  git config --add astyle.ignored 'scilab/modules/xcos/src/java/org/scilab/modules/xcos/Controller.java' "
+    echo "  git config --add astyle.ignored 'scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java' "
+    echo "  git config --add astyle.ignored 'scilab/modules/xcos/src/java/org/scilab/modules/xcos/Kind.java' "
+    echo "  git config --add astyle.ignored 'scilab/modules/xcos/src/java/org/scilab/modules/xcos/ObjectProperties.java' "
     echo "  git config --add astyle.ignored 'scilab/modules/scicos/src/scicos_sundials/*' "
 
     echo

diff --git a/scilab/modules/scicos/includes/utilities.hxx b/scilab/modules/scicos/includes/utilities.hxx
index 6562411..ef9f51a 100644 (file)
--- a/scilab/modules/scicos/includes/utilities.hxx
+++ b/scilab/modules/scicos/includes/utilities.hxx
@@ -37,10 +37,10 @@ enum update_status_t
  */
 enum kind_t
 {
-    ANNOTATION,     //!< model::Annotation object
     BLOCK,          //!< model::Block object
     DIAGRAM,        //!< model::Diagram object
     LINK,           //!< model::Link object
+    ANNOTATION,     //!< model::Annotation object
     PORT            //!< model::Port object
 };
 

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Controller.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Controller.java
index 7a9e998..12979b8 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Controller.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Controller.java
@@ -9,147 +9,147 @@
 package org.scilab.modules.xcos;
 
 public class Controller {
-    private transient long swigCPtr;
-    protected transient boolean swigCMemOwn;
+  private transient long swigCPtr;
+  protected transient boolean swigCMemOwn;
 
-    protected Controller(long cPtr, boolean cMemoryOwn) {
-        swigCMemOwn = cMemoryOwn;
-        swigCPtr = cPtr;
-    }
-
-    protected static long getCPtr(Controller obj) {
-        return (obj == null) ? 0 : obj.swigCPtr;
-    }
-
-    protected void finalize() {
-        delete();
-    }
-
-    public synchronized void delete() {
-        if (swigCPtr != 0) {
-            if (swigCMemOwn) {
-                swigCMemOwn = false;
-                JavaControllerJNI.delete_Controller(swigCPtr);
-            }
-            swigCPtr = 0;
-        }
-    }
-
-    public static View look_for_view(String name) {
-        long cPtr = JavaControllerJNI.Controller_look_for_view(name);
-        return (cPtr == 0) ? null : new View(cPtr, false);
-    }
-
-    public Controller() {
-        this(JavaControllerJNI.new_Controller(), true);
-    }
-
-    public long createObject(Kind k) {
-        return JavaControllerJNI.Controller_createObject(swigCPtr, this, k.ordinal());
-    }
-
-    public long referenceObject(long uid) {
-        return JavaControllerJNI.Controller_referenceObject(swigCPtr, this, uid);
-    }
-
-    public void deleteObject(long uid) {
-        JavaControllerJNI.Controller_deleteObject(swigCPtr, this, uid);
-    }
-
-    public long cloneObject(long uid, boolean cloneChildren, boolean clonePorts) {
-        return JavaControllerJNI.Controller_cloneObject(swigCPtr, this, uid, cloneChildren, clonePorts);
-    }
-
-    public Kind getKind(long uid) {
-        return Kind.class.getEnumConstants()[JavaControllerJNI.Controller_getKind(swigCPtr, this, uid)];
-    }
-
-    public VectorOfScicosID getAll(Kind k) {
-        return new VectorOfScicosID(JavaControllerJNI.Controller_getAll(swigCPtr, this, k.ordinal()), true);
-    }
-
-    public void sortAndFillKind(VectorOfScicosID uids, VectorOfInt kind) {
-        JavaControllerJNI.Controller_sortAndFillKind(swigCPtr, this, VectorOfScicosID.getCPtr(uids), uids, VectorOfInt.getCPtr(kind), kind);
-    }
-
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, int[] v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_1(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
-    }
-
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, boolean[] v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_2(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
-    }
+  protected Controller(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(Controller obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        JavaControllerJNI.delete_Controller(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public static View look_for_view(String name) {
+    long cPtr = JavaControllerJNI.Controller_look_for_view(name);
+    return (cPtr == 0) ? null : new View(cPtr, false);
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, double[] v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_3(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
-    }
-
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, String[] v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_4(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
-    }
+  public Controller() {
+    this(JavaControllerJNI.new_Controller(), true);
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, long[] v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_5(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
-    }
+  public long createObject(Kind k) {
+    return JavaControllerJNI.Controller_createObject(swigCPtr, this, k.ordinal());
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfInt v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_6(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfInt.getCPtr(v), v);
-    }
+  public long referenceObject(long uid) {
+    return JavaControllerJNI.Controller_referenceObject(swigCPtr, this, uid);
+  }
+
+  public void deleteObject(long uid) {
+    JavaControllerJNI.Controller_deleteObject(swigCPtr, this, uid);
+  }
+
+  public long cloneObject(long uid, boolean cloneChildren, boolean clonePorts) {
+    return JavaControllerJNI.Controller_cloneObject(swigCPtr, this, uid, cloneChildren, clonePorts);
+  }
+
+  public Kind getKind(long uid) {
+    return Kind.class.getEnumConstants()[JavaControllerJNI.Controller_getKind(swigCPtr, this, uid)];
+  }
+
+  public VectorOfScicosID getAll(Kind k) {
+    return new VectorOfScicosID(JavaControllerJNI.Controller_getAll(swigCPtr, this, k.ordinal()), true);
+  }
+
+  public void sortAndFillKind(VectorOfScicosID uids, VectorOfInt kind) {
+    JavaControllerJNI.Controller_sortAndFillKind(swigCPtr, this, VectorOfScicosID.getCPtr(uids), uids, VectorOfInt.getCPtr(kind), kind);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, int[] v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_1(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, boolean[] v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_2(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, double[] v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_3(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, String[] v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_4(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, long[] v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_5(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfInt v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_6(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfInt.getCPtr(v), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfBool v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_7(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfBool.getCPtr(v), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfDouble v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_8(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfDouble.getCPtr(v), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfString v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_9(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfString.getCPtr(v), v);
+  }
+
+  public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfScicosID v) {
+    return JavaControllerJNI.Controller_getObjectProperty__SWIG_10(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfScicosID.getCPtr(v), v);
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, int v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_1(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, boolean v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_2(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, double v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_3(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, String v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_4(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, long v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_5(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfBool v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_7(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfBool.getCPtr(v), v);
-    }
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfInt v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_6(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfInt.getCPtr(v), v)];
+  }
+
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfBool v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_7(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfBool.getCPtr(v), v)];
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfDouble v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_8(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfDouble.getCPtr(v), v);
-    }
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfDouble v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_8(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfDouble.getCPtr(v), v)];
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfString v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_9(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfString.getCPtr(v), v);
-    }
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfString v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_9(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfString.getCPtr(v), v)];
+  }
 
-    public boolean getObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfScicosID v) {
-        return JavaControllerJNI.Controller_getObjectProperty__SWIG_10(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfScicosID.getCPtr(v), v);
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, int v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_1(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, boolean v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_2(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, double v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_3(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, String v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_4(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, long v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_5(swigCPtr, this, uid, k.ordinal(), p.ordinal(), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfInt v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_6(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfInt.getCPtr(v), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfBool v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_7(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfBool.getCPtr(v), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfDouble v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_8(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfDouble.getCPtr(v), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfString v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_9(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfString.getCPtr(v), v)];
-    }
-
-    public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfScicosID v) {
-        return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_10(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfScicosID.getCPtr(v), v)];
-    }
+  public UpdateStatus setObjectProperty(long uid, Kind k, ObjectProperties p, VectorOfScicosID v) {
+    return UpdateStatus.class.getEnumConstants()[JavaControllerJNI.Controller_setObjectProperty__SWIG_10(swigCPtr, this, uid, k.ordinal(), p.ordinal(), VectorOfScicosID.getCPtr(v), v)];
+  }
 
 }

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java
index 52f8ce7..d9d64d2 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaController.java
@@ -13,30 +13,30 @@ import java.util.TreeMap;
 
 public class JavaController extends Controller {
 
-    // will contain all registered JavaViews to prevent garbage-collection
-    private static Map<String, View> references = new TreeMap<String, View>();
-
-    private static long add_reference(String name, View v) {
-        references.put(name, v);
-        return View.getCPtr(v);
-    }
-
-    private static View remove_reference(View v) {
-        references.values().remove(v);
-        return v;
-    }
-
-    public static View lookup_view(String name) {
-        return references.get(name);
-    }
-
-    public static void register_view(String name, View view) {
-        JavaControllerJNI.register_view(name, add_reference(name, view), view);
-    }
-
-    public static void unregister_view(View view) {
-        JavaControllerJNI.unregister_view(View.getCPtr(view), view);
-        remove_reference(view);
-    }
+  // will contain all registered JavaViews to prevent garbage-collection
+  private static Map<String, View> references = new TreeMap<String, View>();
+
+  private static long add_reference(String name, View v) {
+    references.put(name, v);
+    return View.getCPtr(v);
+  }
+
+  private static View remove_reference(View v) {
+    references.values().remove(v);
+    return v;
+  }
+
+  public static View lookup_view(String name) {
+    return references.get(name);
+  }
+
+  public static void register_view(String name, View view) {
+    JavaControllerJNI.register_view(name, add_reference(name, view), view);
+  }
+
+  public static void unregister_view(View view) {
+    JavaControllerJNI.unregister_view(View.getCPtr(view), view);
+    remove_reference(view);
+  }
 
 }

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaControllerJNI.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaControllerJNI.java
index 229340d..e6cbb51 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaControllerJNI.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/JavaControllerJNI.java
@@ -9,163 +9,163 @@
 package org.scilab.modules.xcos;
 
 public class JavaControllerJNI {
-    public final static native long new_View();
-    public final static native void delete_View(long jarg1);
-    public final static native void View_objectCreated(long jarg1, View jarg1_, long jarg2, int jarg3);
-    public final static native void View_objectReferenced(long jarg1, View jarg1_, long jarg2, int jarg3, long jarg4);
-    public final static native void View_objectUnreferenced(long jarg1, View jarg1_, long jarg2, int jarg3, long jarg4);
-    public final static native void View_objectDeleted(long jarg1, View jarg1_, long jarg2, int jarg3);
-    public final static native void View_propertyUpdated(long jarg1, View jarg1_, long jarg2, int jarg3, int jarg4, int jarg5);
-    public final static native void View_director_connect(View obj, long cptr, boolean mem_own, boolean weak_global);
-    public final static native void View_change_ownership(View obj, long cptr, boolean take_or_release);
-    public final static native long Controller_look_for_view(String jarg1);
-    public final static native long new_Controller();
-    public final static native void delete_Controller(long jarg1);
-    public final static native long Controller_createObject(long jarg1, Controller jarg1_, int jarg2);
-    public final static native long Controller_referenceObject(long jarg1, Controller jarg1_, long jarg2);
-    public final static native void Controller_deleteObject(long jarg1, Controller jarg1_, long jarg2);
-    public final static native long Controller_cloneObject(long jarg1, Controller jarg1_, long jarg2, boolean jarg3, boolean jarg4);
-    public final static native int Controller_getKind(long jarg1, Controller jarg1_, long jarg2);
-    public final static native long Controller_getAll(long jarg1, Controller jarg1_, int jarg2);
-    public final static native void Controller_sortAndFillKind(long jarg1, Controller jarg1_, long jarg2, VectorOfScicosID jarg2_, long jarg3, VectorOfInt jarg3_);
-    public final static native boolean Controller_getObjectProperty__SWIG_1(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, int[] jarg5);
-    public final static native boolean Controller_getObjectProperty__SWIG_2(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, boolean[] jarg5);
-    public final static native boolean Controller_getObjectProperty__SWIG_3(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, double[] jarg5);
-    public final static native boolean Controller_getObjectProperty__SWIG_4(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, String[] jarg5);
-    public final static native boolean Controller_getObjectProperty__SWIG_5(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long[] jarg5);
-    public final static native boolean Controller_getObjectProperty__SWIG_6(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfInt jarg5_);
-    public final static native boolean Controller_getObjectProperty__SWIG_7(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfBool jarg5_);
-    public final static native boolean Controller_getObjectProperty__SWIG_8(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfDouble jarg5_);
-    public final static native boolean Controller_getObjectProperty__SWIG_9(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfString jarg5_);
-    public final static native boolean Controller_getObjectProperty__SWIG_10(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfScicosID jarg5_);
-    public final static native int Controller_setObjectProperty__SWIG_1(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, int jarg5);
-    public final static native int Controller_setObjectProperty__SWIG_2(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, boolean jarg5);
-    public final static native int Controller_setObjectProperty__SWIG_3(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, double jarg5);
-    public final static native int Controller_setObjectProperty__SWIG_4(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, String jarg5);
-    public final static native int Controller_setObjectProperty__SWIG_5(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5);
-    public final static native int Controller_setObjectProperty__SWIG_6(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfInt jarg5_);
-    public final static native int Controller_setObjectProperty__SWIG_7(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfBool jarg5_);
-    public final static native int Controller_setObjectProperty__SWIG_8(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfDouble jarg5_);
-    public final static native int Controller_setObjectProperty__SWIG_9(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfString jarg5_);
-    public final static native int Controller_setObjectProperty__SWIG_10(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfScicosID jarg5_);
-    public final static native long new_VectorOfInt__SWIG_0();
-    public final static native long new_VectorOfInt__SWIG_1(long jarg1);
-    public final static native void VectorOfInt_ensureCapacity(long jarg1, VectorOfInt jarg1_, long jarg2);
-    public final static native void VectorOfInt_resize(long jarg1, VectorOfInt jarg1_, long jarg2);
-    public final static native int VectorOfInt_size(long jarg1, VectorOfInt jarg1_);
-    public final static native boolean VectorOfInt_isEmpty(long jarg1, VectorOfInt jarg1_);
-    public final static native void VectorOfInt_clear(long jarg1, VectorOfInt jarg1_);
-    public final static native void VectorOfInt_add__SWIG_0(long jarg1, VectorOfInt jarg1_, int jarg2);
-    public final static native boolean VectorOfInt_contains(long jarg1, VectorOfInt jarg1_, int jarg2);
-    public final static native int VectorOfInt_indexOf(long jarg1, VectorOfInt jarg1_, int jarg2);
-    public final static native int VectorOfInt_get(long jarg1, VectorOfInt jarg1_, int jarg2);
-    public final static native void VectorOfInt_set(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
-    public final static native void VectorOfInt_add__SWIG_1(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
-    public final static native boolean VectorOfInt_remove(long jarg1, VectorOfInt jarg1_, int jarg2);
-    public final static native java.nio.ByteBuffer VectorOfInt_asByteBuffer(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
-    public final static native void delete_VectorOfInt(long jarg1);
-    public final static native long new_VectorOfBool__SWIG_0();
-    public final static native long new_VectorOfBool__SWIG_1(long jarg1);
-    public final static native void VectorOfBool_ensureCapacity(long jarg1, VectorOfBool jarg1_, long jarg2);
-    public final static native void VectorOfBool_resize(long jarg1, VectorOfBool jarg1_, long jarg2);
-    public final static native int VectorOfBool_size(long jarg1, VectorOfBool jarg1_);
-    public final static native boolean VectorOfBool_isEmpty(long jarg1, VectorOfBool jarg1_);
-    public final static native void VectorOfBool_clear(long jarg1, VectorOfBool jarg1_);
-    public final static native void VectorOfBool_add__SWIG_0(long jarg1, VectorOfBool jarg1_, boolean jarg2);
-    public final static native boolean VectorOfBool_get(long jarg1, VectorOfBool jarg1_, int jarg2);
-    public final static native void VectorOfBool_set(long jarg1, VectorOfBool jarg1_, int jarg2, boolean jarg3);
-    public final static native void VectorOfBool_add__SWIG_1(long jarg1, VectorOfBool jarg1_, int jarg2, boolean jarg3);
-    public final static native boolean VectorOfBool_remove(long jarg1, VectorOfBool jarg1_, boolean jarg2);
-    public final static native void delete_VectorOfBool(long jarg1);
-    public final static native long new_VectorOfDouble__SWIG_0();
-    public final static native long new_VectorOfDouble__SWIG_1(long jarg1);
-    public final static native void VectorOfDouble_ensureCapacity(long jarg1, VectorOfDouble jarg1_, long jarg2);
-    public final static native void VectorOfDouble_resize(long jarg1, VectorOfDouble jarg1_, long jarg2);
-    public final static native int VectorOfDouble_size(long jarg1, VectorOfDouble jarg1_);
-    public final static native boolean VectorOfDouble_isEmpty(long jarg1, VectorOfDouble jarg1_);
-    public final static native void VectorOfDouble_clear(long jarg1, VectorOfDouble jarg1_);
-    public final static native void VectorOfDouble_add__SWIG_0(long jarg1, VectorOfDouble jarg1_, double jarg2);
-    public final static native boolean VectorOfDouble_contains(long jarg1, VectorOfDouble jarg1_, double jarg2);
-    public final static native int VectorOfDouble_indexOf(long jarg1, VectorOfDouble jarg1_, double jarg2);
-    public final static native double VectorOfDouble_get(long jarg1, VectorOfDouble jarg1_, int jarg2);
-    public final static native void VectorOfDouble_set(long jarg1, VectorOfDouble jarg1_, int jarg2, double jarg3);
-    public final static native void VectorOfDouble_add__SWIG_1(long jarg1, VectorOfDouble jarg1_, int jarg2, double jarg3);
-    public final static native boolean VectorOfDouble_remove(long jarg1, VectorOfDouble jarg1_, double jarg2);
-    public final static native java.nio.ByteBuffer VectorOfDouble_asByteBuffer(long jarg1, VectorOfDouble jarg1_, int jarg2, int jarg3);
-    public final static native void delete_VectorOfDouble(long jarg1);
-    public final static native long new_VectorOfString__SWIG_0();
-    public final static native long new_VectorOfString__SWIG_1(long jarg1);
-    public final static native void VectorOfString_ensureCapacity(long jarg1, VectorOfString jarg1_, long jarg2);
-    public final static native void VectorOfString_resize(long jarg1, VectorOfString jarg1_, long jarg2);
-    public final static native int VectorOfString_size(long jarg1, VectorOfString jarg1_);
-    public final static native boolean VectorOfString_isEmpty(long jarg1, VectorOfString jarg1_);
-    public final static native void VectorOfString_clear(long jarg1, VectorOfString jarg1_);
-    public final static native void VectorOfString_add__SWIG_0(long jarg1, VectorOfString jarg1_, String jarg2);
-    public final static native boolean VectorOfString_contains(long jarg1, VectorOfString jarg1_, String jarg2);
-    public final static native int VectorOfString_indexOf(long jarg1, VectorOfString jarg1_, String jarg2);
-    public final static native String VectorOfString_get(long jarg1, VectorOfString jarg1_, int jarg2);
-    public final static native void VectorOfString_set(long jarg1, VectorOfString jarg1_, int jarg2, String jarg3);
-    public final static native void VectorOfString_add__SWIG_1(long jarg1, VectorOfString jarg1_, int jarg2, String jarg3);
-    public final static native boolean VectorOfString_remove(long jarg1, VectorOfString jarg1_, String jarg2);
-    public final static native java.nio.ByteBuffer VectorOfString_asByteBuffer(long jarg1, VectorOfString jarg1_, int jarg2, int jarg3);
-    public final static native void delete_VectorOfString(long jarg1);
-    public final static native long new_VectorOfScicosID__SWIG_0();
-    public final static native long new_VectorOfScicosID__SWIG_1(long jarg1);
-    public final static native void VectorOfScicosID_ensureCapacity(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native void VectorOfScicosID_resize(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native int VectorOfScicosID_size(long jarg1, VectorOfScicosID jarg1_);
-    public final static native boolean VectorOfScicosID_isEmpty(long jarg1, VectorOfScicosID jarg1_);
-    public final static native void VectorOfScicosID_clear(long jarg1, VectorOfScicosID jarg1_);
-    public final static native void VectorOfScicosID_add__SWIG_0(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native boolean VectorOfScicosID_contains(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native int VectorOfScicosID_indexOf(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native long VectorOfScicosID_get(long jarg1, VectorOfScicosID jarg1_, int jarg2);
-    public final static native void VectorOfScicosID_set(long jarg1, VectorOfScicosID jarg1_, int jarg2, long jarg3);
-    public final static native void VectorOfScicosID_add__SWIG_1(long jarg1, VectorOfScicosID jarg1_, int jarg2, long jarg3);
-    public final static native boolean VectorOfScicosID_remove(long jarg1, VectorOfScicosID jarg1_, long jarg2);
-    public final static native java.nio.ByteBuffer VectorOfScicosID_asByteBuffer(long jarg1, VectorOfScicosID jarg1_, int jarg2, int jarg3);
-    public final static native void delete_VectorOfScicosID(long jarg1);
-    public final static native void register_view(String jarg1, long jarg2, View jarg2_);
-    public final static native void unregister_view(long jarg1, View jarg1_);
+  public final static native long new_View();
+  public final static native void delete_View(long jarg1);
+  public final static native void View_objectCreated(long jarg1, View jarg1_, long jarg2, int jarg3);
+  public final static native void View_objectReferenced(long jarg1, View jarg1_, long jarg2, int jarg3, long jarg4);
+  public final static native void View_objectUnreferenced(long jarg1, View jarg1_, long jarg2, int jarg3, long jarg4);
+  public final static native void View_objectDeleted(long jarg1, View jarg1_, long jarg2, int jarg3);
+  public final static native void View_propertyUpdated(long jarg1, View jarg1_, long jarg2, int jarg3, int jarg4, int jarg5);
+  public final static native void View_director_connect(View obj, long cptr, boolean mem_own, boolean weak_global);
+  public final static native void View_change_ownership(View obj, long cptr, boolean take_or_release);
+  public final static native long Controller_look_for_view(String jarg1);
+  public final static native long new_Controller();
+  public final static native void delete_Controller(long jarg1);
+  public final static native long Controller_createObject(long jarg1, Controller jarg1_, int jarg2);
+  public final static native long Controller_referenceObject(long jarg1, Controller jarg1_, long jarg2);
+  public final static native void Controller_deleteObject(long jarg1, Controller jarg1_, long jarg2);
+  public final static native long Controller_cloneObject(long jarg1, Controller jarg1_, long jarg2, boolean jarg3, boolean jarg4);
+  public final static native int Controller_getKind(long jarg1, Controller jarg1_, long jarg2);
+  public final static native long Controller_getAll(long jarg1, Controller jarg1_, int jarg2);
+  public final static native void Controller_sortAndFillKind(long jarg1, Controller jarg1_, long jarg2, VectorOfScicosID jarg2_, long jarg3, VectorOfInt jarg3_);
+  public final static native boolean Controller_getObjectProperty__SWIG_1(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, int[] jarg5);
+  public final static native boolean Controller_getObjectProperty__SWIG_2(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, boolean[] jarg5);
+  public final static native boolean Controller_getObjectProperty__SWIG_3(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, double[] jarg5);
+  public final static native boolean Controller_getObjectProperty__SWIG_4(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, String[] jarg5);
+  public final static native boolean Controller_getObjectProperty__SWIG_5(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long[] jarg5);
+  public final static native boolean Controller_getObjectProperty__SWIG_6(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfInt jarg5_);
+  public final static native boolean Controller_getObjectProperty__SWIG_7(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfBool jarg5_);
+  public final static native boolean Controller_getObjectProperty__SWIG_8(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfDouble jarg5_);
+  public final static native boolean Controller_getObjectProperty__SWIG_9(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfString jarg5_);
+  public final static native boolean Controller_getObjectProperty__SWIG_10(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfScicosID jarg5_);
+  public final static native int Controller_setObjectProperty__SWIG_1(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, int jarg5);
+  public final static native int Controller_setObjectProperty__SWIG_2(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, boolean jarg5);
+  public final static native int Controller_setObjectProperty__SWIG_3(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, double jarg5);
+  public final static native int Controller_setObjectProperty__SWIG_4(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, String jarg5);
+  public final static native int Controller_setObjectProperty__SWIG_5(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5);
+  public final static native int Controller_setObjectProperty__SWIG_6(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfInt jarg5_);
+  public final static native int Controller_setObjectProperty__SWIG_7(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfBool jarg5_);
+  public final static native int Controller_setObjectProperty__SWIG_8(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfDouble jarg5_);
+  public final static native int Controller_setObjectProperty__SWIG_9(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfString jarg5_);
+  public final static native int Controller_setObjectProperty__SWIG_10(long jarg1, Controller jarg1_, long jarg2, int jarg3, int jarg4, long jarg5, VectorOfScicosID jarg5_);
+  public final static native long new_VectorOfInt__SWIG_0();
+  public final static native long new_VectorOfInt__SWIG_1(long jarg1);
+  public final static native void VectorOfInt_ensureCapacity(long jarg1, VectorOfInt jarg1_, long jarg2);
+  public final static native void VectorOfInt_resize(long jarg1, VectorOfInt jarg1_, long jarg2);
+  public final static native int VectorOfInt_size(long jarg1, VectorOfInt jarg1_);
+  public final static native boolean VectorOfInt_isEmpty(long jarg1, VectorOfInt jarg1_);
+  public final static native void VectorOfInt_clear(long jarg1, VectorOfInt jarg1_);
+  public final static native void VectorOfInt_add__SWIG_0(long jarg1, VectorOfInt jarg1_, int jarg2);
+  public final static native boolean VectorOfInt_contains(long jarg1, VectorOfInt jarg1_, int jarg2);
+  public final static native int VectorOfInt_indexOf(long jarg1, VectorOfInt jarg1_, int jarg2);
+  public final static native int VectorOfInt_get(long jarg1, VectorOfInt jarg1_, int jarg2);
+  public final static native void VectorOfInt_set(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
+  public final static native void VectorOfInt_add__SWIG_1(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
+  public final static native boolean VectorOfInt_remove(long jarg1, VectorOfInt jarg1_, int jarg2);
+  public final static native java.nio.ByteBuffer VectorOfInt_asByteBuffer(long jarg1, VectorOfInt jarg1_, int jarg2, int jarg3);
+  public final static native void delete_VectorOfInt(long jarg1);
+  public final static native long new_VectorOfBool__SWIG_0();
+  public final static native long new_VectorOfBool__SWIG_1(long jarg1);
+  public final static native void VectorOfBool_ensureCapacity(long jarg1, VectorOfBool jarg1_, long jarg2);
+  public final static native void VectorOfBool_resize(long jarg1, VectorOfBool jarg1_, long jarg2);
+  public final static native int VectorOfBool_size(long jarg1, VectorOfBool jarg1_);
+  public final static native boolean VectorOfBool_isEmpty(long jarg1, VectorOfBool jarg1_);
+  public final static native void VectorOfBool_clear(long jarg1, VectorOfBool jarg1_);
+  public final static native void VectorOfBool_add__SWIG_0(long jarg1, VectorOfBool jarg1_, boolean jarg2);
+  public final static native boolean VectorOfBool_get(long jarg1, VectorOfBool jarg1_, int jarg2);
+  public final static native void VectorOfBool_set(long jarg1, VectorOfBool jarg1_, int jarg2, boolean jarg3);
+  public final static native void VectorOfBool_add__SWIG_1(long jarg1, VectorOfBool jarg1_, int jarg2, boolean jarg3);
+  public final static native boolean VectorOfBool_remove(long jarg1, VectorOfBool jarg1_, boolean jarg2);
+  public final static native void delete_VectorOfBool(long jarg1);
+  public final static native long new_VectorOfDouble__SWIG_0();
+  public final static native long new_VectorOfDouble__SWIG_1(long jarg1);
+  public final static native void VectorOfDouble_ensureCapacity(long jarg1, VectorOfDouble jarg1_, long jarg2);
+  public final static native void VectorOfDouble_resize(long jarg1, VectorOfDouble jarg1_, long jarg2);
+  public final static native int VectorOfDouble_size(long jarg1, VectorOfDouble jarg1_);
+  public final static native boolean VectorOfDouble_isEmpty(long jarg1, VectorOfDouble jarg1_);
+  public final static native void VectorOfDouble_clear(long jarg1, VectorOfDouble jarg1_);
+  public final static native void VectorOfDouble_add__SWIG_0(long jarg1, VectorOfDouble jarg1_, double jarg2);
+  public final static native boolean VectorOfDouble_contains(long jarg1, VectorOfDouble jarg1_, double jarg2);
+  public final static native int VectorOfDouble_indexOf(long jarg1, VectorOfDouble jarg1_, double jarg2);
+  public final static native double VectorOfDouble_get(long jarg1, VectorOfDouble jarg1_, int jarg2);
+  public final static native void VectorOfDouble_set(long jarg1, VectorOfDouble jarg1_, int jarg2, double jarg3);
+  public final static native void VectorOfDouble_add__SWIG_1(long jarg1, VectorOfDouble jarg1_, int jarg2, double jarg3);
+  public final static native boolean VectorOfDouble_remove(long jarg1, VectorOfDouble jarg1_, double jarg2);
+  public final static native java.nio.ByteBuffer VectorOfDouble_asByteBuffer(long jarg1, VectorOfDouble jarg1_, int jarg2, int jarg3);
+  public final static native void delete_VectorOfDouble(long jarg1);
+  public final static native long new_VectorOfString__SWIG_0();
+  public final static native long new_VectorOfString__SWIG_1(long jarg1);
+  public final static native void VectorOfString_ensureCapacity(long jarg1, VectorOfString jarg1_, long jarg2);
+  public final static native void VectorOfString_resize(long jarg1, VectorOfString jarg1_, long jarg2);
+  public final static native int VectorOfString_size(long jarg1, VectorOfString jarg1_);
+  public final static native boolean VectorOfString_isEmpty(long jarg1, VectorOfString jarg1_);
+  public final static native void VectorOfString_clear(long jarg1, VectorOfString jarg1_);
+  public final static native void VectorOfString_add__SWIG_0(long jarg1, VectorOfString jarg1_, String jarg2);
+  public final static native boolean VectorOfString_contains(long jarg1, VectorOfString jarg1_, String jarg2);
+  public final static native int VectorOfString_indexOf(long jarg1, VectorOfString jarg1_, String jarg2);
+  public final static native String VectorOfString_get(long jarg1, VectorOfString jarg1_, int jarg2);
+  public final static native void VectorOfString_set(long jarg1, VectorOfString jarg1_, int jarg2, String jarg3);
+  public final static native void VectorOfString_add__SWIG_1(long jarg1, VectorOfString jarg1_, int jarg2, String jarg3);
+  public final static native boolean VectorOfString_remove(long jarg1, VectorOfString jarg1_, String jarg2);
+  public final static native java.nio.ByteBuffer VectorOfString_asByteBuffer(long jarg1, VectorOfString jarg1_, int jarg2, int jarg3);
+  public final static native void delete_VectorOfString(long jarg1);
+  public final static native long new_VectorOfScicosID__SWIG_0();
+  public final static native long new_VectorOfScicosID__SWIG_1(long jarg1);
+  public final static native void VectorOfScicosID_ensureCapacity(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native void VectorOfScicosID_resize(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native int VectorOfScicosID_size(long jarg1, VectorOfScicosID jarg1_);
+  public final static native boolean VectorOfScicosID_isEmpty(long jarg1, VectorOfScicosID jarg1_);
+  public final static native void VectorOfScicosID_clear(long jarg1, VectorOfScicosID jarg1_);
+  public final static native void VectorOfScicosID_add__SWIG_0(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native boolean VectorOfScicosID_contains(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native int VectorOfScicosID_indexOf(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native long VectorOfScicosID_get(long jarg1, VectorOfScicosID jarg1_, int jarg2);
+  public final static native void VectorOfScicosID_set(long jarg1, VectorOfScicosID jarg1_, int jarg2, long jarg3);
+  public final static native void VectorOfScicosID_add__SWIG_1(long jarg1, VectorOfScicosID jarg1_, int jarg2, long jarg3);
+  public final static native boolean VectorOfScicosID_remove(long jarg1, VectorOfScicosID jarg1_, long jarg2);
+  public final static native java.nio.ByteBuffer VectorOfScicosID_asByteBuffer(long jarg1, VectorOfScicosID jarg1_, int jarg2, int jarg3);
+  public final static native void delete_VectorOfScicosID(long jarg1);
+  public final static native void register_view(String jarg1, long jarg2, View jarg2_);
+  public final static native void unregister_view(long jarg1, View jarg1_);
 
-    static {
-        try {
-            System.loadLibrary("scixcos");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            System.exit(-1);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library scicommons does not exist or cannot be found.");
-            if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
-                System.err.println(e.getLocalizedMessage());
-                System.err.println("Current java.library.path is : " + System.getProperty("java.library.path"));
-                System.exit(-1);
-            } else {
-                System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
-            }
+  static {
+    try {
+        System.loadLibrary("scixcos");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        System.exit(-1);
+    } catch (UnsatisfiedLinkError e)    {
+           System.err.println("The native library scicommons does not exist or cannot be found.");
+        if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
+           System.err.println(e.getLocalizedMessage());
+           System.err.println("Current java.library.path is : "+System.getProperty("java.library.path"));
+           System.exit(-1);
+        }else{
+           System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
         }
     }
+  }
 
 
-    public static void SwigDirector_View_objectCreated(View jself, long uid, int kind) {
-        jself.objectCreated(uid, Kind.class.getEnumConstants()[kind]);
-    }
-    public static void SwigDirector_View_objectReferenced(View jself, long uid, int kind, long refCount) {
-        jself.objectReferenced(uid, Kind.class.getEnumConstants()[kind], refCount);
-    }
-    public static void SwigDirector_View_objectUnreferenced(View jself, long uid, int kind, long refCount) {
-        jself.objectUnreferenced(uid, Kind.class.getEnumConstants()[kind], refCount);
-    }
-    public static void SwigDirector_View_objectDeleted(View jself, long uid, int kind) {
-        jself.objectDeleted(uid, Kind.class.getEnumConstants()[kind]);
-    }
-    public static void SwigDirector_View_propertyUpdated(View jself, long uid, int kind, int property, int status) {
-        jself.propertyUpdated(uid, Kind.class.getEnumConstants()[kind], ObjectProperties.class.getEnumConstants()[property], UpdateStatus.class.getEnumConstants()[status]);
-    }
+  public static void SwigDirector_View_objectCreated(View jself, long uid, int kind) {
+    jself.objectCreated(uid, Kind.class.getEnumConstants()[kind]);
+  }
+  public static void SwigDirector_View_objectReferenced(View jself, long uid, int kind, long refCount) {
+    jself.objectReferenced(uid, Kind.class.getEnumConstants()[kind], refCount);
+  }
+  public static void SwigDirector_View_objectUnreferenced(View jself, long uid, int kind, long refCount) {
+    jself.objectUnreferenced(uid, Kind.class.getEnumConstants()[kind], refCount);
+  }
+  public static void SwigDirector_View_objectDeleted(View jself, long uid, int kind) {
+    jself.objectDeleted(uid, Kind.class.getEnumConstants()[kind]);
+  }
+  public static void SwigDirector_View_propertyUpdated(View jself, long uid, int kind, int property, int status) {
+    jself.propertyUpdated(uid, Kind.class.getEnumConstants()[kind], ObjectProperties.class.getEnumConstants()[property], UpdateStatus.class.getEnumConstants()[status]);
+  }
 
-    private final static native void swig_module_init();
-    static {
-        swig_module_init();
-    }
+  private final static native void swig_module_init();
+  static {
+    swig_module_init();
+  }
 }

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Kind.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Kind.java
index 9a71f6d..168de87 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Kind.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Kind.java
@@ -9,10 +9,10 @@
 package org.scilab.modules.xcos;
 
 public enum Kind {
-  ANNOTATION,
   BLOCK,
   DIAGRAM,
   LINK,
+  ANNOTATION,
   PORT;
 }
 

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/ObjectProperties.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/ObjectProperties.java
index 7b1aa5d..8f3e2c4 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/ObjectProperties.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/ObjectProperties.java
@@ -9,63 +9,63 @@
 package org.scilab.modules.xcos;
 
 public enum ObjectProperties {
-    PARENT_DIAGRAM,
-    PARENT_BLOCK,
-    GEOMETRY,
-    DESCRIPTION,
-    FONT,
-    FONT_SIZE,
-    RELATED_TO,
-    INTERFACE_FUNCTION,
-    SIM_FUNCTION_NAME,
-    SIM_FUNCTION_API,
-    SIM_SCHEDULE,
-    SIM_BLOCKTYPE,
-    SIM_DEP_UT,
-    ANGLE,
-    EXPRS,
-    INPUTS,
-    OUTPUTS,
-    EVENT_INPUTS,
-    EVENT_OUTPUTS,
-    STATE,
-    DSTATE,
-    ODSTATE,
-    NZCROSS,
-    NMODE,
-    RPAR,
-    IPAR,
-    OPAR,
-    EQUATIONS,
-    UID,
-    CHILDREN,
-    PORT_REFERENCE,
-    STYLE,
-    LABEL,
-    DESTINATION_PORT,
-    SOURCE_PORT,
-    CONTROL_POINTS,
-    THICK,
-    COLOR,
-    KIND,
-    FROM,
-    TO,
-    DATATYPE,
-    DATATYPE_ROWS,
-    DATATYPE_COLS,
-    DATATYPE_TYPE,
-    FIRING,
-    SOURCE_BLOCK,
-    PORT_KIND,
-    IMPLICIT,
-    PORT_NUMBER,
-    CONNECTED_SIGNALS,
-    TITLE,
-    PATH,
-    PROPERTIES,
-    DEBUG_LEVEL,
-    DIAGRAM_CONTEXT,
-    VERSION_NUMBER,
-    MAX_OBJECT_PROPERTIES;
+  PARENT_DIAGRAM,
+  PARENT_BLOCK,
+  GEOMETRY,
+  DESCRIPTION,
+  FONT,
+  FONT_SIZE,
+  RELATED_TO,
+  INTERFACE_FUNCTION,
+  SIM_FUNCTION_NAME,
+  SIM_FUNCTION_API,
+  SIM_SCHEDULE,
+  SIM_BLOCKTYPE,
+  SIM_DEP_UT,
+  ANGLE,
+  EXPRS,
+  INPUTS,
+  OUTPUTS,
+  EVENT_INPUTS,
+  EVENT_OUTPUTS,
+  STATE,
+  DSTATE,
+  ODSTATE,
+  NZCROSS,
+  NMODE,
+  RPAR,
+  IPAR,
+  OPAR,
+  EQUATIONS,
+  UID,
+  CHILDREN,
+  PORT_REFERENCE,
+  STYLE,
+  LABEL,
+  DESTINATION_PORT,
+  SOURCE_PORT,
+  CONTROL_POINTS,
+  THICK,
+  COLOR,
+  KIND,
+  FROM,
+  TO,
+  DATATYPE,
+  DATATYPE_ROWS,
+  DATATYPE_COLS,
+  DATATYPE_TYPE,
+  FIRING,
+  SOURCE_BLOCK,
+  PORT_KIND,
+  IMPLICIT,
+  PORT_NUMBER,
+  CONNECTED_SIGNALS,
+  TITLE,
+  PATH,
+  PROPERTIES,
+  DEBUG_LEVEL,
+  DIAGRAM_CONTEXT,
+  VERSION_NUMBER,
+  MAX_OBJECT_PROPERTIES;
 }