types module (to do update makefile)

diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index b0a9102..e9c27c1 100644 (file)
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -1016,6 +1016,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
+       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
        ProjectSection(ProjectDependencies) = postProject
@@ -1048,6 +1051,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
        ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
@@ -1059,10 +1063,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\sci
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
        ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2159,6 +2170,14 @@ Global
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.Build.0 = Debug|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.ActiveCfg = Debug|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.Build.0 = Debug|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.ActiveCfg = Release|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.Build.0 = Release|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.ActiveCfg = Release|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 37e53b1..8b30810 100644 (file)
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1016,6 +1016,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
+       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
        ProjectSection(ProjectDependencies) = postProject
@@ -1049,6 +1052,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
        ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
@@ -1060,10 +1064,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\sci
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
        ProjectSection(ProjectDependencies) = postProject
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2162,6 +2173,14 @@ Global
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.Build.0 = Debug|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.ActiveCfg = Debug|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.Build.0 = Debug|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.ActiveCfg = Release|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.Build.0 = Release|Win32
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.ActiveCfg = Release|x64
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 08af098..5df6320 100644 (file)
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -63,6 +63,7 @@
 
 
        <path id="compile.classpath">
+               <pathelement location="${library.types.dir}/${library.types.name}"/>
                <pathelement location="${library.graph.dir}/${library.graph.name}"/>
                <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
                <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>

diff --git a/scilab/configure.ac b/scilab/configure.ac
index dadab54..6589421 100644 (file)
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1636,6 +1636,7 @@ modules/windows_tools/Makefile
 modules/core/Makefile
 modules/api_scilab/Makefile
 modules/call_scilab/Makefile
+modules/types/Makefile
 modules/hdf5/Makefile
 modules/fftw/Makefile
 modules/umfpack/Makefile

diff --git a/scilab/etc/classpath.xml.in b/scilab/etc/classpath.xml.in
index 9f6d6b7..7290e46 100644 (file)
--- a/scilab/etc/classpath.xml.in
+++ b/scilab/etc/classpath.xml.in
@@ -65,6 +65,7 @@ The option is "disableUnderMode" and can be:
 </path>
 
 <!-- Temp. loaded at startup -->
+<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
 <path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
 
 <path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse">

diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 7f85198..d5003a0 100644 (file)
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -41,7 +41,6 @@ The option is "disableUnderMode" and can be:
        <load on="XCos"/>
 </path>
 
-
 <path value="$SCILAB/thirdparty/jogl.jar" load="onUse">
        <load on="graphics"/>
        <load on="graphic_export"/>
@@ -65,6 +64,7 @@ The option is "disableUnderMode" and can be:
 </path>
 
 <!-- Temp. loaded at startup -->
+<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
 <path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
 
 <path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse">

diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index 393b1f7..05ed51b 100644 (file)
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -78,6 +78,7 @@
 <module name="parameters" activate="yes"/>
 <module name="atoms" activate="yes"/>
 <module name="matio" activate="@MATIO_ENABLE@"/>
+<module name="types" activate="@JAVA_ENABLE@"/>
 <module name="hdf5" activate="yes"/>
 <module name="xcos" activate="@GUI_ENABLE@"/>
 <module name="xpad" activate="@GUI_ENABLE@"/>

diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index d958ac2..9af87d6 100644 (file)
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -80,6 +80,7 @@
 <module name="parameters" activate="yes"/>
 <module name="matio" activate="yes"/>
 <module name="atoms" activate="yes"/>
+<module name="types" activate="yes"/>
 <module name="hdf5" activate="yes"/>
 <module name="xcos" activate="yes"/>
 <module name="xpad" activate="yes"/>

diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 65c6df0..9647c96 100644 (file)
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -80,6 +80,7 @@ simulated_annealing \
 parameters \
 matio \
 atoms \
+types \
 hdf5 \
 graph\
 xcos \

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 3a7635f..03a37b8 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
@@ -14,7 +14,7 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.scilabTypes.ScilabBoolean;
 import org.w3c.dom.Element;
 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 ad6e4d8..29155db 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
