Scilab types classes moved from org.scilab.modules.types.scilabTypes to org.scilab...

diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java

index 58c109c..94eb055 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java
@@ -15,7 +15,7 @@ package org.scilab.modules.graph.io;
 import java.util.Map;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.ScilabBoolean;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java

index c17bc57..8d87134 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java
@@ -15,7 +15,7 @@ package org.scilab.modules.graph.io;
 import java.util.Map;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java

index 6c09894..abc14c9 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
@@ -15,8 +15,8 @@ package org.scilab.modules.graph.io;
 import java.util.Map;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabIntegerTypeEnum;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabIntegerTypeEnum;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java

index 3c19029..3d9cd9d 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java
@@ -15,9 +15,9 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabTList;
 import org.w3c.dom.Node;
 
 import com.mxgraph.io.mxCodec;
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java

index 36cac20..1837165 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java
@@ -14,11 +14,11 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java

index 93369f7..38d0f1c 100644 (file)
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java
@@ -16,7 +16,7 @@ package org.scilab.modules.graph.io;
 import java.util.Map;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabString;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java

index bf3a30e..ec27c57 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java
@@ -18,14 +18,14 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 
 /**
  * H5Read
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java

index 21b76a6..b98e566 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java
@@ -16,7 +16,7 @@ import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.ScilabBoolean;
 
 /**
  * H5ReadScilabBoolean
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java

index 8a0cdf4..5245fdc 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java
@@ -16,7 +16,7 @@ import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 
 public class H5ReadScilabDouble {
     public static void readData(int dataSetId, ScilabDouble data) throws NullPointerException, HDF5Exception {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java

index fd0b0ca..03a70e5 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java
@@ -16,7 +16,7 @@ import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
+import org.scilab.modules.types.ScilabInteger;
 
 public class H5ReadScilabInteger {
        public static void readData(int dataSetId, ScilabInteger data) throws NullPointerException, HDF5Exception {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java

index 8054b39..b5c13c3 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import ncsa.hdf.hdf5lib.H5;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.ScilabList;
 
 public class H5ReadScilabList extends H5ReadScilabCommonList {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java

index c40ace4..333f30b 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabTList;
 
 public class H5ReadScilabMList extends H5ReadScilabCommonList {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java

index edc4c37..7d64eee 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java
@@ -17,7 +17,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
 
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabString;
 
 public class H5ReadScilabString {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java

index fe2c064..41eb913 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabTList;
 
 public class H5ReadScilabTList extends H5ReadScilabCommonList {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java

index 780eec5..c18549c 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java
@@ -16,14 +16,14 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 
 
 public class H5Write {  
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java

index 8c7d4f4..a3fb13d 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java
@@ -17,7 +17,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.ScilabBoolean;
 
 public class H5WriteScilabBoolean {
     public static void writeInDataSet(int file_id, String dataSetName,ScilabBoolean data) throws NullPointerException, HDF5Exception {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java

index 8adbe66..fd4a255 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java
@@ -19,7 +19,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabType;
 
 public class H5WriteScilabCommonList {
        protected static void writeInDataSet(int file_id, String dataSetName, ArrayList<ScilabType> data, String ListType) throws NullPointerException, HDF5Exception {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java

index 952acbe..e34c817 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java
@@ -17,7 +17,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 
 public class H5WriteScilabDouble {
        public static void writeInDataSet(int fileId, String dataSetName, ScilabDouble data) throws NullPointerException, HDF5Exception {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java

index b72ae7a..1e0c52a 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java
@@ -17,8 +17,8 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabIntegerTypeEnum;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabIntegerTypeEnum;
 
 
 public class H5WriteScilabInteger {
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java

index 40f3485..78224b5 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java
@@ -15,7 +15,7 @@ package org.scilab.modules.hdf5.write;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.ScilabList;
 
 public class H5WriteScilabList extends H5WriteScilabCommonList {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java

index 51c4481..f365a21 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java
@@ -14,7 +14,7 @@ package org.scilab.modules.hdf5.write;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
+import org.scilab.modules.types.ScilabMList;
 
 public class H5WriteScilabMList extends H5WriteScilabCommonList {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java

index 50940e9..2e7f57f 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java
@@ -17,7 +17,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabString;
 
 public class H5WriteScilabString {
 
diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java

index 33e3725..5eb2e9b 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java
+++ b/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java
@@ -15,7 +15,7 @@ package org.scilab.modules.hdf5.write;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabTList;
 
 public class H5WriteScilabTList extends H5WriteScilabCommonList {
 
diff --git a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java

index f7f96bc..48a8623 100644 (file)
--- a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java
+++ b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java
@@ -16,7 +16,7 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.ScilabBoolean;
 import org.scilab.modules.hdf5.write.H5Write;
 
 
diff --git a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java

index d8e2be9..633be3c 100644 (file)
--- a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java
+++ b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java
@@ -17,7 +17,7 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 import org.scilab.modules.hdf5.write.H5Write;
 
 
diff --git a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java

index f641373..0575224 100644 (file)
--- a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java
+++ b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java
@@ -16,11 +16,11 @@ import org.testng.annotations.*;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
 import org.scilab.modules.hdf5.write.H5Write;
 
 public class testScilabGraph {
diff --git a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java

index 75ba101..9fc3e20 100644 (file)
--- a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java
+++ b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java
@@ -17,9 +17,9 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
 import org.scilab.modules.hdf5.write.H5Write;
 
 public class testScilabList {
diff --git a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java

index 97eca3e..2b0e9ca 100644 (file)
--- a/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java
+++ b/scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java
@@ -16,7 +16,7 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabString;
 import org.scilab.modules.hdf5.write.H5Write;
 
 
diff --git a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java

index 2fa26f8..14cb29d 100644 (file)
--- a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java
+++ b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java
@@ -9,8 +9,8 @@
 package org.scilab.modules.javasci;
 
 
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
-import org.scilab.modules.types.scilabTypes.ScilabIntegerTypeEnum;
+import org.scilab.modules.types.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabIntegerTypeEnum;
 
  /**
    * Connector for Javasci v2
diff --git a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java

index 20ca8b4..38c7500 100644 (file)
--- a/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
+++ b/scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
@@ -14,13 +14,13 @@ package org.scilab.modules.javasci;
 import java.io.File;
 import java.io.FileNotFoundException;
 
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
-import org.scilab.modules.types.scilabTypes.ScilabIntegerTypeEnum;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabIntegerTypeEnum;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabInteger;
 import org.scilab.modules.javasci.Call_Scilab;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
 import org.scilab.modules.javasci.JavasciException.UnsupportedTypeException;
@@ -89,7 +89,6 @@ public class Scilab {
         * @return if the operation is successful
         */
        public boolean open() throws InitializationException {
-
                int res = Call_Scilab.Call_ScilabOpen(this.SCI, null, -1);
                switch (res) {
                        case -1: 
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testErrorManagement.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testErrorManagement.java

index ffb9dea..d51b39e 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testErrorManagement.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testErrorManagement.java
@@ -14,9 +14,11 @@ package org.scilab.tests.modules.javasci;
 import org.testng.annotations.*;
 
 import org.scilab.modules.javasci.Scilab;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
 
+
 public class testErrorManagement {
        private Scilab sci;
 
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExec.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExec.java

index 48fac33..64bd6d5 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExec.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExec.java
@@ -21,8 +21,8 @@ import java.io.FileNotFoundException;
 import org.scilab.modules.javasci.Scilab;
 import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
 
 public class testExec {
        private Scilab sci;
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExistingVariable.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExistingVariable.java

new file mode 100644 (file)

index 0000000..c28b8cb
--- /dev/null
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExistingVariable.java
@@ -0,0 +1,71 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+package org.scilab.tests.modules.javasci;
+
+import org.testng.annotations.*;
+
+import org.scilab.modules.javasci.Scilab;
+import org.scilab.modules.javasci.JavasciException;
+import org.scilab.modules.javasci.JavasciException.InitializationException;
+import org.scilab.modules.javasci.JavasciException.UnsupportedTypeException;
+import org.scilab.modules.javasci.JavasciException.UndefinedVariableException;
+import org.scilab.modules.types.ScilabDouble;
+
+public class testExistingVariable {
+       private Scilab sci;
+
+       /* 
+        * This method will be called for each test.
+        * with @AfterMethod, this ensures that all the time the engine is closed
+        * especially in case of error.
+        * Otherwise, the engine might be still running and all subsequent tests
+        * would fail.
+        */ 
+       @BeforeMethod
+       public void open() throws NullPointerException, InitializationException {
+               sci = new Scilab();
+        assert sci.open() == true;
+       }
+
+       @Test(sequential = true) 
+       public void existVariableTest() throws NullPointerException, JavasciException {
+        double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};
+        ScilabDouble aOriginal = new ScilabDouble(a);
+        sci.put("a",aOriginal);
+        assert sci.isExistingVariable("a") == true;
+    }
+
+       @Test(sequential = true) 
+       public void notExistVariableTest() throws NullPointerException, JavasciException {
+        assert sci.isExistingVariable("a") == false;
+        assert sci.isExistingVariable("b") == false;
+    }
+
+
+       @Test(sequential = true) 
+       public void existVariableAfterExecTest() throws NullPointerException, JavasciException {
+        assert sci.exec("a=rand(20,20);") == true;
+        assert sci.isExistingVariable("a") == true;
+        assert sci.exec("b='test variable';") == true;
+        assert sci.isExistingVariable("b") == true;
+    }
+
+
+       /**
+        * See #open()
+        */
+       @AfterMethod
+       public void close() {
+               sci.close();
+               
+       }
+}
\ No newline at end of file
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testGraphics.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testGraphics.java

new file mode 100644 (file)

index 0000000..d5df7e1
--- /dev/null
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testGraphics.java
@@ -0,0 +1,58 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Sylvestre LEDRU
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+package org.scilab.tests.modules.javasci;
+
+import org.testng.annotations.*;
+
+import org.scilab.modules.javasci.Scilab;
+import org.scilab.modules.javasci.JavasciException;
+import org.scilab.modules.javasci.JavasciException.UndefinedVariableException;
+import org.scilab.modules.types.ScilabTypeEnum;
+
+public class testGraphics {
+       private Scilab sci;
+
+       /* 
+        * This method will be called for each test.
+        * with @AfterMethod, this ensures that all the time the engine is closed
+        * especially in case of error.
+        * Otherwise, the engine might be still running and all subsequent tests
+        * would fail.
+        */ 
+       @BeforeMethod
+       public void open() throws NullPointerException, JavasciException {
+               sci = new Scilab();
+               assert sci.open() == true;
+       }
+
+       @Test(sequential = true) 
+       public void isGraphicOpenedTest() throws NullPointerException, JavasciException {
+               sci.exec("plot3d();");
+               assert sci.isGraphicOpened() == true;
+       }
+
+       @Test(sequential = true) 
+       public void isGraphicNotOpenedTest() throws NullPointerException, JavasciException {
+
+               sci.exec("a=1+1;");
+               assert sci.isGraphicOpened() == false;
+       }
+
+       /**
+        * See #open()
+        */
+       @AfterMethod
+       public void close() {
+               sci.close();
+               
+       }
+}
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testOpenClose.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testOpenClose.java

index 832b4db..4595d3c 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testOpenClose.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testOpenClose.java
@@ -15,9 +15,9 @@ import org.testng.annotations.*;
 import java.io.IOException;
 
 import org.scilab.modules.javasci.Scilab;
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabBoolean;
 import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
 
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java

index 0fbdbf6..8a3308f 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java
@@ -18,11 +18,11 @@ import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
 import org.scilab.modules.javasci.JavasciException.UnsupportedTypeException;
 import org.scilab.modules.javasci.JavasciException.UndefinedVariableException;
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTypeEnum;
 
 public class testReadWrite {
        private Scilab sci;
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteInteger.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteInteger.java

index 14e6e5c..273efeb 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteInteger.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteInteger.java
@@ -17,8 +17,8 @@ import org.scilab.modules.javasci.Scilab;
 import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.InitializationException;
 import org.scilab.modules.javasci.JavasciException.UnsupportedTypeException;
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabInteger;
 
 public class testReadWriteInteger {
        private Scilab sci;
diff --git a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testTypes.java b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testTypes.java

index 7ea230c..60596f3 100644 (file)
--- a/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testTypes.java
+++ b/scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testTypes.java
@@ -16,7 +16,7 @@ import org.testng.annotations.*;
 import org.scilab.modules.javasci.Scilab;
 import org.scilab.modules.javasci.JavasciException;
 import org.scilab.modules.javasci.JavasciException.UndefinedVariableException;
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabTypeEnum;
 
 public class testTypes {
        private Scilab sci;
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java

similarity index 96%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java

index 04c5f5b..317b534 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
@@ -11,7 +11,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.Arrays;
 
@@ -102,7 +102,7 @@ public class ScilabBoolean implements ScilabType {
     
 
     /**
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#equals(Object)
+        * @see org.scilab.modules.types.ScilabType#equals(Object)
      */
     public boolean equals(Object obj) {
         if (obj instanceof ScilabBoolean) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java

similarity index 95%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java

index d44b67d..661f6ce 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
@@ -11,7 +11,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.Arrays;
 
@@ -151,7 +151,7 @@ public class ScilabDouble implements ScilabType {
 
        /**
         * @return the height of the data matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+        * @see org.scilab.modules.types.ScilabType#getHeight()
         */
        @Override
        public int getHeight() {
@@ -163,7 +163,7 @@ public class ScilabDouble implements ScilabType {
 
        /**
         * @return the width of the data matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+        * @see org.scilab.modules.types.ScilabType#getWidth()
         */
        @Override
        public int getWidth() {
@@ -175,7 +175,7 @@ public class ScilabDouble implements ScilabType {
        }
 
     /**
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#equals(Object)
+        * @see org.scilab.modules.types.ScilabType#equals(Object)
      */
     public boolean equals(Object obj) {
         if (obj instanceof ScilabDouble) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java

similarity index 97%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java

index 6372b52..a32b8fb 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.Arrays;
 
@@ -320,7 +320,7 @@ public class ScilabInteger implements ScilabType {
 
        /**
         * @return the height of the value matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+        * @see org.scilab.modules.types.ScilabType#getHeight()
         */
        @Override
                public int getHeight() {
@@ -356,7 +356,7 @@ public class ScilabInteger implements ScilabType {
 
        /**
         * @return the width of the value matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+        * @see org.scilab.modules.types.ScilabType#getWidth()
         */
        @Override
        public int getWidth() {
@@ -416,7 +416,7 @@ public class ScilabInteger implements ScilabType {
        }
        
        /**
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#equals(Object)
+        * @see org.scilab.modules.types.ScilabType#equals(Object)
         */
        public boolean equals(Object obj) {
                if (obj instanceof ScilabInteger) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabIntegerTypeEnum.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java

similarity index 97%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabIntegerTypeEnum.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java

index be512ff..6f23e93 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabIntegerTypeEnum.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 public enum ScilabIntegerTypeEnum {
   sci_int8(1),
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java

similarity index 90%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java

index 6b0f6e9..8835af3 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -40,7 +40,7 @@ public class ScilabList extends ArrayList<ScilabType> implements ScilabType {
        
        /**
         * @return 1 when there is data on the list, 0 otherwise.
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+        * @see org.scilab.modules.types.ScilabType#getHeight()
         */
     public int getHeight() {
                if (isEmpty()) {
@@ -51,7 +51,7 @@ public class ScilabList extends ArrayList<ScilabType> implements ScilabType {
 
     /**
      * @return 1 when there is data on the list, 0 otherwise.
-     * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+     * @see org.scilab.modules.types.ScilabType#getWidth()
      */
     public int getWidth() {
                if (isEmpty()) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java

similarity index 93%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java

index 879d4d8..e163e2b 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64,7 +64,7 @@ public class ScilabMList extends ArrayList<ScilabType> implements ScilabType {
     
     /**
      * @return 1 when there is data on the list, 0 otherwise.
-     * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+     * @see org.scilab.modules.types.ScilabType#getHeight()
      */
        public int getHeight() {
                if (isEmpty()) {
@@ -75,7 +75,7 @@ public class ScilabMList extends ArrayList<ScilabType> implements ScilabType {
 
        /**
      * @return 1 when there is data on the list, 0 otherwise.
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+        * @see org.scilab.modules.types.ScilabType#getWidth()
         */
        public int getWidth() {
                if (isEmpty()) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java

similarity index 92%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java

index 4a454f9..9655582 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.Arrays;
 
@@ -85,7 +85,7 @@ public class ScilabString implements ScilabType {
     
        /**
         * @return the height of the data matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+        * @see org.scilab.modules.types.ScilabType#getHeight()
         */
     public int getHeight() {
                if (data == null) {
@@ -96,7 +96,7 @@ public class ScilabString implements ScilabType {
 
        /**
         * @return the width of the data matrix
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+        * @see org.scilab.modules.types.ScilabType#getWidth()
         */
        public int getWidth() {
                if (data == null) {
@@ -114,7 +114,7 @@ public class ScilabString implements ScilabType {
     }
     
     /**
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#equals(Object)
+        * @see org.scilab.modules.types.ScilabType#equals(Object)
      */
     public boolean equals(Object obj) {
         if (obj instanceof ScilabString) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java

similarity index 93%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java

index deebea9..833315d 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64,7 +64,7 @@ public class ScilabTList extends ArrayList<ScilabType> implements ScilabType {
     
     /**
      * @return 1 when there is data on the list, 0 otherwise.
-     * @see org.scilab.modules.types.scilabTypes.ScilabType#getHeight()
+     * @see org.scilab.modules.types.ScilabType#getHeight()
      */
        public int getHeight() {
                if (isEmpty()) {
@@ -75,7 +75,7 @@ public class ScilabTList extends ArrayList<ScilabType> implements ScilabType {
 
        /**
      * @return 1 when there is data on the list, 0 otherwise.
-        * @see org.scilab.modules.types.scilabTypes.ScilabType#getWidth()
+        * @see org.scilab.modules.types.ScilabType#getWidth()
         */
        public int getWidth() {
                if (isEmpty()) {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java

similarity index 96%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java

index 60d7643..067753b 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 import java.io.Serializable;
 
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTypeEnum.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java

similarity index 97%

rename from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTypeEnum.java

rename to scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java

index 0833c05..cda06ea 100644 (file)
--- a/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTypeEnum.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.scilab.modules.types.scilabTypes;
+package org.scilab.modules.types;
 
 public enum ScilabTypeEnum {
   sci_matrix(1),
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/types.java b/scilab/modules/types/src/java/org/scilab/modules/types/types.java

new file mode 100644 (file)

index 0000000..33086c7
--- /dev/null
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/types.java
@@ -0,0 +1,12 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.scilab.modules.types;
+
+public class types {
+}
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/typesJNI.java b/scilab/modules/types/src/java/org/scilab/modules/types/typesJNI.java

new file mode 100644 (file)

index 0000000..f2b11bf
--- /dev/null
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/typesJNI.java
@@ -0,0 +1,12 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.40
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.scilab.modules.types;
+
+class typesJNI {
+}
diff --git a/scilab/modules/types/src/jni/sci_types.i b/scilab/modules/types/src/jni/sci_types.i

index aa0d116..cba6e56 100644 (file)
--- a/scilab/modules/types/src/jni/sci_types.i
+++ b/scilab/modules/types/src/jni/sci_types.i
@@ -12,7 +12,7 @@
 
 /* sci_types.i */
 /**
- * Windows: swig -java -package org.scilab.modules.types.scilabTypes -outdir ../java/org/scilab/modules/types/scilabTypes/ sci_types.i 
+ * Windows: swig -java -package org.scilab.modules.types -outdir ../java/org/scilab/modules/types/ sci_types.i 
  * Other: Use the option --enable-build-swig to the configure
 */
 
diff --git a/scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java b/scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java

index 92782fe..9017224 100644 (file)
--- a/scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java
+++ b/scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java
@@ -15,13 +15,13 @@ import org.testng.annotations.*;
 
 import java.util.Arrays;
 
-import org.scilab.modules.types.scilabTypes.ScilabType;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabInteger;
-import org.scilab.modules.types.scilabTypes.ScilabIntegerTypeEnum;
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabInteger;
+import org.scilab.modules.types.ScilabIntegerTypeEnum;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabList;
 
 public class testEquals {
 
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java

index a3a3d53..5bc0077 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java
@@ -42,7 +42,7 @@ import org.scilab.modules.gui.textbox.TextBox;
 import org.scilab.modules.gui.toolbar.ToolBar;
 import org.scilab.modules.gui.utils.UIElementMapper;
 import org.scilab.modules.gui.window.Window;
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabTypeEnum;
 import org.scilab.modules.ui_data.BrowseVar;
 import org.scilab.modules.ui_data.actions.BooleanFilteringAction;
 import org.scilab.modules.ui_data.actions.CompiledFunctionFilteringAction;
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/rowfilter/VariableBrowserRowFilter.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/rowfilter/VariableBrowserRowFilter.java

index 8f93c6c..1d2ba9e 100644 (file)
--- a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/rowfilter/VariableBrowserRowFilter.java
+++ b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/rowfilter/VariableBrowserRowFilter.java
@@ -4,7 +4,7 @@ import java.util.HashSet;
 
 import javax.swing.RowFilter;
 
-import org.scilab.modules.types.scilabTypes.ScilabTypeEnum;
+import org.scilab.modules.types.ScilabTypeEnum;
 
 public class VariableBrowserRowFilter extends RowFilter<Object, Object>{
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java

index 58e6f57..559c652 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java
@@ -29,10 +29,10 @@ import org.apache.commons.logging.LogFactory;
 import org.scilab.modules.graph.utils.Font;
 import org.scilab.modules.graph.utils.ScilabExported;
 import org.scilab.modules.graph.utils.StyleMap;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.scicos.AbstractElement;
 
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java

index cda36a5..a68f9cb 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
@@ -56,10 +56,10 @@ import org.scilab.modules.gui.menu.ScilabMenu;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
 import org.scilab.modules.hdf5.write.H5Write;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.XcosTab;
 import org.scilab.modules.xcos.actions.EditFormatAction;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java

index 06c94dd..37cafd6 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block;
 
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 
 /**
  * @author Bruno JOFRET
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java

index 509f6fe..9102dcb 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java
@@ -13,8 +13,8 @@
 
 package org.scilab.modules.xcos.block;
 
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 
 /**
  * A {@link BasicBlock} which print getExprs()[0][0] as bloc value.
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java

index 5d64c6b..ccefd0d 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java
@@ -11,8 +11,8 @@
  */
 package org.scilab.modules.xcos.block;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
 import org.scilab.modules.xcos.link.BasicLink;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.command.CommandPort;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java

index 6af243e..8044c18 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
@@ -23,9 +23,9 @@ import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.gui.contextmenu.ContextMenu;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.XcosTab;
 import org.scilab.modules.xcos.block.actions.CodeGenerationAction;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java

index 2592495..8a282af 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java
@@ -19,8 +19,8 @@ import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.Font;
 import org.scilab.modules.graph.utils.StyleMap;
 import org.scilab.modules.gui.menu.Menu;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.actions.BlockParametersAction;
 import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction;
 import org.scilab.modules.xcos.utils.XcosMessages;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java

index 5fc5ecb..4aa1cbb 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
@@ -27,9 +27,9 @@ import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.ScilabGraphUniqueObject;
 import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.BlockFactory;
 import org.scilab.modules.xcos.block.SplitBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java

index 72a1373..d180ee8 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java
@@ -19,9 +19,9 @@ import java.util.Arrays;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
 import org.scilab.modules.xcos.block.SuperBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java

index 848fe92..e85d942 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java
@@ -37,10 +37,10 @@ import org.apache.commons.logging.LogFactory;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.SuperBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.XcosMessages;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java

index 67ad5a1..1001f08 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
@@ -24,9 +24,9 @@ import java.util.Map;
 
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.SuperBlock;
 import org.scilab.modules.xcos.graph.SuperBlockDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java

index 31452c2..0b1f6c1 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java
@@ -18,7 +18,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.input.InputPort;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java

index 28c851c..5ee493f 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java
@@ -18,7 +18,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.input.InputPort;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java

index 10b4111..5ca9c57 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
@@ -69,7 +69,7 @@ import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
 import org.scilab.modules.gui.tab.Tab;
 import org.scilab.modules.gui.utils.SciFileFilter;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
+import org.scilab.modules.types.ScilabMList;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.XcosTab;
 import org.scilab.modules.xcos.actions.DiagramBackgroundAction;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/AbstractElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/AbstractElement.java

index 2327ff6..045d7f1 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/AbstractElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/AbstractElement.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.xcos.io.scicos;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 
 /**
  * Root implementation for any Element.
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BasicBlockInfo.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BasicBlockInfo.java

index 1342cd9..3ca4e5f 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BasicBlockInfo.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BasicBlockInfo.java
@@ -17,7 +17,7 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.ScilabDouble;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.port.BasicPort;
 import org.scilab.modules.xcos.port.Orientation;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java

index 01b30b8..ff697fd 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java
@@ -19,11 +19,11 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.BlockFactory;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
@@ -101,7 +101,7 @@ public class BlockElement extends AbstractElement<BasicBlock> {
         * @param into the target, if null a new instance is allocated and returned.
         * @return the decoded block.
         * @throws ScicosFormatException when e decoding error occurred.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType, java.lang.Object)
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType, java.lang.Object)
         */
        @Override
        public BasicBlock decode(ScilabType element, BasicBlock into) throws ScicosFormatException {
@@ -301,7 +301,7 @@ public class BlockElement extends AbstractElement<BasicBlock> {
         * 
         * @param element the current element
         * @return true, if the element can be decoded, false otherwise
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -317,7 +317,7 @@ public class BlockElement extends AbstractElement<BasicBlock> {
         * @param from the source instance
         * @param element the previously allocated element.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(BasicBlock from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockGraphicElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockGraphicElement.java

index a95e1d1..8232e77 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockGraphicElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockGraphicElement.java
@@ -16,13 +16,13 @@ import static java.util.Arrays.asList;
 
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongStructureException;
@@ -77,7 +77,7 @@ class BlockGraphicElement extends BlockPartsElement {
         * @return the modified into block.
         * @throws ScicosFormatException
         *             on error.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -349,7 +349,7 @@ class BlockGraphicElement extends BlockPartsElement {
         * @param element
         *            the Scicos element
         * @return true, if the Scicos types match.
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -365,7 +365,7 @@ class BlockGraphicElement extends BlockPartsElement {
         * @param from the source instance
         * @param element must be null
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(BasicBlock from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java

index db90c92..23c1e3d 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java
@@ -16,13 +16,13 @@ import static java.util.Arrays.asList;
 
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.BasicBlock.SimulationFunctionType;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
@@ -70,7 +70,7 @@ class BlockModelElement extends BlockPartsElement {
         * @return the modified into block.
         * @throws ScicosFormatException
         *             on error.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -458,7 +458,7 @@ class BlockModelElement extends BlockPartsElement {
         * @param element
         *            the Scicos element
         * @return true, if the Scicos types match.
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -474,7 +474,7 @@ class BlockModelElement extends BlockPartsElement {
         * @param from the source instance
         * @param element must be null.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        // CSOFF: JavaNCSS
        @Override
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockPartsElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockPartsElement.java

index aece976..b31ca39 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockPartsElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockPartsElement.java
@@ -12,10 +12,10 @@
 
 package org.scilab.modules.xcos.io.scicos;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 
 /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/DiagramElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/DiagramElement.java

index be81698..40c058e 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/DiagramElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/DiagramElement.java
@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.scilab.modules.types.scilabTypes.ScilabBoolean;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabBoolean;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.TextBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
@@ -117,7 +117,7 @@ public class DiagramElement extends AbstractElement<XcosDiagram> {
         *            the Xcos instance, if null, a new instance is returned.
         * @return the modified into parameters
         * @throws ScicosFormatException when a decoding error occurs
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -136,7 +136,7 @@ public class DiagramElement extends AbstractElement<XcosDiagram> {
         * @param validate true, if the diagram version will be checked. false otherwise.
         * @return the modified into parameters
         * @throws ScicosFormatException when a decoding error occurs
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        public XcosDiagram decode(ScilabType element, XcosDiagram into, boolean validate)
@@ -179,7 +179,7 @@ public class DiagramElement extends AbstractElement<XcosDiagram> {
         * @param element the encoded element
         * @param into the target instance
         * @return the modified target instance
-        * @see org.scilab.modules.xcos.io.scicos.AbstractElement#afterDecode(org.scilab.modules.types.scilabTypes.ScilabType, java.lang.Object)
+        * @see org.scilab.modules.xcos.io.scicos.AbstractElement#afterDecode(org.scilab.modules.types.ScilabType, java.lang.Object)
         */
        @Override
        public XcosDiagram afterDecode(ScilabType element, XcosDiagram into) {
@@ -363,7 +363,7 @@ public class DiagramElement extends AbstractElement<XcosDiagram> {
        /**
         * @param element the base element
         * @return true if the header is valid, false otherwise
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -389,7 +389,7 @@ public class DiagramElement extends AbstractElement<XcosDiagram> {
         * @param from the source instance
         * @param element the previously allocated element.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(XcosDiagram from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/Element.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/Element.java

index c192d2d..c64d7d6 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/Element.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/Element.java
@@ -12,7 +12,7 @@
 
 package org.scilab.modules.xcos.io.scicos;
 
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabType;
 
 /**
  * Define the methods used by any *Element to read/write Scicos elements.
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/H5RWHandler.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/H5RWHandler.java

index 2dcc53a..aea11fc 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/H5RWHandler.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/H5RWHandler.java
@@ -23,10 +23,10 @@ import org.apache.commons.logging.LogFactory;
 import org.scilab.modules.graph.utils.StyleMap;
 import org.scilab.modules.hdf5.read.H5Read;
 import org.scilab.modules.hdf5.write.H5Write;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.VersionMismatchException;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/InputPortElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/InputPortElement.java

index a6bb9c4..92d59a6 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/InputPortElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/InputPortElement.java
@@ -16,10 +16,10 @@ import static java.util.Arrays.asList;
 
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.port.BasicPort.DataType;
 import org.scilab.modules.xcos.port.input.ExplicitInputPort;
 import org.scilab.modules.xcos.port.input.ImplicitInputPort;
@@ -84,7 +84,7 @@ public class InputPortElement extends AbstractElement<InputPort> {
         * @return the modified into block.
         * @throws ScicosFormatException
         *             on error.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -210,7 +210,7 @@ public class InputPortElement extends AbstractElement<InputPort> {
         * 
         * @param element the current element
         * @return true, if the element can be decoded, false otherwise
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -226,7 +226,7 @@ public class InputPortElement extends AbstractElement<InputPort> {
         * @param from the source instance
         * @param element the previously allocated element.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(InputPort from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LabelElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LabelElement.java

index 8767ff0..dcb862a 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LabelElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LabelElement.java
@@ -16,9 +16,9 @@ import static java.util.Arrays.asList;
 
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.TextBlock;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongStructureException;
@@ -52,7 +52,7 @@ public class LabelElement extends AbstractElement<TextBlock> {
         * @param into the target, if null a new instance is allocated and returned.
         * @return the decoded block.
         * @throws ScicosFormatException when e decoding error occurred.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType, java.lang.Object)
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType, java.lang.Object)
         */
        @Override
        public TextBlock decode(ScilabType element, TextBlock into)
@@ -182,7 +182,7 @@ public class LabelElement extends AbstractElement<TextBlock> {
         * 
         * @param element the element to test
         * @return true when the implementation is the right one, false otherwise.
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -198,7 +198,7 @@ public class LabelElement extends AbstractElement<TextBlock> {
         * @param from not used
         * @param element not used
         * @return always null
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(TextBlock from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LinkElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LinkElement.java

index 345403a..270195e 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LinkElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LinkElement.java
@@ -20,10 +20,10 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongStructureException;
@@ -80,7 +80,7 @@ public class LinkElement extends AbstractElement<BasicLink> {
         * @return the decoded block.
         * @throws ScicosFormatException
         *             when e decoding error occurred.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -371,7 +371,7 @@ public class LinkElement extends AbstractElement<BasicLink> {
         * @param element
         *            the element to test
         * @return true, when the current implementation is the right one
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -390,7 +390,7 @@ public class LinkElement extends AbstractElement<BasicLink> {
         *            the previously allocated element.
         * @return the element parameter
         * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object,
-        *      org.scilab.modules.types.scilabTypes.ScilabType)
+        *      org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(BasicLink from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/OutputPortElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/OutputPortElement.java

index 4bfe7e2..2f376ed 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/OutputPortElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/OutputPortElement.java
@@ -16,10 +16,10 @@ import static java.util.Arrays.asList;
 
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabMList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabMList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.port.BasicPort.DataType;
 import org.scilab.modules.xcos.port.output.ExplicitOutputPort;
 import org.scilab.modules.xcos.port.output.ImplicitOutputPort;
@@ -84,7 +84,7 @@ public class OutputPortElement extends AbstractElement<OutputPort> {
         * @return the modified into block.
         * @throws ScicosFormatException
         *             on error.
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -209,7 +209,7 @@ public class OutputPortElement extends AbstractElement<OutputPort> {
         * 
         * @param element the current element
         * @return true, if the element can be decoded, false otherwise
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -225,7 +225,7 @@ public class OutputPortElement extends AbstractElement<OutputPort> {
         * @param from the source instance
         * @param element the previously allocated element.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(OutputPort from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/ScicosParametersElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/ScicosParametersElement.java

index 4d0259b..15bf2eb 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/ScicosParametersElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/ScicosParametersElement.java
@@ -18,11 +18,11 @@ import java.beans.PropertyVetoException;
 import java.util.List;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.types.scilabTypes.ScilabDouble;
-import org.scilab.modules.types.scilabTypes.ScilabList;
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabDouble;
+import org.scilab.modules.types.ScilabList;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.graph.ScicosParameters;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongStructureException;
@@ -61,7 +61,7 @@ public class ScicosParametersElement extends AbstractElement<ScicosParameters> {
         * @param into the Xcos associated instance
         * @return the modified into parameters
         * @throws ScicosFormatException on decode error
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType, java.lang.Object)
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType, java.lang.Object)
         */
        @Override
        public ScicosParameters decode(ScilabType element, ScicosParameters into)
@@ -324,7 +324,7 @@ public class ScicosParametersElement extends AbstractElement<ScicosParameters> {
         * 
         * @param element the element 
         * @return true when the implementation can be used to decode the element.
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -340,7 +340,7 @@ public class ScicosParametersElement extends AbstractElement<ScicosParameters> {
         * @param from the source instance
         * @param element the previously allocated element.
         * @return the element parameter
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        public ScilabType encode(ScicosParameters from, ScilabType element) {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java

index 3398b77..8522e23 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
 import org.scilab.modules.graph.utils.ScilabExported;
 import org.scilab.modules.hdf5.read.H5Read;
 import org.scilab.modules.localization.Messages;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
+import org.scilab.modules.types.ScilabTList;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.graph.XcosDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PreLoadedElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PreLoadedElement.java

index 024242c..8ab0abe 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PreLoadedElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PreLoadedElement.java
@@ -18,9 +18,9 @@ import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.io.scicos.AbstractElement;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
@@ -50,7 +50,7 @@ public class PreLoadedElement extends AbstractElement<PreLoaded> {
         * 
         * @param element the current element
         * @return <code>true</code> if the data can be decoded by this instance, <code>false</code> otherwise. 
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -67,7 +67,7 @@ public class PreLoadedElement extends AbstractElement<PreLoaded> {
         * @param into the target of the decoding (may be null)
         * @return the filled instance
         * @throws ScicosFormatException on decoding error
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType, java.lang.Object)
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType, java.lang.Object)
         */
        @Override
        public PreLoaded decode(ScilabType element, PreLoaded into)
@@ -222,7 +222,7 @@ public class PreLoadedElement extends AbstractElement<PreLoaded> {
         * @param from the source
         * @param element the destination
         * @return null
-        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object, org.scilab.modules.types.ScilabType)
         */
        @Override
        @Deprecated
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/StyleElement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/StyleElement.java

index 5f13693..ae14252 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/StyleElement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/StyleElement.java
@@ -17,9 +17,9 @@ import static java.util.Arrays.asList;
 import java.util.List;
 import java.util.Map;
 
-import org.scilab.modules.types.scilabTypes.ScilabString;
-import org.scilab.modules.types.scilabTypes.ScilabTList;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabString;
+import org.scilab.modules.types.ScilabTList;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.io.scicos.AbstractElement;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException;
 import org.scilab.modules.xcos.io.scicos.ScicosFormatException.WrongElementException;
@@ -52,7 +52,7 @@ public class StyleElement extends AbstractElement<mxStylesheet> {
         * @return <code>false</code> if {@link #decode(ScilabType, mxStylesheet)}
         *         will always throw an exception, <code>false</code> is sometimes
         *         only.
-        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.scilabTypes.ScilabType)
+        * @see org.scilab.modules.xcos.io.scicos.Element#canDecode(org.scilab.modules.types.ScilabType)
         */
        @Override
        public boolean canDecode(ScilabType element) {
@@ -72,7 +72,7 @@ public class StyleElement extends AbstractElement<mxStylesheet> {
         * @return the filled instance
         * @throws ScicosFormatException
         *             on decoding error
-        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.scilabTypes.ScilabType,
+        * @see org.scilab.modules.xcos.io.scicos.Element#decode(org.scilab.modules.types.ScilabType,
         *      java.lang.Object)
         */
        @Override
@@ -195,7 +195,7 @@ public class StyleElement extends AbstractElement<mxStylesheet> {
         *            Not used
         * @return null
         * @see org.scilab.modules.xcos.io.scicos.Element#encode(java.lang.Object,
-        *      org.scilab.modules.types.scilabTypes.ScilabType)
+        *      org.scilab.modules.types.ScilabType)
         */
        @Override
        @Deprecated
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/BasicPort.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/BasicPort.java

index 7c44fc3..73bc239 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/BasicPort.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/BasicPort.java
@@ -15,7 +15,7 @@ package org.scilab.modules.xcos.port;
 import org.scilab.modules.graph.ScilabGraphUniqueObject;
 import org.scilab.modules.graph.utils.ScilabGraphConstants;
 import org.scilab.modules.graph.utils.StyleMap;
-import org.scilab.modules.types.scilabTypes.ScilabType;
+import org.scilab.modules.types.ScilabType;
 import org.scilab.modules.xcos.utils.XcosConstants;
 import org.scilab.modules.xcos.utils.XcosMessages;
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java		patch \| blob \| history
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java		patch \| blob \| history
scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java		patch \| blob \| history
scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java		patch \| blob \| history
scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java		patch \| blob \| history
scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java		patch \| blob \| history
scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java		patch \| blob \| history
scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java		patch \| blob \| history
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java		patch \| blob \| history
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testErrorManagement.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExec.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testExistingVariable.java	[new file with mode: 0644]	patch \| blob
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testGraphics.java	[new file with mode: 0644]	patch \| blob
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testOpenClose.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteInteger.java		patch \| blob \| history
scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testTypes.java		patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java with 96% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java with 95% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java with 97% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabIntegerTypeEnum.java with 97% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java with 90% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java with 93% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java with 92% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java with 93% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java with 96% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java	[moved from scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTypeEnum.java with 97% similarity]	patch \| blob \| history
scilab/modules/types/src/java/org/scilab/modules/types/types.java	[new file with mode: 0644]	patch \| blob
scilab/modules/types/src/java/org/scilab/modules/types/typesJNI.java	[new file with mode: 0644]	patch \| blob
scilab/modules/types/src/jni/sci_types.i		patch \| blob \| history
scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/SwingScilabVariableBrowser.java		patch \| blob \| history
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/rowfilter/VariableBrowserRowFilter.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/ProdPortLabelingListener.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/AbstractElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BasicBlockInfo.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockGraphicElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockPartsElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/DiagramElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/Element.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/H5RWHandler.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/InputPortElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LabelElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/LinkElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/OutputPortElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/ScicosParametersElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palette.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/PreLoadedElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/StyleElement.java		patch \| blob \| history
scilab/modules/xcos/src/java/org/scilab/modules/xcos/port/BasicPort.java		patch \| blob \| history