summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
Diffstat (limited to 'scilab')
-rw-r--r--scilab/Scilab.sln19
-rw-r--r--scilab/Scilab_f2c.sln19
-rw-r--r--scilab/build.incl.xml1
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/etc/classpath.xml.in1
-rw-r--r--scilab/etc/classpath.xml.vc2
-rw-r--r--scilab/etc/modules.xml.in1
-rw-r--r--scilab/etc/modules.xml.vc1
-rw-r--r--scilab/modules/Makefile.am1
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabBooleanCodec.java2
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabDoubleCodec.java2
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java2
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabListCodec.java6
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java10
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabStringCodec.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5Read.java16
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabBoolean.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabDouble.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabInteger.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabList.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabMList.java4
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabString.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/read/H5ReadScilabTList.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5Write.java16
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabBoolean.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabCommonList.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabDouble.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabInteger.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabList.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabMList.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java2
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabTList.java2
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java2
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java2
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabGraph.java10
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java6
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java2
-rw-r--r--scilab/modules/types/.gitignore5
-rw-r--r--scilab/modules/types/Makefile.am91
-rw-r--r--scilab/modules/types/build.xml23
-rw-r--r--scilab/modules/types/changelog.txt4
-rw-r--r--scilab/modules/types/etc/types.quit0
-rw-r--r--scilab/modules/types/etc/types.start0
-rw-r--r--scilab/modules/types/license.txt9
-rw-r--r--scilab/modules/types/macros/buildmacros.bat11
-rw-r--r--scilab/modules/types/macros/buildmacros.sce16
-rw-r--r--scilab/modules/types/macros/cleanmacros.bat13
-rw-r--r--scilab/modules/types/readme.txt1
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabBoolean.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabBoolean.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabDouble.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabDouble.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabInteger.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabInteger.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabList.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabList.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabMList.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabMList.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabString.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabString.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabTList.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabTList.java)2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/scilabTypes/ScilabType.java (renamed from scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/scilabTypes/ScilabType.java)2
-rw-r--r--scilab/modules/types/src/java/types-JAVA.vcproj119
-rw-r--r--scilab/modules/types/version.xml11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/AfficheBlock.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/GainBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/PrintBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/TextBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCreateAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BasicBlockInfo.java12
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockReader.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/BlockWriter.java12
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java6
-rw-r--r--scilab/scilab-lib.properties.in3
-rw-r--r--scilab/scilab-lib.properties.vc3
83 files changed, 485 insertions, 132 deletions
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index b0a9102..e9c27c1 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -1016,6 +1016,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\
1016 EndProjectSection 1016 EndProjectSection
1017EndProject 1017EndProject
1018Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}" 1018Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
1019 ProjectSection(ProjectDependencies) = postProject
1020 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1021 EndProjectSection
1019EndProject 1022EndProject
1020Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}" 1023Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
1021 ProjectSection(ProjectDependencies) = postProject 1024 ProjectSection(ProjectDependencies) = postProject
@@ -1048,6 +1051,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\
1048EndProject 1051EndProject
1049Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}" 1052Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
1050 ProjectSection(ProjectDependencies) = postProject 1053 ProjectSection(ProjectDependencies) = postProject
1054 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1051 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C} 1055 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1052 {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02} 1056 {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
1053 {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD} 1057 {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
@@ -1059,10 +1063,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\sci
1059EndProject 1063EndProject
1060Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}" 1064Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
1061 ProjectSection(ProjectDependencies) = postProject 1065 ProjectSection(ProjectDependencies) = postProject
1066 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1062 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C} 1067 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1063 {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} 1068 {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
1064 EndProjectSection 1069 EndProjectSection
1065EndProject 1070EndProject
1071Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
1072 ProjectSection(ProjectDependencies) = postProject
1073 {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
1074 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1075 EndProjectSection
1076EndProject
1066Global 1077Global
1067 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1078 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1068 Debug|Win32 = Debug|Win32 1079 Debug|Win32 = Debug|Win32
@@ -2159,6 +2170,14 @@ Global
2159 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32 2170 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
2160 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64 2171 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
2161 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64 2172 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
2173 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.ActiveCfg = Debug|Win32
2174 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.Build.0 = Debug|Win32
2175 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.ActiveCfg = Debug|x64
2176 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.Build.0 = Debug|x64
2177 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.ActiveCfg = Release|Win32
2178 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.Build.0 = Release|Win32
2179 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.ActiveCfg = Release|x64
2180 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.Build.0 = Release|x64
2162 EndGlobalSection 2181 EndGlobalSection
2163 GlobalSection(SolutionProperties) = preSolution 2182 GlobalSection(SolutionProperties) = preSolution
2164 HideSolutionNode = FALSE 2183 HideSolutionNode = FALSE
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 37e53b1..8b30810 100644
--- 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\
1016 EndProjectSection 1016 EndProjectSection
1017EndProject 1017EndProject
1018Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}" 1018Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
1019 ProjectSection(ProjectDependencies) = postProject
1020 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1021 EndProjectSection
1019EndProject 1022EndProject
1020Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}" 1023Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
1021 ProjectSection(ProjectDependencies) = postProject 1024 ProjectSection(ProjectDependencies) = postProject
@@ -1049,6 +1052,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\
1049EndProject 1052EndProject
1050Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}" 1053Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
1051 ProjectSection(ProjectDependencies) = postProject 1054 ProjectSection(ProjectDependencies) = postProject
1055 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1052 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C} 1056 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1053 {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02} 1057 {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
1054 {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD} 1058 {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
@@ -1060,10 +1064,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\sci
1060EndProject 1064EndProject
1061Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}" 1065Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
1062 ProjectSection(ProjectDependencies) = postProject 1066 ProjectSection(ProjectDependencies) = postProject
1067 {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
1063 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C} 1068 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1064 {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} 1069 {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
1065 EndProjectSection 1070 EndProjectSection
1066EndProject 1071EndProject
1072Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
1073 ProjectSection(ProjectDependencies) = postProject
1074 {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
1075 {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
1076 EndProjectSection
1077EndProject
1067Global 1078Global
1068 GlobalSection(SolutionConfigurationPlatforms) = preSolution 1079 GlobalSection(SolutionConfigurationPlatforms) = preSolution
1069 Debug|Win32 = Debug|Win32 1080 Debug|Win32 = Debug|Win32
@@ -2162,6 +2173,14 @@ Global
2162 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32 2173 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
2163 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64 2174 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
2164 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64 2175 {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
2176 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.ActiveCfg = Debug|Win32
2177 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.Build.0 = Debug|Win32
2178 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.ActiveCfg = Debug|x64
2179 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.Build.0 = Debug|x64
2180 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.ActiveCfg = Release|Win32
2181 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|Win32.Build.0 = Release|Win32
2182 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.ActiveCfg = Release|x64
2183 {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Release|x64.Build.0 = Release|x64
2165 EndGlobalSection 2184 EndGlobalSection
2166 GlobalSection(SolutionProperties) = preSolution 2185 GlobalSection(SolutionProperties) = preSolution
2167 HideSolutionNode = FALSE 2186 HideSolutionNode = FALSE
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 08af098..5df6320 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -63,6 +63,7 @@
63 63
64 64
65 <path id="compile.classpath"> 65 <path id="compile.classpath">
66 <pathelement location="${library.types.dir}/${library.types.name}"/>
66 <pathelement location="${library.graph.dir}/${library.graph.name}"/> 67 <pathelement location="${library.graph.dir}/${library.graph.name}"/>
67 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/> 68 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
68 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/> 69 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
diff --git a/scilab/configure.ac b/scilab/configure.ac
index dadab54..6589421 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1636,6 +1636,7 @@ modules/windows_tools/Makefile
1636modules/core/Makefile 1636modules/core/Makefile
1637modules/api_scilab/Makefile 1637modules/api_scilab/Makefile
1638modules/call_scilab/Makefile 1638modules/call_scilab/Makefile
1639modules/types/Makefile
1639modules/hdf5/Makefile 1640modules/hdf5/Makefile
1640modules/fftw/Makefile 1641modules/fftw/Makefile
1641modules/umfpack/Makefile 1642modules/umfpack/Makefile
diff --git a/scilab/etc/classpath.xml.in b/scilab/etc/classpath.xml.in
index 9f6d6b7..7290e46 100644
--- a/scilab/etc/classpath.xml.in
+++ b/scilab/etc/classpath.xml.in
@@ -65,6 +65,7 @@ The option is "disableUnderMode" and can be:
65</path> 65</path>
66 66
67<!-- Temp. loaded at startup --> 67<!-- Temp. loaded at startup -->
68<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
68<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/> 69<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
69 70
70<path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse"> 71<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
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -41,7 +41,6 @@ The option is "disableUnderMode" and can be:
41 <load on="XCos"/> 41 <load on="XCos"/>
42</path> 42</path>
43 43
44
45<path value="$SCILAB/thirdparty/jogl.jar" load="onUse"> 44<path value="$SCILAB/thirdparty/jogl.jar" load="onUse">
46 <load on="graphics"/> 45 <load on="graphics"/>
47 <load on="graphic_export"/> 46 <load on="graphic_export"/>
@@ -65,6 +64,7 @@ The option is "disableUnderMode" and can be:
65</path> 64</path>
66 65
67<!-- Temp. loaded at startup --> 66<!-- Temp. loaded at startup -->
67<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
68<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/> 68<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
69 69
70<path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse"> 70<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
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -78,6 +78,7 @@
78<module name="parameters" activate="yes"/> 78<module name="parameters" activate="yes"/>
79<module name="atoms" activate="yes"/> 79<module name="atoms" activate="yes"/>
80<module name="matio" activate="@MATIO_ENABLE@"/> 80<module name="matio" activate="@MATIO_ENABLE@"/>
81<module name="types" activate="@JAVA_ENABLE@"/>
81<module name="hdf5" activate="yes"/> 82<module name="hdf5" activate="yes"/>
82<module name="xcos" activate="@GUI_ENABLE@"/> 83<module name="xcos" activate="@GUI_ENABLE@"/>
83<module name="xpad" activate="@GUI_ENABLE@"/> 84<module name="xpad" activate="@GUI_ENABLE@"/>
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index d958ac2..9af87d6 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -80,6 +80,7 @@
80<module name="parameters" activate="yes"/> 80<module name="parameters" activate="yes"/>
81<module name="matio" activate="yes"/> 81<module name="matio" activate="yes"/>
82<module name="atoms" activate="yes"/> 82<module name="atoms" activate="yes"/>
83<module name="types" activate="yes"/>
83<module name="hdf5" activate="yes"/> 84<module name="hdf5" activate="yes"/>
84<module name="xcos" activate="yes"/> 85<module name="xcos" activate="yes"/>
85<module name="xpad" activate="yes"/> 86<module name="xpad" activate="yes"/>
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 65c6df0..9647c96 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -80,6 +80,7 @@ simulated_annealing \
80parameters \ 80parameters \
81matio \ 81matio \
82atoms \ 82atoms \
83types \
83hdf5 \ 84hdf5 \
84graph\ 85graph\
85xcos \ 86xcos \
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
--- 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;
14 14
15import java.util.Map; 15import java.util.Map;
16 16
17import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 17import org.scilab.modules.types.scilabTypes.ScilabBoolean;
18import org.w3c.dom.Element; 18import org.w3c.dom.Element;
19import org.w3c.dom.NamedNodeMap; 19import org.w3c.dom.NamedNodeMap;
20import org.w3c.dom.Node; 20import 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
--- 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;
14 14
15import java.util.Map; 15import java.util.Map;
16 16
17import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 17import org.scilab.modules.types.scilabTypes.ScilabDouble;
18import org.w3c.dom.Element; 18import org.w3c.dom.Element;
19import org.w3c.dom.NamedNodeMap; 19import org.w3c.dom.NamedNodeMap;
20import org.w3c.dom.Node; 20import 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
--- 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;
14 14
15import java.util.Map; 15import java.util.Map;
16 16
17import org.scilab.modules.hdf5.scilabTypes.ScilabInteger; 17import org.scilab.modules.types.scilabTypes.ScilabInteger;
18import org.w3c.dom.Element; 18import org.w3c.dom.Element;
19import org.w3c.dom.NamedNodeMap; 19import org.w3c.dom.NamedNodeMap;
20import org.w3c.dom.Node; 20import 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
--- 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;
15 15
16import java.util.Map; 16import java.util.Map;
17 17
18import org.scilab.modules.hdf5.scilabTypes.ScilabList; 18import org.scilab.modules.types.scilabTypes.ScilabList;
19import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 19import org.scilab.modules.types.scilabTypes.ScilabMList;
20import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 20import org.scilab.modules.types.scilabTypes.ScilabTList;
21import org.w3c.dom.Node; 21import org.w3c.dom.Node;
22 22
23import com.mxgraph.io.mxCodec; 23import 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
--- 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;
14 14
15import java.util.Map; 15import java.util.Map;
16 16
17import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 17import org.scilab.modules.types.scilabTypes.ScilabBoolean;
18import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 18import org.scilab.modules.types.scilabTypes.ScilabDouble;
19import org.scilab.modules.hdf5.scilabTypes.ScilabInteger; 19import org.scilab.modules.types.scilabTypes.ScilabInteger;
20import org.scilab.modules.hdf5.scilabTypes.ScilabList; 20import org.scilab.modules.types.scilabTypes.ScilabList;
21import org.scilab.modules.hdf5.scilabTypes.ScilabString; 21import org.scilab.modules.types.scilabTypes.ScilabString;
22import org.w3c.dom.NamedNodeMap; 22import org.w3c.dom.NamedNodeMap;
23import org.w3c.dom.Node; 23import org.w3c.dom.Node;
24 24
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
--- 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;
14 14
15import java.util.Map; 15import java.util.Map;
16 16
17import org.scilab.modules.hdf5.scilabTypes.ScilabString; 17import org.scilab.modules.types.scilabTypes.ScilabString;
18import org.w3c.dom.Element; 18import org.w3c.dom.Element;
19import org.w3c.dom.NamedNodeMap; 19import org.w3c.dom.NamedNodeMap;
20import org.w3c.dom.Node; 20import 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
--- 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;
18import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException; 18import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
19 19
20import org.scilab.modules.hdf5.H5ScilabConstant; 20import org.scilab.modules.hdf5.H5ScilabConstant;
21import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 21import org.scilab.modules.types.scilabTypes.ScilabBoolean;
22import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 22import org.scilab.modules.types.scilabTypes.ScilabDouble;
23import org.scilab.modules.hdf5.scilabTypes.ScilabInteger; 23import org.scilab.modules.types.scilabTypes.ScilabInteger;
24import org.scilab.modules.hdf5.scilabTypes.ScilabList; 24import org.scilab.modules.types.scilabTypes.ScilabList;
25import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 25import org.scilab.modules.types.scilabTypes.ScilabMList;
26import org.scilab.modules.hdf5.scilabTypes.ScilabString; 26import org.scilab.modules.types.scilabTypes.ScilabString;
27import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 27import org.scilab.modules.types.scilabTypes.ScilabTList;
28import org.scilab.modules.hdf5.scilabTypes.ScilabType; 28import org.scilab.modules.types.scilabTypes.ScilabType;
29 29
30/** 30/**
31 * H5Read 31 * 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
--- 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;
16import ncsa.hdf.hdf5lib.HDF5Constants; 16import ncsa.hdf.hdf5lib.HDF5Constants;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 19import org.scilab.modules.types.scilabTypes.ScilabBoolean;
20 20
21/** 21/**
22 * H5ReadScilabBoolean 22 * 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
--- 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;
16import ncsa.hdf.hdf5lib.HDF5Constants; 16import ncsa.hdf.hdf5lib.HDF5Constants;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 19import org.scilab.modules.types.scilabTypes.ScilabDouble;
20 20
21public class H5ReadScilabDouble { 21public class H5ReadScilabDouble {
22 public static void readData(int dataSetId, ScilabDouble data) throws NullPointerException, HDF5Exception { 22 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
--- 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;
16import ncsa.hdf.hdf5lib.HDF5Constants; 16import ncsa.hdf.hdf5lib.HDF5Constants;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabInteger; 19import org.scilab.modules.types.scilabTypes.ScilabInteger;
20 20
21public class H5ReadScilabInteger { 21public class H5ReadScilabInteger {
22 public static void readData(int dataSetId, ScilabInteger data) throws NullPointerException, HDF5Exception { 22 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
--- 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;
17import ncsa.hdf.hdf5lib.H5; 17import ncsa.hdf.hdf5lib.H5;
18import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 18import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
19 19
20import org.scilab.modules.hdf5.scilabTypes.ScilabList; 20import org.scilab.modules.types.scilabTypes.ScilabList;
21 21
22public class H5ReadScilabList extends H5ReadScilabCommonList { 22public class H5ReadScilabList extends H5ReadScilabCommonList {
23 23
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
--- 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;
16 16
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 19import org.scilab.modules.types.scilabTypes.ScilabMList;
20import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 20import org.scilab.modules.types.scilabTypes.ScilabTList;
21 21
22public class H5ReadScilabMList extends H5ReadScilabCommonList { 22public class H5ReadScilabMList extends H5ReadScilabCommonList {
23 23
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
--- 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;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException; 18import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
19 19
20import org.scilab.modules.hdf5.scilabTypes.ScilabString; 20import org.scilab.modules.types.scilabTypes.ScilabString;
21 21
22public class H5ReadScilabString { 22public class H5ReadScilabString {
23 23
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
--- 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;
16 16
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 19import org.scilab.modules.types.scilabTypes.ScilabTList;
20 20
21public class H5ReadScilabTList extends H5ReadScilabCommonList { 21public class H5ReadScilabTList extends H5ReadScilabCommonList {
22 22
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
--- 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;
16import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 16import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
17import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException; 17import ncsa.hdf.hdf5lib.exceptions.HDF5LibraryException;
18 18
19import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 19import org.scilab.modules.types.scilabTypes.ScilabBoolean;
20import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21import org.scilab.modules.hdf5.scilabTypes.ScilabInteger; 21import org.scilab.modules.types.scilabTypes.ScilabInteger;
22import org.scilab.modules.hdf5.scilabTypes.ScilabList; 22import org.scilab.modules.types.scilabTypes.ScilabList;
23import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 23import org.scilab.modules.types.scilabTypes.ScilabMList;
24import org.scilab.modules.hdf5.scilabTypes.ScilabString; 24import org.scilab.modules.types.scilabTypes.ScilabString;
25import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 25import org.scilab.modules.types.scilabTypes.ScilabTList;
26import org.scilab.modules.hdf5.scilabTypes.ScilabType; 26import org.scilab.modules.types.scilabTypes.ScilabType;
27 27
28 28
29public class H5Write { 29public 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
--- 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;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.H5ScilabConstant; 19import org.scilab.modules.hdf5.H5ScilabConstant;
20import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 20import org.scilab.modules.types.scilabTypes.ScilabBoolean;
21 21
22public class H5WriteScilabBoolean { 22public class H5WriteScilabBoolean {
23 public static void writeInDataSet(int file_id, String dataSetName,ScilabBoolean data) throws NullPointerException, HDF5Exception { 23 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
--- 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;
19import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 19import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
20 20
21import org.scilab.modules.hdf5.H5ScilabConstant; 21import org.scilab.modules.hdf5.H5ScilabConstant;
22import org.scilab.modules.hdf5.scilabTypes.ScilabType; 22import org.scilab.modules.types.scilabTypes.ScilabType;
23 23
24public class H5WriteScilabCommonList { 24public class H5WriteScilabCommonList {
25 protected static void writeInDataSet(int file_id, String dataSetName, ArrayList<ScilabType> data, String ListType) throws NullPointerException, HDF5Exception { 25 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
--- 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;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.H5ScilabConstant; 19import org.scilab.modules.hdf5.H5ScilabConstant;
20import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21 21
22public class H5WriteScilabDouble { 22public class H5WriteScilabDouble {
23 public static void writeInDataSet(int fileId, String dataSetName, ScilabDouble data) throws NullPointerException, HDF5Exception { 23 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
--- 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;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.H5ScilabConstant; 19import org.scilab.modules.hdf5.H5ScilabConstant;
20import org.scilab.modules.hdf5.scilabTypes.ScilabInteger;; 20import org.scilab.modules.types.scilabTypes.ScilabInteger;;
21 21
22public class H5WriteScilabInteger { 22public class H5WriteScilabInteger {
23 public static void writeInDataSet(int file_id, String dataSetName, ScilabInteger data) throws NullPointerException, HDF5Exception { 23 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
--- 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;
15import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 15import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
16 16
17import org.scilab.modules.hdf5.H5ScilabConstant; 17import org.scilab.modules.hdf5.H5ScilabConstant;
18import org.scilab.modules.hdf5.scilabTypes.ScilabList; 18import org.scilab.modules.types.scilabTypes.ScilabList;
19 19
20public class H5WriteScilabList extends H5WriteScilabCommonList { 20public class H5WriteScilabList extends H5WriteScilabCommonList {
21 21
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
--- 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;
14import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 14import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
15 15
16import org.scilab.modules.hdf5.H5ScilabConstant; 16import org.scilab.modules.hdf5.H5ScilabConstant;
17import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 17import org.scilab.modules.types.scilabTypes.ScilabMList;
18 18
19public class H5WriteScilabMList extends H5WriteScilabCommonList { 19public class H5WriteScilabMList extends H5WriteScilabCommonList {
20 20
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
--- 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;
17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 17import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
18 18
19import org.scilab.modules.hdf5.H5ScilabConstant; 19import org.scilab.modules.hdf5.H5ScilabConstant;
20import org.scilab.modules.hdf5.scilabTypes.ScilabString; 20import org.scilab.modules.types.scilabTypes.ScilabString;
21 21
22public class H5WriteScilabString { 22public class H5WriteScilabString {
23 23
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
--- 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;
15import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 15import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
16 16
17import org.scilab.modules.hdf5.H5ScilabConstant; 17import org.scilab.modules.hdf5.H5ScilabConstant;
18import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 18import org.scilab.modules.types.scilabTypes.ScilabTList;
19 19
20public class H5WriteScilabTList extends H5WriteScilabCommonList { 20public class H5WriteScilabTList extends H5WriteScilabCommonList {
21 21
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
--- 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;
16 16
17import org.scilab.modules.hdf5.H5ScilabConstant; 17import org.scilab.modules.hdf5.H5ScilabConstant;
18import org.scilab.modules.hdf5.read.H5Read; 18import org.scilab.modules.hdf5.read.H5Read;
19import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 19import org.scilab.modules.types.scilabTypes.ScilabBoolean;
20import org.scilab.modules.hdf5.write.H5Write; 20import org.scilab.modules.hdf5.write.H5Write;
21 21
22 22
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
--- 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;
17 17
18import org.scilab.modules.hdf5.H5ScilabConstant; 18import org.scilab.modules.hdf5.H5ScilabConstant;
19import org.scilab.modules.hdf5.read.H5Read; 19import org.scilab.modules.hdf5.read.H5Read;
20import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21import org.scilab.modules.hdf5.write.H5Write; 21import org.scilab.modules.hdf5.write.H5Write;
22 22
23 23
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
--- 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.*;
16import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 16import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
17 17
18import org.scilab.modules.hdf5.read.H5Read; 18import org.scilab.modules.hdf5.read.H5Read;
19import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 19import org.scilab.modules.types.scilabTypes.ScilabDouble;
20import org.scilab.modules.hdf5.scilabTypes.ScilabList; 20import org.scilab.modules.types.scilabTypes.ScilabList;
21import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 21import org.scilab.modules.types.scilabTypes.ScilabMList;
22import org.scilab.modules.hdf5.scilabTypes.ScilabString; 22import org.scilab.modules.types.scilabTypes.ScilabString;
23import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 23import org.scilab.modules.types.scilabTypes.ScilabTList;
24import org.scilab.modules.hdf5.write.H5Write; 24import org.scilab.modules.hdf5.write.H5Write;
25 25
26public class testScilabGraph { 26public 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
--- 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;
17 17
18import org.scilab.modules.hdf5.H5ScilabConstant; 18import org.scilab.modules.hdf5.H5ScilabConstant;
19import org.scilab.modules.hdf5.read.H5Read; 19import org.scilab.modules.hdf5.read.H5Read;
20import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21import org.scilab.modules.hdf5.scilabTypes.ScilabList; 21import org.scilab.modules.types.scilabTypes.ScilabList;
22import org.scilab.modules.hdf5.scilabTypes.ScilabString; 22import org.scilab.modules.types.scilabTypes.ScilabString;
23import org.scilab.modules.hdf5.write.H5Write; 23import org.scilab.modules.hdf5.write.H5Write;
24 24
25public class testScilabList { 25public 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
--- 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;
16 16
17import org.scilab.modules.hdf5.H5ScilabConstant; 17import org.scilab.modules.hdf5.H5ScilabConstant;
18import org.scilab.modules.hdf5.read.H5Read; 18import org.scilab.modules.hdf5.read.H5Read;
19import org.scilab.modules.hdf5.scilabTypes.ScilabString; 19import org.scilab.modules.types.scilabTypes.ScilabString;
20import org.scilab.modules.hdf5.write.H5Write; 20import org.scilab.modules.hdf5.write.H5Write;
21 21
22 22
diff --git a/scilab/modules/types/.gitignore b/scilab/modules/types/.gitignore
new file mode 100644
index 0000000..bc3ddde
--- /dev/null
+++ b/scilab/modules/types/.gitignore
@@ -0,0 +1,5 @@
1#
2#generated .def files (windows)
3#
4types.def
5*.bak
diff --git a/scilab/modules/types/Makefile.am b/scilab/modules/types/Makefile.am
new file mode 100644
index 0000000..79dfa3f
--- /dev/null
+++ b/scilab/modules/types/Makefile.am
@@ -0,0 +1,91 @@
1#
2# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3# Copyright (C) DIGITEO - 2010 - Allan CORNET
4#
5# This file must be used under the terms of the CeCILL.
6# This source file is licensed as described in the file COPYING, which
7# you should have received as part of this distribution. The terms
8# are also available at
9# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10#
11
12#### Target ######
13modulename=types
14
15
16#### types : Conf files ####
17libscitypes_la_rootdir = $(mydatadir)
18libscitypes_la_root_DATA = changelog.txt license.txt readme.txt version.xml
19
20
21#### types : init scripts ####
22libscitypes_la_etcdir = $(mydatadir)/etc
23libscitypes_la_etc_DATA = etc/types.quit \
24 etc/types.start
25
26include $(top_srcdir)/Makefile.incl.am
27
28
29TYPES_JNI_SOURCES =
30
31TYPES_C_SOURCES =
32
33TYPES_CPP_SOURCES =
34
35GIWS_WRAPPERS =
36
37if GIWS
38BUILT_SOURCES=giws
39endif
40
41
42GATEWAY_C_SOURCES =
43
44GATEWAY_CPP_SOURCES =
45
46libscitypes_la_CFLAGS=
47
48
49libscitypes_la_CPPFLAGS =
50
51# Without the types module
52libscitypes_disable_la_CFLAGS =
53
54TYPES_DISABLE_C_SOURCES =
55libscitypes_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
56libscitypes_disable_la_SOURCES = $(TYPES_DISABLE_C_SOURCES)
57
58pkglib_LTLIBRARIES = libscitypes-disable.la
59
60if GUI
61pkglib_LTLIBRARIES += libscitypes.la
62endif
63
64libscitypes_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) $(X_LIBS) $(X_EXTRA_LIBS)
65
66libscitypes_la_SOURCES = $(TYPES_C_SOURCES) $(TYPES_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(TYPES_CPP_SOURCES)
67
68# For the code check (splint)
69CHECK_SRC= $(TYPES_C_SOURCES) $(GATEWAY_C_SOURCES)
70INCLUDE_FLAGS = $(libscitypes_la_CFLAGS)
71
72
73#### SWIG Declaration ####
74SWIG_WRAPPERS =
75
76if SWIG
77BUILT_SOURCES=swig
78endif
79
80libscitypes_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
81$(top_builddir)/libs/MALLOC/libscimalloc.la \
82$(top_builddir)/modules/output_stream/libscioutput_stream.la
83
84
85#### types : gateway declaration ####
86libscitypes_la_sci_gatewaydir = $(mydatadir)/sci_gateway
87libscitypes_la_sci_gateway_DATA =
88
89if GUI
90USEANT=1
91endif
diff --git a/scilab/modules/types/build.xml b/scilab/modules/types/build.xml
new file mode 100644
index 0000000..aae4807
--- /dev/null
+++ b/scilab/modules/types/build.xml
@@ -0,0 +1,23 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2010 - DIGITEO - Allan CORNET
5 *
6 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which
8 * you should have received as part of this distribution. The terms
9 * are also available at
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 *
12 -->
13
14<project name="types" default="jar">
15
16 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.types.name}" />
18
19 <description>
20 Build the Scilab types module
21 </description>
22
23</project>
diff --git a/scilab/modules/types/changelog.txt b/scilab/modules/types/changelog.txt
new file mode 100644
index 0000000..0e1ae04
--- /dev/null
+++ b/scilab/modules/types/changelog.txt
@@ -0,0 +1,4 @@
1types (0.1-1) stable; urgency=medium
2
3 * First version of the module
4
diff --git a/scilab/modules/types/etc/types.quit b/scilab/modules/types/etc/types.quit
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/scilab/modules/types/etc/types.quit
diff --git a/scilab/modules/types/etc/types.start b/scilab/modules/types/etc/types.start
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/scilab/modules/types/etc/types.start
diff --git a/scilab/modules/types/license.txt b/scilab/modules/types/license.txt
new file mode 100644
index 0000000..46ae42e
--- /dev/null
+++ b/scilab/modules/types/license.txt
@@ -0,0 +1,9 @@
1Copyright:
2Copyright (c) 2010 - DIGITEO
3
4License:
5This module must be used under the terms of the CeCILL.
6This module file is licensed as described in the file COPYING, which
7you should have received as part of this distribution. The terms
8are also available at
9http://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
index 0000000..f9bd674
--- /dev/null
+++ b/scilab/modules/types/macros/buildmacros.bat
@@ -0,0 +1,11 @@
1
2rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3rem Copyright (C) 2009 - DIGITEO
4rem
5rem This file must be used under the terms of the CeCILL.
6rem This source file is licensed as described in the file COPYING, which
7rem you should have received as part of this distribution. The terms
8rem are also available at
9rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10
11@..\..\..\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
index 0000000..590b940
--- /dev/null
+++ b/scilab/modules/types/macros/buildmacros.sce
@@ -0,0 +1,16 @@
1
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Allan CORNET <allan.cornet@inria.fr>
4//
5// This file must be used under the terms of the CeCILL.
6// This source file is licensed as described in the file COPYING, which
7// you should have received as part of this distribution. The terms
8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10
11if (isdef('genlib') == %f) then
12 exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
13end
14
15//genlib("typeslib","SCI/modules/types/macros",%f,%t);
16
diff --git a/scilab/modules/types/macros/cleanmacros.bat b/scilab/modules/types/macros/cleanmacros.bat
new file mode 100644
index 0000000..d8e26bf
--- /dev/null
+++ b/scilab/modules/types/macros/cleanmacros.bat
@@ -0,0 +1,13 @@
1
2rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3rem Copyright (C) 2009 - DIGITEO
4rem
5rem This file must be used under the terms of the CeCILL.
6rem This source file is licensed as described in the file COPYING, which
7rem you should have received as part of this distribution. The terms
8rem are also available at
9rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10
11@del *.bin 2>NUL
12@del lib 2>NUL
13@del names 2>NUL
diff --git a/scilab/modules/types/readme.txt b/scilab/modules/types/readme.txt
new file mode 100644
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
index be4775d..33d7cb9 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15/** 15/**
16 * This class provides a wrapping on the Scilab boolean datatype 16 * 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
index eab9fae..ef80e2f 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15/** 15/**
16 * This class provides a wrapping on the Scilab Double datatype<br /> 16 * 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
index a559e07..9f406ca 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15/** 15/**
16 * This class provides a wrapping on the Scilab Integer datatype 16 * 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
index b42a6cb..9a284f9 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15import java.util.ArrayList; 15import java.util.ArrayList;
16 16
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
index 356d79d..54a3f53 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15import java.util.ArrayList; 15import java.util.ArrayList;
16 16
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
index bc5bdf1..4c01a0a 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15/** 15/**
16 * This class provides a wrapping on the Scilab String datatype 16 * 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
index 59743f8..4b69926 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15import java.util.ArrayList; 15import java.util.ArrayList;
16 16
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
index de4faf5..9abd5da 100644
--- 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 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.hdf5.scilabTypes; 13package org.scilab.modules.types.scilabTypes;
14 14
15import java.io.Serializable; 15import java.io.Serializable;
16 16
diff --git a/scilab/modules/types/src/java/types-JAVA.vcproj b/scilab/modules/types/src/java/types-JAVA.vcproj
new file mode 100644
index 0000000..cf32536
--- /dev/null
+++ b/scilab/modules/types/src/java/types-JAVA.vcproj
@@ -0,0 +1,119 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9,00"
5 Name="types-Ant"
6 ProjectGUID="{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
7 RootNamespace="types-Ant"
8 Keyword="MakeFileProj"
9 TargetFrameworkVersion="0"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 <Platform
16 Name="x64"
17 />
18 </Platforms>
19 <ToolFiles>
20 </ToolFiles>
21 <Configurations>
22 <Configuration
23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
25 IntermediateDirectory="$(ConfigurationName)"
26 ConfigurationType="0"
27 >
28 <Tool
29 Name="VCNMakeTool"
30 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;"
31 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;"
32 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;"
33 Output=""
34 PreprocessorDefinitions="WIN32;_DEBUG"
35 IncludeSearchPath=""
36 ForcedIncludes=""
37 AssemblySearchPath=""
38 ForcedUsingAssemblies=""
39 CompileAsManaged=""
40 />
41 </Configuration>
42 <Configuration
43 Name="Debug|x64"
44 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
45 IntermediateDirectory="$(ConfigurationName)"
46 ConfigurationType="0"
47 >
48 <Tool
49 Name="VCNMakeTool"
50 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;"
51 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;"
52 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;"
53 Output=""
54 PreprocessorDefinitions="WIN32;_DEBUG"
55 IncludeSearchPath=""
56 ForcedIncludes=""
57 AssemblySearchPath=""
58 ForcedUsingAssemblies=""
59 CompileAsManaged=""
60 />
61 </Configuration>
62 <Configuration
63 Name="Release|Win32"
64 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
65 IntermediateDirectory="$(ConfigurationName)"
66 ConfigurationType="0"
67 >
68 <Tool
69 Name="VCNMakeTool"
70 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;"
71 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;"
72 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;"
73 Output=""
74 PreprocessorDefinitions="WIN32;NDEBUG"
75 IncludeSearchPath=""
76 ForcedIncludes=""
77 AssemblySearchPath=""
78 ForcedUsingAssemblies=""
79 CompileAsManaged=""
80 />
81 </Configuration>
82 <Configuration
83 Name="Release|x64"
84 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
85 IntermediateDirectory="$(ConfigurationName)"
86 ConfigurationType="0"
87 >
88 <Tool
89 Name="VCNMakeTool"
90 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;"
91 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;"
92 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;"
93 Output=""
94 PreprocessorDefinitions="WIN32;NDEBUG"
95 IncludeSearchPath=""
96 ForcedIncludes=""
97 AssemblySearchPath=""
98 ForcedUsingAssemblies=""
99 CompileAsManaged=""
100 />
101 </Configuration>
102 </Configurations>
103 <References>
104 </References>
105 <Files>
106 <Filter
107 Name="Source Files"
108 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
109 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
110 >
111 </Filter>
112 <File
113 RelativePath="..\..\build.xml"
114 >
115 </File>
116 </Files>
117 <Globals>
118 </Globals>
119</VisualStudioProject>
diff --git a/scilab/modules/types/version.xml b/scilab/modules/types/version.xml
new file mode 100644
index 0000000..3e7889b
--- /dev/null
+++ b/scilab/modules/types/version.xml
@@ -0,0 +1,11 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!--
3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4 * Copyright (C) 2010 - DIGITEO
5 *
6 * This file is distributed under the same license as the Scilab package.
7 -->
8<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
9<MODULE_VERSION name="types">
10<VERSION major="1" minor="0" maintenance="0" revision="0" string="unstable-git" />
11</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
--- 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;
13 13
14import java.util.UUID; 14import java.util.UUID;
15 15
16import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 16import org.scilab.modules.types.scilabTypes.ScilabDouble;
17import org.scilab.modules.hdf5.scilabTypes.ScilabList; 17import org.scilab.modules.types.scilabTypes.ScilabList;
18import org.scilab.modules.hdf5.scilabTypes.ScilabType; 18import org.scilab.modules.types.scilabTypes.ScilabType;
19 19
20/** 20/**
21 * Implement the AFFICH_m block 21 * 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
--- 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;
42import org.scilab.modules.gui.menu.ScilabMenu; 42import org.scilab.modules.gui.menu.ScilabMenu;
43import org.scilab.modules.gui.menuitem.MenuItem; 43import org.scilab.modules.gui.menuitem.MenuItem;
44import org.scilab.modules.gui.menuitem.ScilabMenuItem; 44import org.scilab.modules.gui.menuitem.ScilabMenuItem;
45import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 45import org.scilab.modules.types.scilabTypes.ScilabDouble;
46import org.scilab.modules.hdf5.scilabTypes.ScilabList; 46import org.scilab.modules.types.scilabTypes.ScilabList;
47import org.scilab.modules.hdf5.scilabTypes.ScilabString; 47import org.scilab.modules.types.scilabTypes.ScilabString;
48import org.scilab.modules.hdf5.scilabTypes.ScilabType; 48import org.scilab.modules.types.scilabTypes.ScilabType;
49import org.scilab.modules.hdf5.write.H5Write; 49import org.scilab.modules.hdf5.write.H5Write;
50import org.scilab.modules.xcos.Xcos; 50import org.scilab.modules.xcos.Xcos;
51import org.scilab.modules.xcos.actions.ShowHideShadowAction; 51import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block; 13package org.scilab.modules.xcos.block;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabString; 15import org.scilab.modules.types.scilabTypes.ScilabString;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18/** 18/**
19 * @author Bruno JOFRET 19 * @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
--- 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 @@
13 13
14package org.scilab.modules.xcos.block; 14package org.scilab.modules.xcos.block;
15 15
16import org.scilab.modules.hdf5.scilabTypes.ScilabString; 16import org.scilab.modules.types.scilabTypes.ScilabString;
17import org.scilab.modules.hdf5.scilabTypes.ScilabType; 17import org.scilab.modules.types.scilabTypes.ScilabType;
18 18
19/** 19/**
20 * A {@link BasicBlock} which print getExprs()[0][0] as bloc value. 20 * 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
--- 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 @@
11 */ 11 */
12package org.scilab.modules.xcos.block; 12package org.scilab.modules.xcos.block;
13 13
14import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 14import org.scilab.modules.types.scilabTypes.ScilabDouble;
15import org.scilab.modules.hdf5.scilabTypes.ScilabList; 15import org.scilab.modules.types.scilabTypes.ScilabList;
16import org.scilab.modules.xcos.link.BasicLink; 16import org.scilab.modules.xcos.link.BasicLink;
17import org.scilab.modules.xcos.port.BasicPort; 17import org.scilab.modules.xcos.port.BasicPort;
18import org.scilab.modules.xcos.port.command.CommandPort; 18import 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
--- 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;
19import org.scilab.modules.gui.contextmenu.ContextMenu; 19import org.scilab.modules.gui.contextmenu.ContextMenu;
20import org.scilab.modules.gui.menu.Menu; 20import org.scilab.modules.gui.menu.Menu;
21import org.scilab.modules.gui.menu.ScilabMenu; 21import org.scilab.modules.gui.menu.ScilabMenu;
22import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 22import org.scilab.modules.types.scilabTypes.ScilabDouble;
23import org.scilab.modules.hdf5.scilabTypes.ScilabList; 23import org.scilab.modules.types.scilabTypes.ScilabList;
24import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 24import org.scilab.modules.types.scilabTypes.ScilabMList;
25import org.scilab.modules.xcos.XcosTab; 25import org.scilab.modules.xcos.XcosTab;
26import org.scilab.modules.xcos.actions.CodeGenerationAction; 26import org.scilab.modules.xcos.actions.CodeGenerationAction;
27import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction; 27import 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
--- 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;
17import org.scilab.modules.graph.actions.base.DefaultAction; 17import org.scilab.modules.graph.actions.base.DefaultAction;
18import org.scilab.modules.graph.utils.StyleMap; 18import org.scilab.modules.graph.utils.StyleMap;
19import org.scilab.modules.gui.menu.Menu; 19import org.scilab.modules.gui.menu.Menu;
20import org.scilab.modules.hdf5.scilabTypes.ScilabString; 20import org.scilab.modules.types.scilabTypes.ScilabString;
21import org.scilab.modules.hdf5.scilabTypes.ScilabType; 21import org.scilab.modules.types.scilabTypes.ScilabType;
22import org.scilab.modules.xcos.block.actions.BlockParametersAction; 22import org.scilab.modules.xcos.block.actions.BlockParametersAction;
23import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction; 23import org.scilab.modules.xcos.block.actions.RegionToSuperblockAction;
24 24
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
--- 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;
27import org.scilab.modules.graph.ScilabGraphUniqueObject; 27import org.scilab.modules.graph.ScilabGraphUniqueObject;
28import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction; 28import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
29import org.scilab.modules.gui.menuitem.MenuItem; 29import org.scilab.modules.gui.menuitem.MenuItem;
30import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 30import org.scilab.modules.types.scilabTypes.ScilabDouble;
31import org.scilab.modules.hdf5.scilabTypes.ScilabList; 31import org.scilab.modules.types.scilabTypes.ScilabList;
32import org.scilab.modules.hdf5.scilabTypes.ScilabString; 32import org.scilab.modules.types.scilabTypes.ScilabString;
33import org.scilab.modules.xcos.block.BasicBlock; 33import org.scilab.modules.xcos.block.BasicBlock;
34import org.scilab.modules.xcos.block.BlockFactory; 34import org.scilab.modules.xcos.block.BlockFactory;
35import org.scilab.modules.xcos.block.SplitBlock; 35import 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
--- 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;
18import org.scilab.modules.graph.ScilabGraph; 18import org.scilab.modules.graph.ScilabGraph;
19import org.scilab.modules.graph.actions.base.DefaultAction; 19import org.scilab.modules.graph.actions.base.DefaultAction;
20import org.scilab.modules.gui.menuitem.MenuItem; 20import org.scilab.modules.gui.menuitem.MenuItem;
21import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 21import org.scilab.modules.types.scilabTypes.ScilabDouble;
22import org.scilab.modules.hdf5.scilabTypes.ScilabList; 22import org.scilab.modules.types.scilabTypes.ScilabList;
23import org.scilab.modules.hdf5.scilabTypes.ScilabString; 23import org.scilab.modules.types.scilabTypes.ScilabString;
24import org.scilab.modules.xcos.block.SuperBlock; 24import org.scilab.modules.xcos.block.SuperBlock;
25import org.scilab.modules.xcos.graph.XcosDiagram; 25import org.scilab.modules.xcos.graph.XcosDiagram;
26import org.scilab.modules.xcos.utils.XcosMessages; 26import 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
--- 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;
35import org.scilab.modules.graph.ScilabGraph; 35import org.scilab.modules.graph.ScilabGraph;
36import org.scilab.modules.graph.actions.base.DefaultAction; 36import org.scilab.modules.graph.actions.base.DefaultAction;
37import org.scilab.modules.gui.menuitem.MenuItem; 37import org.scilab.modules.gui.menuitem.MenuItem;
38import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 38import org.scilab.modules.types.scilabTypes.ScilabDouble;
39import org.scilab.modules.hdf5.scilabTypes.ScilabList; 39import org.scilab.modules.types.scilabTypes.ScilabList;
40import org.scilab.modules.hdf5.scilabTypes.ScilabString; 40import org.scilab.modules.types.scilabTypes.ScilabString;
41import org.scilab.modules.hdf5.scilabTypes.ScilabType; 41import org.scilab.modules.types.scilabTypes.ScilabType;
42import org.scilab.modules.xcos.block.SuperBlock; 42import org.scilab.modules.xcos.block.SuperBlock;
43import org.scilab.modules.xcos.graph.XcosDiagram; 43import org.scilab.modules.xcos.graph.XcosDiagram;
44import org.scilab.modules.xcos.utils.XcosMessages; 44import 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
--- 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;
28import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 28import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
29import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 29import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
30import org.scilab.modules.gui.menuitem.MenuItem; 30import org.scilab.modules.gui.menuitem.MenuItem;
31import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 31import org.scilab.modules.types.scilabTypes.ScilabMList;
32import org.scilab.modules.hdf5.write.H5Write; 32import org.scilab.modules.hdf5.write.H5Write;
33import org.scilab.modules.xcos.block.BasicBlock; 33import org.scilab.modules.xcos.block.BasicBlock;
34import org.scilab.modules.xcos.block.SplitBlock; 34import 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
--- 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;
17 17
18import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 18import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
19import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 19import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
20import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21import org.scilab.modules.hdf5.scilabTypes.ScilabList; 21import org.scilab.modules.types.scilabTypes.ScilabList;
22import org.scilab.modules.xcos.block.BasicBlock; 22import org.scilab.modules.xcos.block.BasicBlock;
23import org.scilab.modules.xcos.io.BlockReader; 23import org.scilab.modules.xcos.io.BlockReader;
24import org.scilab.modules.xcos.port.BasicPort; 24import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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..73132475 100644
--- 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 @@
12 12
13package org.scilab.modules.xcos.block.io; 13package org.scilab.modules.xcos.block.io;
14 14
15import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 15import org.scilab.modules.types.scilabTypes.ScilabDouble;
16import org.scilab.modules.hdf5.scilabTypes.ScilabType; 16import org.scilab.modules.types.scilabTypes.ScilabType;
17 17
18import org.scilab.modules.xcos.block.BasicBlock; 18import org.scilab.modules.xcos.block.BasicBlock;
19import org.scilab.modules.xcos.utils.XcosConstants; 19import 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
--- 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;
71import org.scilab.modules.gui.utils.UIElementMapper; 71import org.scilab.modules.gui.utils.UIElementMapper;
72import org.scilab.modules.gui.window.ScilabWindow; 72import org.scilab.modules.gui.window.ScilabWindow;
73import org.scilab.modules.hdf5.read.H5Read; 73import org.scilab.modules.hdf5.read.H5Read;
74import org.scilab.modules.hdf5.scilabTypes.ScilabList; 74import org.scilab.modules.types.scilabTypes.ScilabList;
75import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 75import org.scilab.modules.types.scilabTypes.ScilabMList;
76import org.scilab.modules.hdf5.scilabTypes.ScilabString; 76import org.scilab.modules.types.scilabTypes.ScilabString;
77import org.scilab.modules.xcos.Xcos; 77import org.scilab.modules.xcos.Xcos;
78import org.scilab.modules.xcos.XcosTab; 78import org.scilab.modules.xcos.XcosTab;
79import org.scilab.modules.xcos.actions.DiagramBackgroundAction; 79import 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
--- 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;
17import java.util.List; 17import java.util.List;
18import java.util.Map; 18import java.util.Map;
19 19
20import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 20import org.scilab.modules.types.scilabTypes.ScilabBoolean;
21import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 21import org.scilab.modules.types.scilabTypes.ScilabDouble;
22import org.scilab.modules.hdf5.scilabTypes.ScilabList; 22import org.scilab.modules.types.scilabTypes.ScilabList;
23import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 23import org.scilab.modules.types.scilabTypes.ScilabMList;
24import org.scilab.modules.hdf5.scilabTypes.ScilabString; 24import org.scilab.modules.types.scilabTypes.ScilabString;
25import org.scilab.modules.hdf5.scilabTypes.ScilabType; 25import org.scilab.modules.types.scilabTypes.ScilabType;
26import org.scilab.modules.xcos.block.BasicBlock; 26import org.scilab.modules.xcos.block.BasicBlock;
27import org.scilab.modules.xcos.port.BasicPort; 27import org.scilab.modules.xcos.port.BasicPort;
28import org.scilab.modules.xcos.port.Orientation; 28import 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
--- 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;
26import org.scilab.modules.gui.messagebox.ScilabModalDialog; 26import org.scilab.modules.gui.messagebox.ScilabModalDialog;
27import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType; 27import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
28import org.scilab.modules.hdf5.read.H5Read; 28import org.scilab.modules.hdf5.read.H5Read;
29import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 29import org.scilab.modules.types.scilabTypes.ScilabBoolean;
30import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 30import org.scilab.modules.types.scilabTypes.ScilabDouble;
31import org.scilab.modules.hdf5.scilabTypes.ScilabList; 31import org.scilab.modules.types.scilabTypes.ScilabList;
32import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 32import org.scilab.modules.types.scilabTypes.ScilabMList;
33import org.scilab.modules.hdf5.scilabTypes.ScilabString; 33import org.scilab.modules.types.scilabTypes.ScilabString;
34import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 34import org.scilab.modules.types.scilabTypes.ScilabTList;
35import org.scilab.modules.hdf5.scilabTypes.ScilabType; 35import org.scilab.modules.types.scilabTypes.ScilabType;
36import org.scilab.modules.xcos.block.BasicBlock; 36import org.scilab.modules.xcos.block.BasicBlock;
37import org.scilab.modules.xcos.block.BlockFactory; 37import org.scilab.modules.xcos.block.BlockFactory;
38import org.scilab.modules.xcos.block.TextBlock; 38import 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
--- 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;
17 17
18import ncsa.hdf.hdf5lib.exceptions.HDF5Exception; 18import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
19 19
20import org.scilab.modules.hdf5.scilabTypes.ScilabBoolean; 20import org.scilab.modules.types.scilabTypes.ScilabBoolean;
21import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 21import org.scilab.modules.types.scilabTypes.ScilabDouble;
22import org.scilab.modules.hdf5.scilabTypes.ScilabList; 22import org.scilab.modules.types.scilabTypes.ScilabList;
23import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 23import org.scilab.modules.types.scilabTypes.ScilabMList;
24import org.scilab.modules.hdf5.scilabTypes.ScilabString; 24import org.scilab.modules.types.scilabTypes.ScilabString;
25import org.scilab.modules.hdf5.scilabTypes.ScilabTList; 25import org.scilab.modules.types.scilabTypes.ScilabTList;
26import org.scilab.modules.hdf5.write.H5Write; 26import org.scilab.modules.hdf5.write.H5Write;
27import org.scilab.modules.xcos.block.BasicBlock; 27import org.scilab.modules.xcos.block.BasicBlock;
28import org.scilab.modules.xcos.block.TextBlock; 28import 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
--- 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;
26import org.scilab.modules.gui.contextmenu.ScilabContextMenu; 26import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
27import org.scilab.modules.gui.menu.Menu; 27import org.scilab.modules.gui.menu.Menu;
28import org.scilab.modules.gui.menu.ScilabMenu; 28import org.scilab.modules.gui.menu.ScilabMenu;
29import org.scilab.modules.hdf5.scilabTypes.ScilabDouble; 29import org.scilab.modules.types.scilabTypes.ScilabDouble;
30import org.scilab.modules.hdf5.scilabTypes.ScilabMList; 30import org.scilab.modules.types.scilabTypes.ScilabMList;
31import org.scilab.modules.hdf5.scilabTypes.ScilabString; 31import org.scilab.modules.types.scilabTypes.ScilabString;
32import org.scilab.modules.xcos.block.BasicBlock; 32import org.scilab.modules.xcos.block.BasicBlock;
33import org.scilab.modules.xcos.block.actions.BorderColorAction; 33import org.scilab.modules.xcos.block.actions.BorderColorAction;
34import org.scilab.modules.xcos.link.actions.StyleHorizontalAction; 34import 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
--- 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
72library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/ 72library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/
73library.javasci.name=javasci.jar 73library.javasci.name=javasci.jar
74 74
75library.types.dir=${modules.dir}/types/${build.jar.dir}/
76library.types.name=org.scilab.modules.types.jar
77
75library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/ 78library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
76library.hdf5.name=org.scilab.modules.hdf5.jar 79library.hdf5.name=org.scilab.modules.hdf5.jar
77 80
diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 3ba7f4d..0412794 100644
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -71,6 +71,9 @@ library.javasci.name=javasci.jar
71library.graphic_export.dir=${modules.dir}/graphic_export/${build.jar.dir}/ 71library.graphic_export.dir=${modules.dir}/graphic_export/${build.jar.dir}/
72library.graphic_export.name=org.scilab.modules.graphic_export.jar 72library.graphic_export.name=org.scilab.modules.graphic_export.jar
73 73
74library.types.dir=${modules.dir}/types/${build.jar.dir}/
75library.types.name=org.scilab.modules.types.jar
76
74library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/ 77library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
75library.hdf5.name=org.scilab.modules.hdf5.jar 78library.hdf5.name=org.scilab.modules.hdf5.jar
76 79