@@ -14,7 +14,7 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
 import org.w3c.dom.Element;
 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 648baf0..ff3baec 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
@@ -14,7 +14,7 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;
+import org.scilab.modules.types.scilabTypes.ScilabInteger;
 import org.w3c.dom.Element;
 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 4a14de0..266e1b8 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.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
+import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.ScilabMList;
+import org.scilab.modules.types.scilabTypes.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 ccf087d..5d155d0 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.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.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 5c9dc8b..70bad81 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
@@ -14,7 +14,7 @@ package org.scilab.modules.graph.io;
 
 import java.util.Map;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.ScilabString;
 import org.w3c.dom.Element;
 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 fc5b6f5..bf3a30e 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.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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;
 
 /**
  * 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 27b1a4a..21b76a6 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.hdf5.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.scilabTypes.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 6c1546c..8a0cdf4 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.hdf5.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.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 081dc27..fd0b0ca 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.hdf5.scilabTypes.ScilabInteger;
+import org.scilab.modules.types.scilabTypes.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 0513475..8054b39 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.hdf5.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.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 48af15e..c40ace4 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.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
+import org.scilab.modules.types.scilabTypes.ScilabMList;
+import org.scilab.modules.types.scilabTypes.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 e0f12ed..edc4c37 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.hdf5.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.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 04b3405..fe2c064 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.hdf5.scilabTypes.ScilabTList;
+import org.scilab.modules.types.scilabTypes.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 85a6de0..3238e5c 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.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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;
 
 
 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 0e113c7..8c7d4f4 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.hdf5.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.scilabTypes.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 eb99daa..8adbe66 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.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.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 0fd2b62..952acbe 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.hdf5.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.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 42e1ef2..acbfe2f 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,7 +17,7 @@ import ncsa.hdf.hdf5lib.HDF5Constants;
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.scilab.modules.hdf5.H5ScilabConstant;
-import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;;
+import org.scilab.modules.types.scilabTypes.ScilabInteger;;
 
 public class H5WriteScilabInteger {
        public static void writeInDataSet(int file_id, String dataSetName, ScilabInteger data) throws NullPointerException, HDF5Exception {

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 ee1cb8d..40f3485 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.hdf5.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.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 3d2df42..51c4481 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.hdf5.scilabTypes.ScilabMList;
+import org.scilab.modules.types.scilabTypes.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 489de7f..50940e9 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.hdf5.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.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 cff235d..33e3725 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.hdf5.scilabTypes.ScilabTList;
+import org.scilab.modules.types.scilabTypes.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 0edc734..f7f96bc 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.hdf5.scilabTypes.ScilabBoolean;
+import org.scilab.modules.types.scilabTypes.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 a354b60..d8e2be9 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.hdf5.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.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 5a63347..f641373 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
+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.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 edea295..75ba101 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.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 20548ee..97eca3e 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.hdf5.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.ScilabString;
 import org.scilab.modules.hdf5.write.H5Write;
 
 

diff --git a/scilab/modules/types/.gitignore b/scilab/modules/types/.gitignore
new file mode 100644 (file)
index 0000000..bc3ddde
--- /dev/null
+++ b/scilab/modules/types/.gitignore
@@ -0,0 +1,5 @@
+#
+#generated .def files (windows)
+#
+types.def
+*.bak

diff --git a/scilab/modules/types/Makefile.am b/scilab/modules/types/Makefile.am
new file mode 100644 (file)
index 0000000..79dfa3f
--- /dev/null
+++ b/scilab/modules/types/Makefile.am
@@ -0,0 +1,91 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - Allan CORNET
+# 
+# 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
+#
+
+#### Target ######
+modulename=types
+
+
+#### types : Conf files ####
+libscitypes_la_rootdir = $(mydatadir)
+libscitypes_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+
+#### types : init scripts ####
+libscitypes_la_etcdir = $(mydatadir)/etc
+libscitypes_la_etc_DATA = etc/types.quit \
+                               etc/types.start
+
+include $(top_srcdir)/Makefile.incl.am
+
+
+TYPES_JNI_SOURCES = 
+
+TYPES_C_SOURCES = 
+
+TYPES_CPP_SOURCES = 
+
+GIWS_WRAPPERS = 
+
+if GIWS
+BUILT_SOURCES=giws
+endif
+
+
+GATEWAY_C_SOURCES = 
+
+GATEWAY_CPP_SOURCES = 
+
+libscitypes_la_CFLAGS= 
+
+
+libscitypes_la_CPPFLAGS = 
+
+# Without the types module 
+libscitypes_disable_la_CFLAGS = 
+
+TYPES_DISABLE_C_SOURCES = 
+libscitypes_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+libscitypes_disable_la_SOURCES = $(TYPES_DISABLE_C_SOURCES)
+
+pkglib_LTLIBRARIES = libscitypes-disable.la
+
+if GUI
+pkglib_LTLIBRARIES += libscitypes.la 
+endif
+
+libscitypes_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
+
+libscitypes_la_SOURCES = $(TYPES_C_SOURCES) $(TYPES_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(TYPES_CPP_SOURCES)
+
+# For the code check (splint)
+CHECK_SRC= $(TYPES_C_SOURCES) $(GATEWAY_C_SOURCES)
+INCLUDE_FLAGS = $(libscitypes_la_CFLAGS)
+
+
+#### SWIG Declaration ####
+SWIG_WRAPPERS = 
+
+if SWIG
+BUILT_SOURCES=swig
+endif
+
+libscitypes_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
+$(top_builddir)/libs/MALLOC/libscimalloc.la \
+$(top_builddir)/modules/output_stream/libscioutput_stream.la
+
+
+#### types : gateway declaration ####
+libscitypes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscitypes_la_sci_gateway_DATA = 
+
+if GUI
+USEANT=1
+endif

diff --git a/scilab/modules/types/build.xml b/scilab/modules/types/build.xml
new file mode 100644 (file)
index 0000000..aae4807
--- /dev/null
+++ b/scilab/modules/types/build.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Allan CORNET
+ * 
+ * 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
+ *
+ -->
+
+<project name="types" default="jar">
+
+  <import file="../../build.incl.xml"/>
+  <property name="library.name" value="${library.types.name}" />
+
+  <description>
+                       Build the Scilab types module
+  </description>
+
+</project>

diff --git a/scilab/modules/types/changelog.txt b/scilab/modules/types/changelog.txt
new file mode 100644 (file)
index 0000000..0e1ae04
--- /dev/null
+++ b/scilab/modules/types/changelog.txt
@@ -0,0 +1,4 @@
+types (0.1-1) stable; urgency=medium
+
+  * First version of the module
+

diff --git a/scilab/modules/types/etc/types.quit b/scilab/modules/types/etc/types.quit
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/scilab/modules/types/etc/types.start b/scilab/modules/types/etc/types.start
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/scilab/modules/types/license.txt b/scilab/modules/types/license.txt
new file mode 100644 (file)
index 0000000..46ae42e
--- /dev/null
+++ b/scilab/modules/types/license.txt
@@ -0,0 +1,9 @@
+Copyright:
+Copyright (c) 2010 - DIGITEO
+
+License:
+This module must be used under the terms of the CeCILL.
+This module 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

diff --git a/scilab/modules/types/macros/buildmacros.bat b/scilab/modules/types/macros/buildmacros.bat
new file mode 100644 (file)
index 0000000..f9bd674
--- /dev/null
+++ b/scilab/modules/types/macros/buildmacros.bat
@@ -0,0 +1,11 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;

diff --git a/scilab/modules/types/macros/buildmacros.sce b/scilab/modules/types/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..590b940
--- /dev/null
+++ b/scilab/modules/types/macros/buildmacros.sce
@@ -0,0 +1,16 @@
+
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Allan CORNET <allan.cornet@inria.fr>
+//
+// 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
+
+if (isdef('genlib') == %f) then
+  exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
+end
+
+//genlib("typeslib","SCI/modules/types/macros",%f,%t);
+

diff --git a/scilab/modules/types/macros/cleanmacros.bat b/scilab/modules/types/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..d8e26bf
--- /dev/null
+++ b/scilab/modules/types/macros/cleanmacros.bat
@@ -0,0 +1,13 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL

diff --git a/scilab/modules/types/readme.txt b/scilab/modules/types/readme.txt
new file mode 100644 (file)
index 0000000..785eeec
--- /dev/null
+++ b/scilab/modules/types/readme.txt
@@ -0,0 +1 @@
+README File

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabBoolean.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java
similarity index 98%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabBoolean.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java
index be4775d..33d7cb9 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabBoolean.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 /**
  * This class provides a wrapping on the Scilab boolean datatype

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabDouble.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java
similarity index 98%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabDouble.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java
index eab9fae..ef80e2f 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabDouble.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 /**
  * This class provides a wrapping on the Scilab Double datatype<br />

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabInteger.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java
similarity index 98%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabInteger.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java
index a559e07..9f406ca 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabInteger.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 /**
  * This class provides a wrapping on the Scilab Integer datatype

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabList.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java
similarity index 96%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabList.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java
index b42a6cb..9a284f9 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 import java.util.ArrayList;
 

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabMList.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java
similarity index 96%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabMList.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java
index 356d79d..54a3f53 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabMList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 import java.util.ArrayList;
 

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabString.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java
similarity index 97%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabString.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java
index bc5bdf1..4c01a0a 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabString.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 /**
  * This class provides a wrapping on the Scilab String datatype

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabTList.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java
similarity index 96%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabTList.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java
index 59743f8..4b69926 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabTList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 import java.util.ArrayList;
 

diff --git a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabType.java b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java
similarity index 95%
rename from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabType.java
rename to scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java
index de4faf5..9abd5da 100644 (file)
--- a/scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabType.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java
@@ -10,7 +10,7 @@
  * 
  */
 
-package org.scilab.modules.hdf5.scilabTypes;
+package org.scilab.modules.types.scilabTypes;
 
 import java.io.Serializable;
 

diff --git a/scilab/modules/types/src/java/types-JAVA.vcproj b/scilab/modules/types/src/java/types-JAVA.vcproj
new file mode 100644 (file)
index 0000000..cf32536
--- /dev/null
+++ b/scilab/modules/types/src/java/types-JAVA.vcproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="types-Ant"
+       ProjectGUID="{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
+       RootNamespace="types-Ant"
+       Keyword="MakeFileProj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

diff --git a/scilab/modules/types/version.xml b/scilab/modules/types/version.xml
new file mode 100644 (file)
index 0000000..3e7889b
--- /dev/null
+++ b/scilab/modules/types/version.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO
+ * 
+ *  This file is distributed under the same license as the Scilab package.
+ -->
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="types">
+<VERSION major="1" minor="0" maintenance="0" revision="0" string="unstable-git" />
+</MODULE_VERSION>

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 3985b4b..75199cd 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
@@ -13,9 +13,9 @@ package org.scilab.modules.xcos.block;
 
 import java.util.UUID;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 /**
  * Implement the AFFICH_m block

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 6714877..6794235 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
@@ -42,10 +42,10 @@ import org.scilab.modules.gui.menu.Menu;
 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.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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.hdf5.write.H5Write;
 import org.scilab.modules.xcos.Xcos;
 import org.scilab.modules.xcos.actions.ShowHideShadowAction;

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 52a8df0..8504ae9 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.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.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 4c7b459..d893fae 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.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.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 360a5c1..867a9c4 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.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 1198ed6..8a7f4aa 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
@@ -19,9 +19,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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
+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.xcos.XcosTab;
 import org.scilab.modules.xcos.actions.CodeGenerationAction;
 import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction;

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 2c7c22c..660a33e 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
@@ -17,8 +17,8 @@ import java.util.Map;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.utils.StyleMap;
 import org.scilab.modules.gui.menu.Menu;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabString;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 import org.scilab.modules.xcos.block.actions.BlockParametersAction;
 import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction;
 

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 3f63b8d..aea5b78 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.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 d1f201c..d1dded2 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
@@ -18,9 +18,9 @@ import java.awt.event.ActionEvent;
 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.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 16f3f49..5d90dc5 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
@@ -35,10 +35,10 @@ import javax.swing.table.TableColumn;
 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.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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.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/ViewDetailsAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
index e062f88..ebddf8c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
@@ -28,7 +28,7 @@ import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
 import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
+import org.scilab.modules.types.scilabTypes.ScilabMList;
 import org.scilab.modules.hdf5.write.H5Write;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.SplitBlock;

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 ed6b203..a892bca 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
@@ -17,8 +17,8 @@ import java.io.IOException;
 
 import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabList;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.io.BlockReader;
 import org.scilab.modules.xcos.port.BasicPort;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
index af99b26..ccbc76e 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
index 9ad3b9f..9bd4b4c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
index d25a23d..c345fae 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
index dad42cd..ca7047b 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
index cc92c5f..b5672ef 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
index 34b7af2..7313247 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
@@ -12,8 +12,8 @@
 
 package org.scilab.modules.xcos.block.io;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+import org.scilab.modules.types.scilabTypes.ScilabDouble;
+import org.scilab.modules.types.scilabTypes.ScilabType;
 
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.utils.XcosConstants;

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 d5dde2d..6a45ea2 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
@@ -71,9 +71,9 @@ import org.scilab.modules.gui.utils.SciFileFilter;
 import org.scilab.modules.gui.utils.UIElementMapper;
 import org.scilab.modules.gui.window.ScilabWindow;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.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/BasicBlockInfo.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java
index 6d9d52f..0bf4772 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java
@@ -17,12 +17,12 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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.ScilabType;
 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/BlockReader.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java
index ffc0560..c1f2ea8 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java
@@ -26,13 +26,13 @@ import org.scilab.modules.graph.utils.StyleMap;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
 import org.scilab.modules.hdf5.read.H5Read;
-import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabType;
+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.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.BlockFactory;
 import org.scilab.modules.xcos.block.TextBlock;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java
index e1024ef..660d979 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java
@@ -17,12 +17,12 @@ import java.util.List;
 
 import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
-import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
-import org.scilab.modules.hdf5.scilabTypes.ScilabTList;
+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.hdf5.write.H5Write;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.TextBlock;

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java
index f213d48..efa306c 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java
@@ -26,9 +26,9 @@ import org.scilab.modules.gui.contextmenu.ContextMenu;
 import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
 import org.scilab.modules.gui.menu.Menu;
 import org.scilab.modules.gui.menu.ScilabMenu;
-import org.scilab.modules.hdf5.scilabTypes.ScilabDouble;
-import org.scilab.modules.hdf5.scilabTypes.ScilabMList;
-import org.scilab.modules.hdf5.scilabTypes.ScilabString;
+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.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.actions.BorderColorAction;
 import org.scilab.modules.xcos.link.actions.StyleHorizontalAction;

diff --git a/scilab/scilab-lib.properties.in b/scilab/scilab-lib.properties.in
index 780b9f2..3f8ab47 100644 (file)
--- a/scilab/scilab-lib.properties.in
+++ b/scilab/scilab-lib.properties.in
@@ -72,6 +72,9 @@ library.graphic_export.name=org.scilab.modules.graphic_export.jar
 library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/
 library.javasci.name=javasci.jar
 
+library.types.dir=${modules.dir}/types/${build.jar.dir}/
+library.types.name=org.scilab.modules.types.jar
+
 library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
 library.hdf5.name=org.scilab.modules.hdf5.jar
 

diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 3ba7f4d..0412794 100644 (file)
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -71,6 +71,9 @@ library.javasci.name=javasci.jar
 library.graphic_export.dir=${modules.dir}/graphic_export/${build.jar.dir}/
 library.graphic_export.name=org.scilab.modules.graphic_export.jar
 
+library.types.dir=${modules.dir}/types/${build.jar.dir}/
+library.types.name=org.scilab.modules.types.jar
+
 library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
 library.hdf5.name=org.scilab.modules.hdf5.jar