moved ScilabInterpreterManagement and related Classes into action_binding 76/476/11
Allan SIMON [Thu, 6 May 2010 12:40:56 +0000 (14:40 +0200)]
Change-Id: Ia1e46e0db2355f3c7c90fd7f2c10cdadb8e0f600

45 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/includes/gw_action_binding.h [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp [moved from scilab/modules/xcos/sci_gateway/cpp/sci_xcosNotify.cpp with 94% similarity]
scilab/modules/action_binding/src/c/LibScilab_Import.def
scilab/modules/action_binding/src/c/action_binding.vcproj
scilab/modules/action_binding/src/c/libjvm_Import.def
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/highlevel/ScilabInterpreterManagement.java [moved from scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabInterpreterManagement.java with 94% similarity]
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/ActionBindingMessages.java [new file with mode: 0644]
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/Signal.java [moved from scilab/modules/graph/src/java/org/scilab/modules/graph/utils/Signal.java with 88% similarity]
scilab/modules/action_binding/src/jni/GiwsException.cpp [new file with mode: 0644]
scilab/modules/action_binding/src/jni/GiwsException.hxx [new file with mode: 0644]
scilab/modules/action_binding/src/jni/Signal.cpp [moved from scilab/modules/xcos/src/jni/Signal.cpp with 75% similarity]
scilab/modules/action_binding/src/jni/Signal.giws.xml [moved from scilab/modules/xcos/src/jni/XcosUtils.giws.xml with 74% similarity]
scilab/modules/action_binding/src/jni/Signal.hxx [moved from scilab/modules/xcos/src/jni/Signal.hxx with 92% similarity]
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/xcos_gateway.xml
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java

index f7d0719..618935b 100644 (file)
@@ -840,6 +840,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding", "modules\action_binding\src\c\action_binding.vcproj", "{8A654CC5-22C1-4972-A8CF-1B89F78B5383}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
index 0c41c7b..d84d421 100644 (file)
@@ -21,7 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions", "mod
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions_f2c", "modules\elementary_functions\src\fortran\elementary_functions_f2c.vcproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions_f", "modules\elementary_functions\src\fortran\elementary_functions_f2c.vcproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -34,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\stati
                {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f2c", "libs\LibScilab\LibScilab_f2c.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f", "libs\LibScilab\LibScilab_f2c.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
        ProjectSection(ProjectDependencies) = postProject
                {9BC28602-73B4-4FBB-9583-478D2F047CA4} = {9BC28602-73B4-4FBB-9583-478D2F047CA4}
                {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
@@ -119,7 +119,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_f2c", "modules\core\src\fortran\core_f2c.vcproj", "{C352587B-F5E4-457C-80EE-A1AEAB176C8E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_f", "modules\core\src\fortran\core_f2c.vcproj", "{C352587B-F5E4-457C-80EE-A1AEAB176C8E}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -152,7 +152,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_f2c", "modules\integer\src\fortran\integer_f2c.vcproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_f", "modules\integer\src\fortran\integer_f2c.vcproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
@@ -204,13 +204,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\opt
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization_f2c", "modules\optimization\src\fortran\optimization_f2c.vcproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization_f", "modules\optimization\src\fortran\optimization_f2c.vcproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polynomials_f2c", "modules\polynomials\src\fortran\polynomials_f2c.vcproj", "{3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polynomials_f", "modules\polynomials\src\fortran\polynomials_f2c.vcproj", "{3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -234,7 +234,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib_f2c", "modules\randlib\src\fortran\randlib_f2c.vcproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib_f", "modules\randlib\src\fortran\randlib_f2c.vcproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -253,18 +253,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\sr
                {70F677F1-B535-4D0F-A16F-5093B799A540} = {70F677F1-B535-4D0F-A16F-5093B799A540}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_f2c", "modules\scicos\src\fortran\scicos_f2c.vcproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_f", "modules\scicos\src\fortran\scicos_f2c.vcproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing_f2c", "modules\signal_processing\src\fortran\signal_processing_f2c.vcproj", "{959384FC-016C-4B01-B848-1B18D26B6CC4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing_f", "modules\signal_processing\src\fortran\signal_processing_f2c.vcproj", "{959384FC-016C-4B01-B848-1B18D26B6CC4}"
        ProjectSection(ProjectDependencies) = postProject
                {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slicot_f2c", "modules\cacsd\src\slicot\slicot_f\slicot_f2c.vcproj", "{C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slicot_f", "modules\cacsd\src\slicot\slicot_f\slicot_f2c.vcproj", "{C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -288,7 +288,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse", "modules\sparse\sr
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_f2c", "modules\sparse\src\fortran\sparse_f2c.vcproj", "{13082624-97F9-47DB-A9A1-AD7D6BF3856A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_f", "modules\sparse\src\fortran\sparse_f2c.vcproj", "{13082624-97F9-47DB-A9A1-AD7D6BF3856A}"
        ProjectSection(ProjectDependencies) = postProject
                {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
@@ -436,7 +436,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io", "modules\io\src\c\io.v
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_f2c", "modules\io\src\fortran\io_f2c.vcproj", "{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_f", "modules\io\src\fortran\io_f2c.vcproj", "{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
@@ -456,7 +456,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "modules\string\sr
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_f2c", "modules\string\src\fortran\string_f2c.vcproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_f", "modules\string\src\fortran\string_f2c.vcproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -464,7 +464,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_f2c", "modules\strin
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbolic_f2c", "modules\symbolic\src\fortran\symbolic_f2c.vcproj", "{D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbolic_f", "modules\symbolic\src\fortran\symbolic_f2c.vcproj", "{D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
@@ -500,7 +500,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing", "module
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd_f2c", "modules\cacsd\src\fortran\cacsd_f2c.vcproj", "{0BB16C71-0FCD-4FB9-B7C0-F2601330C980}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd_f", "modules\cacsd\src\fortran\cacsd_f2c.vcproj", "{0BB16C71-0FCD-4FB9-B7C0-F2601330C980}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -511,12 +511,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd", "modules\cacsd\src\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcd_f2c_DLL", "modules\statistics\src\dcdflib\dcd_f\dcd_DLL_f2c.vcproj", "{18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcd_DLL", "modules\statistics\src\dcdflib\dcd_f\dcd_DLL_f2c.vcproj", "{18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_f2c", "modules\linear_algebra\src\fortran\linear_algebra_f2c.vcproj", "{3735EFF9-925B-45B1-82CF-762658E69E70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_f", "modules\linear_algebra\src\fortran\linear_algebra_f2c.vcproj", "{3735EFF9-925B-45B1-82CF-762658E69E70}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -539,7 +539,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions", "module
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions_f2c", "modules\special_functions\src\fortran\special_functions_f2c.vcproj", "{E3A01BE7-815F-4A06-9F0A-C95E80873966}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions_f", "modules\special_functions\src\fortran\special_functions_f2c.vcproj", "{E3A01BE7-815F-4A06-9F0A-C95E80873966}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -550,7 +550,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations", "m
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations_f2c", "modules\differential_equations\src\fortran\differential_equations_f2c.vcproj", "{28E4E9CA-3EEC-43EE-9F15-56259C6677B8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "differential_equations_f", "modules\differential_equations\src\fortran\differential_equations_f2c.vcproj", "{28E4E9CA-3EEC-43EE-9F15-56259C6677B8}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -561,7 +561,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "modules\double\sr
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double_f2c", "modules\double\src\fortran\double_f2c.vcproj", "{97B3664E-1186-400A-AEC0-AC3F23087689}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double_f", "modules\double\src\fortran\double_f2c.vcproj", "{97B3664E-1186-400A-AEC0-AC3F23087689}"
        ProjectSection(ProjectDependencies) = postProject
                {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
@@ -576,7 +576,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean", "modules\boolean\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_f2c", "modules\boolean\src\fortran\boolean_f2c.vcproj", "{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_f", "modules\boolean\src\fortran\boolean_f2c.vcproj", "{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -598,12 +598,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures", "modules\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures_f2c", "modules\data_structures\src\fortran\data_structures_f2c.vcproj", "{8091E9B6-4C08-4218-A63D-742867CCFE9F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures_f", "modules\data_structures\src\fortran\data_structures_f2c.vcproj", "{8091E9B6-4C08-4218-A63D-742867CCFE9F}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation_f2c", "modules\interpolation\src\fortran\interpolation_f2c.vcproj", "{D98B0986-14E4-44FD-B006-CACE4B291F38}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation_f", "modules\interpolation\src\fortran\interpolation_f2c.vcproj", "{D98B0986-14E4-44FD-B006-CACE4B291F38}"
        ProjectSection(ProjectDependencies) = postProject
                {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -633,7 +633,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noscicos", "modules\scicos\
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slatec_f2c", "modules\elementary_functions\src\fortran\slatec\slatec_f2c.vcproj", "{EAF0949C-28D2-497C-954F-FC13B32FF2F3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slatec_f", "modules\elementary_functions\src\fortran\slatec\slatec_f2c.vcproj", "{EAF0949C-28D2-497C-954F-FC13B32FF2F3}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -841,6 +841,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding", "modules\action_binding\src\c\action_binding.vcproj", "{8A654CC5-22C1-4972-A8CF-1B89F78B5383}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -890,7 +892,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_export-Ant", "modul
                {4235A847-ED0E-43A3-B62B-E59CB857EDE9} = {4235A847-ED0E-43A3-B62B-E59CB857EDE9}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_f2c", "modules\dynamic_link\src\fortran\dynamic_link_f2c.vcproj", "{9BC28602-73B4-4FBB-9583-478D2F047CA4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_f", "modules\dynamic_link\src\fortran\dynamic_link_f2c.vcproj", "{9BC28602-73B4-4FBB-9583-478D2F047CA4}"
        ProjectSection(ProjectDependencies) = postProject
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
@@ -918,7 +920,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\sc
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f2c", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
        ProjectSection(ProjectDependencies) = postProject
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
@@ -960,12 +962,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools", "modules\helpto
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools-Ant", "modules\helptools\src\java\helptools-JAVA.vcproj", "{899DECF1-D4DC-4C84-BB3C-3A343401A5B4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linpack_f2c", "modules\elementary_functions\src\fortran\linpack\linpack_f2c.vcproj", "{F0F55692-0355-4BC3-BE9D-552C8AAC5238}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linpack_f", "modules\elementary_functions\src\fortran\linpack\linpack_f2c.vcproj", "{F0F55692-0355-4BC3-BE9D-552C8AAC5238}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eispack_f2c", "modules\elementary_functions\src\fortran\eispack\eispack_f2c.vcproj", "{96248E56-C84A-4803-9F50-25E2089AB6B8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eispack_f", "modules\elementary_functions\src\fortran\eispack\eispack_f2c.vcproj", "{96248E56-C84A-4803-9F50-25E2089AB6B8}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -981,7 +983,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "call_scilab", "modules\call
                {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_f2c", "modules\output_stream\src\fortran\output_stream_f2c.vcproj", "{E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_f", "modules\output_stream\src\fortran\output_stream_f2c.vcproj", "{E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -1001,7 +1003,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f2c", "modules\functions\src\fortran\functions_f2c.vcproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f", "modules\functions\src\fortran\functions_f2c.vcproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
index 30ac3f3..9c45824 100644 (file)
@@ -15,9 +15,18 @@ USEANT=1
 # List of the c files
 ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
 
+# List of the c++ file
+ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
+src/jni/Signal.hxx \
+src/jni/GiwsException.cpp
+
 # List of the gateway c files
 CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
 
+GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
+
+GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
+
 #### SWIG Declaration ####
 SWIG_WRAPPERS = src/jni/InterpreterManagement.i
 else
@@ -30,6 +39,12 @@ if SWIG
 BUILT_SOURCES=swig
 endif
 
+GIWS_WRAPPERS = src/jni/Signal.giws.xml
+
+if GIWS
+BUILT_SOURCES=giws
+endif
+
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
@@ -37,6 +52,17 @@ libsciaction_binding_la_CFLAGS=      $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/jvm/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/output_stream/includes
+
+# Includes need for the compilation
+libsciaction_binding_la_CPPFLAGS=      $(JAVA_JNI_INCLUDE) \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/jni/ \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
@@ -44,18 +70,21 @@ libsciaction_binding_la_CFLAGS=     $(JAVA_JNI_INCLUDE) \
 # the system)
 pkglib_LTLIBRARIES = libsciaction_binding.la
 
-libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 
 # All the sources needed by libsciaction_binding.la
-libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(CONSOLE_C_JNI_SOURCES)
+libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC= $(ACTION_BINDING_C_SOURCES)
+CHECK_SRC= $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 
 ## Libraries necessary
 ## Change to include other Scilab modules/lib
-libsciaction_binding_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciaction_binding_la_LIBADD =       $(top_builddir)/modules/core/libscicore.la \
+                                                                       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                                       $(top_builddir)/modules/jvm/libscijvm.la \
+                                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
 #### Name of the module and the path ######
 modulename=action_binding
 
@@ -67,9 +96,10 @@ libsciaction_binding_la_root_DATA = changelog.txt license.txt readme.txt version
 libsciaction_binding_la_etcdir = $(mydatadir)/etc
 libsciaction_binding_la_etc_DATA = etc/action_binding.quit etc/action_binding.start
 
+
 ####´┐Żaction_binding : gateway declaration ####
 libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libsciaction_binding_la_sci_gateway_DATA =
+libsciaction_binding_la_sci_gateway_DATA = sci_gateway/action_binding_gateway.xml
 
 # Provides macros compilation, Java compilation, cleaning
 # If you want Makefile to call ant, added USEANT=1
index 5ef3853..2a86de2 100644 (file)
@@ -118,24 +118,34 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciaction_binding_la_DEPENDENCIES =  \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/jvm/libscijvm.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 am__libsciaction_binding_la_SOURCES_DIST =  \
        src/noaction_binding/noaction_binding.c src/c/dynamic_menus.c \
-       src/c/InterpreterManagement.c \
-       src/jni/InterpreterManagement_wrap.c
+       src/c/InterpreterManagement.c src/jni/Signal.cpp \
+       src/jni/Signal.hxx src/jni/GiwsException.cpp \
+       src/jni/InterpreterManagement_wrap.c \
+       sci_gateway/c/gw_action_binding.c \
+       sci_gateway/cpp/sci_notify.cpp
 @GUI_FALSE@am__objects_1 =  \
 @GUI_FALSE@    libsciaction_binding_la-noaction_binding.lo \
 @GUI_FALSE@    libsciaction_binding_la-dynamic_menus.lo
 @GUI_TRUE@am__objects_1 =  \
 @GUI_TRUE@     libsciaction_binding_la-InterpreterManagement.lo
-@GUI_TRUE@am__objects_2 = libsciaction_binding_la-InterpreterManagement_wrap.lo
-am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+@GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \
+@GUI_TRUE@     libsciaction_binding_la-GiwsException.lo
+@GUI_TRUE@am__objects_3 = libsciaction_binding_la-InterpreterManagement_wrap.lo
+@GUI_TRUE@am__objects_4 =  \
+@GUI_TRUE@     libsciaction_binding_la-gw_action_binding.lo
+@GUI_TRUE@am__objects_5 = libsciaction_binding_la-sci_notify.lo
+am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+       $(am__objects_3) $(am__objects_4) $(am__objects_5)
 libsciaction_binding_la_OBJECTS =  \
        $(am_libsciaction_binding_la_OBJECTS)
-libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsciaction_binding_la_CFLAGS) $(CFLAGS) \
-       $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o $@
+libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \
+       $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -149,6 +159,15 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 SOURCES = $(libsciaction_binding_la_SOURCES)
 DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST)
 DATA = $(libsciaction_binding_la_etc_DATA) \
@@ -406,12 +425,22 @@ top_srcdir = @top_srcdir@
 # List of the c files
 @GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
 
+# List of the c++ file
+@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
+@GUI_TRUE@src/jni/Signal.hxx \
+@GUI_TRUE@src/jni/GiwsException.cpp
+
+
 # List of the gateway c files
 @GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
+@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
+@GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
 
 #### SWIG Declaration ####
 @GUI_TRUE@SWIG_WRAPPERS = src/jni/InterpreterManagement.i
+@GIWS_TRUE@BUILT_SOURCES = giws
 @SWIG_TRUE@BUILT_SOURCES = swig
+GIWS_WRAPPERS = src/jni/Signal.giws.xml
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
@@ -419,6 +448,18 @@ libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/jvm/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/output_stream/includes
+
+
+# Includes need for the compilation
+libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(srcdir)/src/jni/ \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/jvm/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
@@ -426,15 +467,19 @@ libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
 pkglib_LTLIBRARIES = libsciaction_binding.la
-libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 
 # All the sources needed by libsciaction_binding.la
-libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(CONSOLE_C_JNI_SOURCES)
+libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
-CHECK_SRC = $(ACTION_BINDING_C_SOURCES)
+CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
-libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
+                                                                       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+                                                                       $(top_builddir)/modules/jvm/libscijvm.la \
+                                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+
 #### Name of the module and the path ######
 modulename = action_binding
 
@@ -448,7 +493,7 @@ libsciaction_binding_la_etc_DATA = etc/action_binding.quit etc/action_binding.st
 
 ####´┐Żaction_binding : gateway declaration ####
 libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
-libsciaction_binding_la_sci_gateway_DATA = 
+libsciaction_binding_la_sci_gateway_DATA = sci_gateway/action_binding_gateway.xml
 
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
@@ -516,7 +561,7 @@ all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .lo .o .obj
+.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -587,10 +632,14 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -614,32 +663,81 @@ distclean-compile:
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
 libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 
 libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-dynamic_menus.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-dynamic_menus.lo `test -f 'src/c/dynamic_menus.c' || echo '$(srcdir)/'`src/c/dynamic_menus.c
 
 libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
 
 libsciaction_binding_la-InterpreterManagement_wrap.lo: src/jni/InterpreterManagement_wrap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement_wrap.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement_wrap.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/jni/InterpreterManagement_wrap.c' object='libsciaction_binding_la-InterpreterManagement_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
+
+libsciaction_binding_la-gw_action_binding.lo: sci_gateway/c/gw_action_binding.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-gw_action_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Tpo -c -o libsciaction_binding_la-gw_action_binding.lo `test -f 'sci_gateway/c/gw_action_binding.c' || echo '$(srcdir)/'`sci_gateway/c/gw_action_binding.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Tpo $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_action_binding.c' object='libsciaction_binding_la-gw_action_binding.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-gw_action_binding.lo `test -f 'sci_gateway/c/gw_action_binding.c' || echo '$(srcdir)/'`sci_gateway/c/gw_action_binding.c
+
+.cpp.o:
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@  $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libsciaction_binding_la-Signal.lo: src/jni/Signal.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-Signal.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-Signal.Tpo -c -o libsciaction_binding_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-Signal.Tpo $(DEPDIR)/libsciaction_binding_la-Signal.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/jni/Signal.cpp' object='libsciaction_binding_la-Signal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
+
+libsciaction_binding_la-GiwsException.lo: src/jni/GiwsException.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-GiwsException.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-GiwsException.Tpo -c -o libsciaction_binding_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-GiwsException.Tpo $(DEPDIR)/libsciaction_binding_la-GiwsException.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/jni/GiwsException.cpp' object='libsciaction_binding_la-GiwsException.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
+
+libsciaction_binding_la-sci_notify.lo: sci_gateway/cpp/sci_notify.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-sci_notify.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo -c -o libsciaction_binding_la-sci_notify.lo `test -f 'sci_gateway/cpp/sci_notify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_notify.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo $(DEPDIR)/libsciaction_binding_la-sci_notify.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_notify.cpp' object='libsciaction_binding_la-sci_notify.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_la-sci_notify.lo `test -f 'sci_gateway/cpp/sci_notify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_notify.cpp
 
 mostlyclean-libtool:
        -rm -f *.lo
diff --git a/scilab/modules/action_binding/includes/gw_action_binding.h b/scilab/modules/action_binding/includes/gw_action_binding.h
new file mode 100644 (file)
index 0000000..3029f00
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2010 - DIGITEO - Allan SIMON
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#ifndef __GW_ACTION_BINDING__
+#define __GW_ACTION_BINDING__
+/*--------------------------------------------------------------------------*/
+#include "dynlib_action_binding.h"
+/*--------------------------------------------------------------------------*/
+ACTION_BINDING_IMPEXP int gw_action_binding(void);
+ACTION_BINDING_IMPEXP int sci_notify(char* fname, unsigned long l);
+/*--------------------------------------------------------------------------*/
+#endif /* __GW_ACTION_BINDING__ */
+/*--------------------------------------------------------------------------*/
+
diff --git a/scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml b/scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml
new file mode 100644 (file)
index 0000000..742e55d
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+<GATEWAY name="xcos">
+<!-- =================== -->
+<!--
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ gatewayId is the position in the hashtable 'Interfaces' defined in the
+ file SCI/modules/core/src/c/callinterf.h
+
+ primitiveId is the position in the hashtable '<module>Table Tab[]' defined
+ in the file modules/<module>/sci_gateway/c/gw_<module>.c
+
+ primitiveName is the name of the Scilab function
+
+ @author Allan SIMON
+ @date DIGITEO 2010
+ ===================
+ Don't touch if you do not know what you are doing
+-->
+<!-- =================== -->
+
+<PRIMITIVE gatewayId="65" primitiveId="1" primitiveName="notify" />
+</GATEWAY>
diff --git a/scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c b/scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c
new file mode 100644 (file)
index 0000000..4f93325
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2009 - DIGITEO - Allan SIMON
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include "gw_action_binding.h"
+#include "stack-c.h"
+#include "callFunctionFromGateway.h"
+/*--------------------------------------------------------------------------*/
+static gw_generic_table Tab[] = {
+    {sci_notify, "notify"},
+};
+/*--------------------------------------------------------------------------*/
+int gw_action_binding(void)
+{
+       Rhs = Max(0, Rhs);
+
+       callFunctionFromGateway(Tab,  SIZE_CURRENT_GENERIC_TABLE(Tab));
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
@@ -14,9 +14,8 @@
 
 extern "C"
 {
-#include "gw_xcos.h"
+#include "gw_action_binding.h"
 #include "stack-c.h"
-#include "callxcos.h"
 #include "api_common.h"
 #include "api_string.h"
 #include "localization.h"
@@ -26,9 +25,9 @@ extern "C"
 #include "getScilabJavaVM.h"
 }
 /*--------------------------------------------------------------------------*/
-using namespace org_scilab_modules_graph_utils;
+using namespace org_scilab_modules_action_binding_utils;
 /*--------------------------------------------------------------------------*/
-int sci_xcosNotify(char *fname,unsigned long fname_len)
+int sci_notify(char *fname,unsigned long fname_len)
 {
        CheckRhs(1,1);
        CheckLhs(0,1);
index 70a8266..bab878c 100644 (file)
@@ -9,4 +9,11 @@ EXPORTS
  sigbas_
  StoreCommand
  StoreCommandWithFlag
+ ;
+ callFunctionFromGateway
+ putlhsvar_
+ freeArrayOfString
+ checklhs_
+ checkrhs_
+ intersci_
  
\ No newline at end of file
index 2098a52..1621bb2 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
+                               RelativePath="..\jni\GiwsException.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_action_binding.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\InterpreterManagement.c"
                                >
                        </File>
                                RelativePath="..\jni\InterpreterManagement_wrap.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\cpp\sci_notify.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\jni\Signal.cpp"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
                                >
                        </File>
                        <File
+                               RelativePath="..\jni\GiwsException.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\InterpreterManagement.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\jni\Signal.hxx"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="localization"
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.graph.utils;
+package org.scilab.modules.action_binding.highlevel;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -26,8 +26,9 @@ import java.util.concurrent.Executors;
 
 import javax.swing.SwingUtilities;
 
-import org.scilab.modules.jvm.utils.ScilabConstants;
 import org.scilab.modules.action_binding.InterpreterManagement;
+import org.scilab.modules.action_binding.utils.ActionBindingMessages;
+import org.scilab.modules.action_binding.utils.Signal;
 
 /**
  * Implements useful methods to communicate with the Scilab interpreter.
@@ -39,7 +40,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
        private static Set<String> runningTasks = Collections
                        .synchronizedSet(new HashSet<String>());
 
-       private static final String NOTIFY = ";xcosNotify(\"";
+       private static final String NOTIFY = ";notify(\"";
        private static final String CLOSE = "\");";
 
        /** This class is a static singleton, thus it must not be instantiated */
@@ -76,12 +77,12 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
 
                if (runningTasks.contains(uidDesc)) {
                        throw new InterpreterException(
-                                       ScilabGraphMessages.SCILAB_SAMECOMMAND);
+                                       ActionBindingMessages.SCILAB_SAMECOMMAND);
                }
 
                int ret = InterpreterManagement.requestScilabExec(fullCommand);
                if (ret != 0) {
-                       throw new InterpreterException(ScilabGraphMessages.SCILAB_UNABLE);
+                       throw new InterpreterException(ActionBindingMessages.SCILAB_UNABLE);
                }
                runningTasks.add(uidDesc);
                Signal.wait(uidDesc);
@@ -145,7 +146,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
 
                if (runningTasks.contains(uidDesc)) {
                        throw new InterpreterException(
-                                       ScilabGraphMessages.SCILAB_SAMECOMMAND);
+                                       ActionBindingMessages.SCILAB_SAMECOMMAND);
                }
 
                executor.submit(new Callable<Void>() {
@@ -154,7 +155,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
                                                .putCommandInScilabQueue(fullCommand);
                                if (ret != 0) {
                                        throw new InterpreterException(
-                                                       ScilabGraphMessages.SCILAB_UNABLE);
+                                                       ActionBindingMessages.SCILAB_UNABLE);
                                }
                                runningTasks.add(uidDesc);
                                Signal.wait(uidDesc);
@@ -201,7 +202,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
 
                if (runningTasks.contains(uidDesc)) {
                        throw new InterpreterException(
-                                       ScilabGraphMessages.SCILAB_SAMECOMMAND);
+                                       ActionBindingMessages.SCILAB_SAMECOMMAND);
                }
 
                executor.submit(new Callable<Void>() {
@@ -210,7 +211,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
                                                .putCommandInScilabQueue(fullCommand);
                                if (ret != 0) {
                                        throw new InterpreterException(
-                                                       ScilabGraphMessages.SCILAB_UNABLE);
+                                                       ActionBindingMessages.SCILAB_UNABLE);
                                }
                                runningTasks.add(uidDesc);
                                Signal.wait(uidDesc);
@@ -315,9 +316,9 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
                         */
                        if (object instanceof CharSequence) {
                                // We escape any CharSequence
-                               b.append(ScilabConstants.QUOTE);
+                               b.append("\"");
                                b.append(object);
-                               b.append(ScilabConstants.QUOTE);
+                               b.append("\"");
                        } else if (object instanceof char[]) {
                                // We don't escape char[]
                                b.append((char[]) object);
diff --git a/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/ActionBindingMessages.java b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/ActionBindingMessages.java
new file mode 100644 (file)
index 0000000..c59994e
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Allan SIMON
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+
+package org.scilab.modules.action_binding.utils;
+
+import org.scilab.modules.localization.Messages;
+
+
+
+public final class ActionBindingMessages {
+
+       /* Interpreter errors */
+       public static final String SCILAB_SAMECOMMAND = Messages.gettext("Same command executed again");
+       public static final String SCILAB_UNABLE = Messages.gettext("Unable to communicate with the interpreter");
+
+
+       /** This class is a static singleton, thus it must not be instantiated */
+       private ActionBindingMessages() {
+       }
+}
@@ -10,7 +10,7 @@
  *
  */
 
-package org.scilab.modules.graph.utils;
+package org.scilab.modules.action_binding.utils;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -37,7 +37,6 @@ public final class Signal {
         * @param index
         *            The uid we are waiting for.
         */
-       // FIXME: why Signal::notify is exported and not Signal::wait
        public static void wait(String index) {
                Object data = new Object();
                waiters.put(index, data);
@@ -60,8 +59,6 @@ public final class Signal {
         *            The uid to be notified. No one is waiting for the uid at time
         *            N, this method wait and retry each 100 milliseconds.
         */
-       @ScilabExported(module="xcos", filename="XcosUtils.giws.xml")
-       // FIXME: the graph module is dependent of the Xcos native libraries
        public static void notify(String index) {
                Object data = waiters.get(index);
                while (data == null) {
diff --git a/scilab/modules/action_binding/src/jni/GiwsException.cpp b/scilab/modules/action_binding/src/jni/GiwsException.cpp
new file mode 100644 (file)
index 0000000..7355cce
--- /dev/null
@@ -0,0 +1,354 @@
+/* Generated by GIWS (version 1.0.4) */
+/*
+
+Copyright 2007-2008 INRIA
+
+Author : Sylvestre Ledru & others
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+#include "GiwsException.hxx" 
+namespace GiwsException {
+
+
+
+/**
+* Each subclass of JniExcpetion should call the super constructor
+* and the setErrorMessage function to set the message.
+* @param curEnv java envirnonment where the exception occured.
+*/
+JniException::JniException(JNIEnv * curEnv) throw() : exception()
+{
+// retrieve information about the exception
+javaException = curEnv->ExceptionOccurred();
+/* Clear the Java Exception to avoid calling it again & again */
+curEnv->ExceptionClear();
+m_oJavaMessage = this->retrieveExceptionMessage(curEnv);
+m_oJavaStackTrace = this->retrieveStackTrace(curEnv);
+m_oJavaExceptionName = this->retrieveExceptionName(curEnv);
+
+// by default JniExceptions display teh stack trace
+setErrorMessage(m_oJavaMessage + "\n" + m_oJavaStackTrace);
+curEnv->DeleteLocalRef(javaException);
+closeException(curEnv);
+}
+
+JniException::~JniException(void) throw()
+{
+m_oErrorMessage.clear();
+}
+
+/**
+* @return a description of the exception
+*/
+const char * JniException::what(void) const throw()
+{
+return m_oErrorMessage.c_str();
+}
+
+/**
+* @return Java description of the exception.
+*/
+std::string JniException::getJavaDescription(void) const throw()
+{
+return m_oJavaMessage;
+}
+
+/**
+* @return Java stack trace where the exception occured.
+*/
+std::string JniException::getJavaStackTrace(void) const throw()
+{
+return m_oJavaStackTrace;
+}
+
+/**
+* Get the name of the exception (ie its class name).
+*/
+std::string JniException::getJavaExceptionName(void) const throw()
+{
+return m_oJavaExceptionName;
+}
+
+
+/**
+* Set the error message that the exception should print.
+*/
+void JniException::setErrorMessage(const std::string & errorMessage)
+{
+m_oErrorMessage = errorMessage;
+}
+
+/**
+* Get the message that the exception will print.
+*/
+std::string JniException::getErrorMessage(void) const
+{
+return m_oErrorMessage;
+}
+
+/**
+* @return error message of the exception.
+*/
+std::string JniException::retrieveExceptionMessage(JNIEnv * curEnv)
+{
+// return the result of the getLocalizedMessage method
+
+// retrieve information from the exception.
+// get method id
+jmethodID getLocalizedMessageId = curEnv->GetMethodID(curEnv->GetObjectClass(javaException),
+                                               "getLocalizedMessage",
+                                               "()Ljava/lang/String;");
+
+// call getLocalizedMessage
+jstring description = (jstring) curEnv->CallObjectMethod(javaException, getLocalizedMessageId);
+
+    if (description == NULL)
+    {
+      return "";
+    }
+
+    std::string res = convertJavaString(curEnv, description);
+
+    // release java ressources
+    curEnv->DeleteLocalRef(description);
+
+    return res;
+  }
+
+  /**
+   * @return full stack trace when the exception occured.
+   */
+  std::string JniException::retrieveStackTrace(JNIEnv * curEnv)
+  {
+
+
+    // return the result of the getStackTrace method
+
+    // retrieve information from the exception.
+    // get method id
+    // getStackTrace returns an array of StackTraceElement
+    jmethodID getStackTraceId = curEnv->GetMethodID(curEnv->GetObjectClass(javaException),
+                                                    "getStackTrace",
+                                                    "()[Ljava/lang/StackTraceElement;");
+
+    // call getStackTrace
+    jobjectArray stackTrace = (jobjectArray) curEnv->CallObjectMethod(javaException, getStackTraceId);
+
+    if (stackTrace == NULL)
+    {
+      return "";
+    }
+
+    // get length of the array
+    jsize stackTraceLength = curEnv->GetArrayLength(stackTrace);
+    std::string res = "";
+
+    // get toString methodId of StackTraceElement class
+    jclass stackTraceElementClass = curEnv->FindClass("java/lang/StackTraceElement");
+    jmethodID toStringId = curEnv->GetMethodID(stackTraceElementClass, "toString", "()Ljava/lang/String;");
+
+    for (jsize i = 0; i < stackTraceLength; i++)
+    {
+      // add the result of toString method of each element in the result
+      jobject curStackTraceElement = curEnv->GetObjectArrayElement(stackTrace, i);
+
+      // call to string on the object
+      jstring stackElementString = (jstring) curEnv->CallObjectMethod(curStackTraceElement, toStringId);
+
+      if (stackElementString == NULL)
+      {
+        curEnv->DeleteLocalRef(stackTraceElementClass);
+        curEnv->DeleteLocalRef(stackTrace);
+        curEnv->DeleteLocalRef(curStackTraceElement);
+        return res;
+      }
+
+      // add a line to res
+      res += " at " + convertJavaString(curEnv, stackElementString) + "\n";
+
+      curEnv->DeleteLocalRef(curStackTraceElement);
+      curEnv->DeleteLocalRef(stackElementString);
+    }
+
+    // release java ressources
+    curEnv->DeleteLocalRef(stackTraceElementClass);
+    curEnv->DeleteLocalRef(stackTrace);
+
+
+    return res;
+  }
+
+  /**
+   * @return string containing the name of the exception (ie its class name).
+   */
+  std::string JniException::retrieveExceptionName(JNIEnv * curEnv)
+  {
+
+    // then get its class
+    jclass exceptionClass = curEnv->GetObjectClass(javaException);
+
+    // get the Class class
+    // we could also use curEnv->FindClass("Class");
+    jclass classClass = curEnv->GetObjectClass(exceptionClass);
+
+    // get the getName method
+    jmethodID getNameId = curEnv->GetMethodID(classClass, "getName", "()Ljava/lang/String;");
+
+    // call the getName function
+    jstring javaName = (jstring) curEnv->CallObjectMethod(exceptionClass, getNameId);
+
+    if (javaName == NULL)
+    {
+      return "";
+    }
+
+    std::string res = convertJavaString(curEnv, javaName);
+
+    // release java ressources
+    curEnv->DeleteLocalRef(exceptionClass);
+    curEnv->DeleteLocalRef(classClass);
+    curEnv->DeleteLocalRef(javaName);
+
+    return res;
+  }
+
+  /**
+   * To be called when all the information about the exceptions have been
+   * retrived.
+   * Remove the exception from the environment.
+   */
+  void JniException::closeException(JNIEnv * curEnv)
+  {
+    // remove the exception from the environment
+    // Beware, the exception is no longer reachable
+    curEnv->ExceptionClear();
+  }
+
+  /**
+   * Convert a Java string (jstring) into a C++ string
+   */
+  std::string JniException::convertJavaString(JNIEnv * curEnv, jstring javaString)
+  {
+    // get a pointer on a C string
+    const char * tempString = curEnv->GetStringUTFChars(javaString, 0);
+
+    // convert the C string into a C++ string
+    std::string res(tempString);
+
+    // release pointer
+    curEnv->ReleaseStringUTFChars(javaString, tempString);
+
+    return res;
+  }
+
+
+  /**
+  * Exception that should be thrown when allocation of Java ressources from C++
+  * code fails (sur as NewDoubleArray or NewStringUTF).
+  */
+  
+  JniBadAllocException::JniBadAllocException(JNIEnv * curEnv) throw() : JniException(curEnv)
+  {
+  std::string message = "Error no more memory.";
+  setErrorMessage(message);
+  }
+  
+  JniBadAllocException::~JniBadAllocException(void) throw() {}
+
+
+  /**
+  * Exception that should be thrown when a call to a Java method
+  * using Jni throw an exception.
+  * If possible, user should try to avoid this sitution because of the loss
+  * of information.
+  */
+  
+  /**
+  * @param curEnv java environment where the exception occured.
+  */
+  JniCallMethodException::JniCallMethodException(JNIEnv * curEnv) throw() : JniException(curEnv)
+  {
+  std::string errorMessage = "Exception when calling Java method : ";
+  errorMessage += getJavaDescription() + "\n" + getJavaStackTrace();
+  errorMessage += what();
+  setErrorMessage(errorMessage);
+  }
+  
+  JniCallMethodException::~JniCallMethodException(void) throw() {}
+  /**
+  * @param className name of the class which haven't been found
+  */
+  JniClassNotFoundException::JniClassNotFoundException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
+  {
+std::string errorMessage = "Could not get the Class " + className + ".";
+setErrorMessage(errorMessage);
+  }
+
+  JniClassNotFoundException::~JniClassNotFoundException(void) throw() {}
+
+  /**
+   * @param className name of the method which haven't been found
+   */
+  JniMethodNotFoundException::JniMethodNotFoundException(JNIEnv * curEnv, const std::string & methodName) throw() : JniException(curEnv)
+  {
+std::string errorMessage = "Could not access to the method " + methodName + ".";
+setErrorMessage(errorMessage);
+  }
+
+  JniMethodNotFoundException::~JniMethodNotFoundException(void) throw() {}
+  
+  /**
+   * @param curEnv java envirnonment where the exception occured.
+   */
+  JniObjectCreationException::JniObjectCreationException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
+  {
+std::string errorMessage = "Could not instantiate the object " + className + ".";
+setErrorMessage(errorMessage);
+  }
+
+  JniObjectCreationException::~JniObjectCreationException(void) throw() {}
+
+  /**
+   * @param curEnv java envirnonment where the exception occured.
+   */
+  JniMonitorException::JniMonitorException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
+  {
+std::string errorMessage = "Error in the access (Enter or exit) or a Java env monitor of class " + className + ".";
+setErrorMessage(errorMessage);
+  }
+
+  JniMonitorException::~JniMonitorException(void) throw() {}
+
+
+
+}
+
diff --git a/scilab/modules/action_binding/src/jni/GiwsException.hxx b/scilab/modules/action_binding/src/jni/GiwsException.hxx
new file mode 100644 (file)
index 0000000..cdde15a
--- /dev/null
@@ -0,0 +1,243 @@
+/* Generated by GIWS (version 1.0.4) */
+/*
+
+Copyright 2007-2008 INRIA
+
+Author : Sylvestre Ledru & others
+
+This software is a computer program whose purpose is to hide the complexity
+of accessing Java objects/methods from C++ code.
+
+This software is governed by the CeCILL-B license under French law and
+abiding by the rules of distribution of free software.  You can  use, 
+modify and/ or redistribute the software under the terms of the CeCILL-B
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info". 
+
+As a counterpart to the access to the source code and  rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty  and the software's author,  the holder of the
+economic rights,  and the successive licensors  have only  limited
+liability. 
+
+In this respect, the user's attention is drawn to the risks associated
+with loading,  using,  modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean  that it is complicated to manipulate,  and  that  also
+therefore means  that it is reserved for developers  and  experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or 
+data to be ensured and,  more generally, to use and operate it in the 
+same conditions as regards security. 
+
+The fact that you are presently reading this means that you have had
+knowledge of the CeCILL-B license and that you accept its terms.
+*/
+
+
+#ifndef __GIWSEXCEPTION__
+#define __GIWSEXCEPTION__
+#include <iostream>
+#include <string>
+#include <string.h>
+#include <stdlib.h>
+#include <jni.h>
+#include <exception>
+
+namespace GiwsException {
+
+
+/**
+* Parent class for exceptions which may occure in JNI code.
+*/
+class JniException : public std::exception
+{
+
+/** Error message to display */
+std::string m_oErrorMessage;
+
+/** Java description of the exception*/
+std::string m_oJavaMessage;
+
+/** Java stackTrace when the exception occured */
+std::string m_oJavaStackTrace;
+
+/** Name of the exception (ie class name).*/
+std::string m_oJavaExceptionName;
+
+/** The exception itself ... we store as a member otherwise JNI
+complains about 'WARNING in native method: JNI call made with
+exception pending' */
+jthrowable javaException;
+
+public:
+
+/**
+* Each subclass of JniExcpetion should call the super constructor
+* and the setErrorMessage function to set the message.
+* @param curEnv java environment where the exception occured.
+*/
+JniException(JNIEnv * curEnv) throw() ;
+
+virtual ~JniException(void) throw();
+
+/**
+* @return a description of the exception
+*/
+virtual const char * what(void) const throw();
+
+/**
+* @return Java description of the exception.
+*/
+std::string getJavaDescription(void) const throw();
+
+/**
+* @return Java stack trace where the exception occured.
+*/
+std::string getJavaStackTrace(void) const throw();
+
+/**
+* Get the name of the exception (ie its class name).
+*/
+std::string getJavaExceptionName(void) const throw();
+
+protected:
+
+/**
+* Set the error message that the exception should print.
+*/
+void setErrorMessage(const std::string & errorMessage);
+
+/**
+* Get the message that the exception will print.
+*/
+std::string getErrorMessage(void) const;
+
+private:
+  /**
+* @return error message of the exception.
+*/
+std::string retrieveExceptionMessage(JNIEnv * curEnv);
+/**
+* @return full stack trace when the exception occured.
+*/
+std::string retrieveStackTrace(JNIEnv * curEnv);
+
+/**
+* @return string containing the name of the exception (ie its class name).
+*/
+std::string retrieveExceptionName(JNIEnv * curEnv);
+/**
+* To be called when all the information about the exceptions have been
+* retrived.
+* Remove the exception from the environment.
+*/
+void closeException(JNIEnv * curEnv);
+
+/**
+* Convert a Java string (jstring) into a C++ string
+*/
+std::string convertJavaString(JNIEnv * curEnv, jstring javaString);
+};
+
+/**
+* Exception that should be thrown when allocation of Java ressources from C++
+* code fails (sur as NewDoubleArray or NewStringUTF).
+*/
+class JniBadAllocException : public JniException
+{
+public:
+
+JniBadAllocException(JNIEnv * curEnv) throw();
+virtual ~JniBadAllocException(void) throw();
+};
+
+/**
+* Exception that should be thrown when a call to a Java method
+* using Jni throw an exception.
+* If possible, user should try to avoid this sitution because of the loss
+* of information.
+*/
+class JniCallMethodException : public JniException
+{
+public:
+
+  /**
+   * @param curEnv java envirnonment where the exception occured.
+   */
+  JniCallMethodException(JNIEnv * curEnv) throw();
+
+  virtual ~JniCallMethodException(void) throw();
+};
+
+/**
+* Exception that should be thrown when Jni code could not find a Java class
+*/
+class JniClassNotFoundException : public JniException
+{
+public:
+
+/**
+* @param className name of the class which haven't been found
+*/
+JniClassNotFoundException(JNIEnv * curEnv, const std::string & className) throw();
+
+virtual ~JniClassNotFoundException(void) throw();
+
+};
+
+/**
+* Exception that should be thrown when Jni code could not find a Java method
+*/
+class JniMethodNotFoundException : public JniException
+{
+public:
+
+/**
+* @param className name of the method which haven't been found
+*/
+JniMethodNotFoundException(JNIEnv * curEnv, const std::string & methodName) throw();
+virtual ~JniMethodNotFoundException(void) throw();
+
+};
+
+/**
+* Exception that should be thrown when a call to a Java method
+* using Jni throw an exception.
+* If possible, user should try to avoid this sitution because of the loss
+* of information.
+*/
+class JniObjectCreationException : public JniException
+{
+public:
+
+/**
+* @param curEnv java envirnonment where the exception occured.
+*/
+JniObjectCreationException(JNIEnv * curEnv, const std::string & className) throw();
+virtual ~JniObjectCreationException(void) throw();
+
+};
+
+
+/**
+* Exception that should be thrown when a call to the Java monitor
+* failed
+*/
+class JniMonitorException : public JniException
+{
+public:
+
+/**
+* @param curEnv java envirnonment where the exception occured.
+*/
+JniMonitorException(JNIEnv * curEnv, const std::string & className) throw();
+virtual ~JniMonitorException(void) throw();
+
+};
+
+
+}
+#endif
+
similarity index 75%
rename from scilab/modules/xcos/src/jni/Signal.cpp
rename to scilab/modules/action_binding/src/jni/Signal.cpp
index 62b43ac..bd34be1 100644 (file)
@@ -1,5 +1,5 @@
 #include "Signal.hxx"
-/* Generated by GIWS (version 1.1.1) */
+/* Generated by GIWS (version 1.1.0) */
 /*
 
 Copyright 2007-2008 INRIA
@@ -39,7 +39,7 @@ The fact that you are presently reading this means that you have had
 knowledge of the CeCILL-B license and that you accept its terms.
 */
 
-namespace org_scilab_modules_graph_utils {
+namespace org_scilab_modules_action_binding_utils {
 
 // Returns the current env
 
@@ -71,7 +71,9 @@ JNIEnv * curEnv = getCurrentEnv();
 
 localClass = curEnv->FindClass( this->className().c_str() ) ;
 if (localClass == NULL) {
-  throw GiwsException::JniClassNotFoundException(curEnv, this->className());
+std::cerr << "Could not get the Class " << this->className() <<  std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
 
 this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
@@ -80,23 +82,31 @@ this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 curEnv->DeleteLocalRef(localClass);
 
 if (this->instanceClass == NULL) {
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+std::cerr << "Could not create a Global Ref of " << this->className() <<  std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
 
 
 constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
 if(constructObject == NULL){
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+std::cerr << "Could not retrieve the constructor of the class " << this->className() << " with the profile : " << construct << param << std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
 
 localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
 if(localInstance == NULL){
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+std::cerr << "Could not instantiate the object " << this->className() << " with the constructor : " << construct << param << std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
  
 this->instance = curEnv->NewGlobalRef(localInstance) ;
 if(this->instance == NULL){
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+std::cerr << "Could not create a new global ref of " << this->className() << std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
 /* localInstance not needed anymore */
 curEnv->DeleteLocalRef(localInstance);
@@ -117,12 +127,18 @@ jclass localClass = curEnv->GetObjectClass(JObj);
         curEnv->DeleteLocalRef(localClass);
 
         if (this->instanceClass == NULL) {
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+
+std::cerr << "Could not create a Global Ref of " << this->className() <<  std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
         }
 
         this->instance = curEnv->NewGlobalRef(JObj) ;
         if(this->instance == NULL){
-throw GiwsException::JniObjectCreationException(curEnv, this->className());
+
+std::cerr << "Could not create a new global ref of " << this->className() << std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
         }
         /* Methods ID set to NULL */
         voidnotifyjstringID=NULL; 
@@ -134,13 +150,17 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
 
 void Signal::synchronize() {
 if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
-throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
+std::cerr << "Fail to enter monitor." << std::endl;
+exit(EXIT_FAILURE);
+
 }
 }
 
 void Signal::endSynchronize() {
 if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
-throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
+
+std::cerr << "Fail to exit monitor." << std::endl;
+exit(EXIT_FAILURE);
 }
 }
 // Method(s)
@@ -153,14 +173,17 @@ jclass cls = curEnv->FindClass( className().c_str() );
 
 jmethodID voidnotifyjstringID = curEnv->GetStaticMethodID(cls, "notify", "(Ljava/lang/String;)V" ) ;
 if (voidnotifyjstringID == NULL) {
-throw GiwsException::JniMethodNotFoundException(curEnv, "notify");
+std::cerr << "Could not access to the method " << "notify" << std::endl;
+curEnv->ExceptionDescribe();
+exit(EXIT_FAILURE);
 }
 
 jstring ID_ = curEnv->NewStringUTF( ID );
 
                          curEnv->CallStaticVoidMethod(cls, voidnotifyjstringID ,ID_);if (curEnv->ExceptionCheck()) {
-throw GiwsException::JniCallMethodException(curEnv);
+curEnv->ExceptionDescribe() ;
 }
+
 }
 
 }
@@ -1,4 +1,4 @@
-<package name="org.scilab.modules.graph.utils">
+<package name="org.scilab.modules.action_binding.utils">
   <object name="Signal">  
     <method name="notify" returnType="void" modifier="static">
       <parameter name="ID" type="String"/>
similarity index 92%
rename from scilab/modules/xcos/src/jni/Signal.hxx
rename to scilab/modules/action_binding/src/jni/Signal.hxx
index cb99037..3bc3b90 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by GIWS (version 1.1.1) */
+/* Generated by GIWS (version 1.1.0) */
 /*
 
 Copyright 2007-2008 INRIA
@@ -39,16 +39,14 @@ knowledge of the CeCILL-B license and that you accept its terms.
 */
 
 
-#ifndef __ORG_SCILAB_MODULES_GRAPH_UTILS_SIGNAL__
-#define __ORG_SCILAB_MODULES_GRAPH_UTILS_SIGNAL__
+#ifndef __ORG_SCILAB_MODULES_ACTION_BINDING_UTILS_SIGNAL__
+#define __ORG_SCILAB_MODULES_ACTION_BINDING_UTILS_SIGNAL__
 #include <iostream>
 #include <string>
 #include <string.h>
 #include <stdlib.h>
 #include <jni.h>
 
-#include "GiwsException.hxx"
-
 #ifndef _MSC_VER /* Defined anyway with Visual */
 #if !defined(byte)
 typedef signed char byte;
@@ -57,7 +55,7 @@ typedef signed char byte;
 #endif
 #endif
 
-namespace org_scilab_modules_graph_utils {
+namespace org_scilab_modules_action_binding_utils {
 
 class Signal {
 private:
@@ -117,7 +115,7 @@ static void notify(JavaVM * jvm_, char * ID);
                         
                 static const std::string className()
                 {
-                return "org/scilab/modules/graph/utils/Signal";
+                return "org/scilab/modules/action_binding/utils/Signal";
                 }
                 
 };
index 2cdd330..f970e2d 100644 (file)
@@ -86,6 +86,7 @@
 /* 62 */                                               #include "dynamic_gateways.h" /* hdf5 */
 /* 63 */                                               #include "dynamic_gateways.h" /* xpad */
 /* 64 */                                               #include "dynamic_gateways.h" /* xcos */
+/* 65 */                        #include "../../action_binding/includes/gw_action_binding.h"
 
 /*-------------------------------------
  * long jump to stop interface computation
index 455100b..f87de16 100644 (file)
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
  ** Watch out the positions are crutial !!!
  ** @TODO : Make this less crappy...
  **/
-#define INTERFACES_MAX 64
+#define INTERFACES_MAX 65
 static OpTab Interfaces[INTERFACES_MAX] = {
     /* 01  */ {gw_user}, /* free position may be used */
        /* 02  */ {gw_linear_algebra},
@@ -98,7 +98,8 @@ static OpTab Interfaces[INTERFACES_MAX] = {
        /* 61  */ {gw_call_scilab},
        /* 62  */ {gw_dynamic_hdf5},
        /* 63  */ {gw_dynamic_xpad},
-       /* 64  */ {gw_dynamic_xcos}
+       /* 64  */ {gw_dynamic_xcos},
+    /* 65  */ {gw_action_binding}
 };
 /*--------------------------------------------------------------------------*/
 static int sig_ok = 0;
index 5c8b07b..d2d85a4 100644 (file)
@@ -33,11 +33,9 @@ public final class ScilabGraphMessages {
        public static final String INVERT_SELECTION = Messages.gettext("Invert selection");
        public static final String UNTITLED = Messages.gettext("Untitled");
 
-       /* Interpreter errors */
-    public static final String SCILAB_SAMECOMMAND = Messages.gettext("Same command executed again");
-    public static final String SCILAB_UNABLE = Messages.gettext("Unable to communicate with the interpreter");
-       
+
        /** This class is a static singleton, thus it must not be instantiated */
        private ScilabGraphMessages() {
        }
+       
 }
index ef24733..53367d5 100644 (file)
@@ -35,12 +35,9 @@ XCOS_C_SOURCES =
 XCOS_CPP_SOURCES =     src/cpp/callxcos.cpp \
                        src/jni/Xcos.cpp \
                        src/jni/Xcos.hxx \
-                       src/jni/Signal.cpp \
-                       src/jni/Signal.hxx \
                        src/jni/GiwsException.cpp
 
-GIWS_WRAPPERS = src/jni/Xcos.giws.xml \
-src/jni/XcosUtils.giws.xml
+GIWS_WRAPPERS = src/jni/Xcos.giws.xml
 
 if GIWS
 BUILT_SOURCES=giws
@@ -51,7 +48,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_xcos.c
 
 GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_Xcos.cpp \
-       sci_gateway/cpp/sci_xcosNotify.cpp \
        sci_gateway/cpp/sci_warnBlockByUID.cpp \
        sci_gateway/cpp/sci_closeXcosFromScilab.cpp \
        sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \
index d15463d..2d3e4b5 100644 (file)
@@ -134,14 +134,13 @@ libscixcos_la_DEPENDENCIES =  \
 am__objects_2 =
 am__objects_3 = libscixcos_la-gw_xcos.lo
 am__objects_4 = libscixcos_la-sci_Xcos.lo \
-       libscixcos_la-sci_xcosNotify.lo \
        libscixcos_la-sci_warnBlockByUID.lo \
        libscixcos_la-sci_closeXcosFromScilab.lo \
        libscixcos_la-sci_xcosDiagramToHDF5.lo \
        libscixcos_la-sci_xcosDiagramOpen.lo \
        libscixcos_la-sci_xcosDiagramClose.lo
 am__objects_5 = libscixcos_la-callxcos.lo libscixcos_la-Xcos.lo \
-       libscixcos_la-Signal.lo libscixcos_la-GiwsException.lo
+       libscixcos_la-GiwsException.lo
 am_libscixcos_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
        $(am__objects_4) $(am__objects_5)
 libscixcos_la_OBJECTS = $(am_libscixcos_la_OBJECTS)
@@ -443,18 +442,13 @@ XCOS_C_SOURCES =
 XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \
                        src/jni/Xcos.cpp \
                        src/jni/Xcos.hxx \
-                       src/jni/Signal.cpp \
-                       src/jni/Signal.hxx \
                        src/jni/GiwsException.cpp
 
-GIWS_WRAPPERS = src/jni/Xcos.giws.xml \
-src/jni/XcosUtils.giws.xml
-
+GIWS_WRAPPERS = src/jni/Xcos.giws.xml
 @GIWS_TRUE@BUILT_SOURCES = giws
 GATEWAY_C_SOURCES = sci_gateway/c/gw_xcos.c
 GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_Xcos.cpp \
-       sci_gateway/cpp/sci_xcosNotify.cpp \
        sci_gateway/cpp/sci_warnBlockByUID.cpp \
        sci_gateway/cpp/sci_closeXcosFromScilab.cpp \
        sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \
@@ -921,7 +915,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_disable_la-noxcos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-GiwsException.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-Signal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-Xcos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-callxcos.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-gw_xcos.Plo@am__quote@
@@ -931,7 +924,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramClose.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramOpen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramToHDF5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosNotify.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -996,13 +988,6 @@ libscixcos_la-sci_Xcos.lo: sci_gateway/cpp/sci_Xcos.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-sci_Xcos.lo `test -f 'sci_gateway/cpp/sci_Xcos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_Xcos.cpp
 
-libscixcos_la-sci_xcosNotify.lo: sci_gateway/cpp/sci_xcosNotify.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-sci_xcosNotify.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-sci_xcosNotify.Tpo -c -o libscixcos_la-sci_xcosNotify.lo `test -f 'sci_gateway/cpp/sci_xcosNotify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xcosNotify.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixcos_la-sci_xcosNotify.Tpo $(DEPDIR)/libscixcos_la-sci_xcosNotify.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_xcosNotify.cpp' object='libscixcos_la-sci_xcosNotify.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-sci_xcosNotify.lo `test -f 'sci_gateway/cpp/sci_xcosNotify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_xcosNotify.cpp
-
 libscixcos_la-sci_warnBlockByUID.lo: sci_gateway/cpp/sci_warnBlockByUID.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-sci_warnBlockByUID.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-sci_warnBlockByUID.Tpo -c -o libscixcos_la-sci_warnBlockByUID.lo `test -f 'sci_gateway/cpp/sci_warnBlockByUID.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_warnBlockByUID.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixcos_la-sci_warnBlockByUID.Tpo $(DEPDIR)/libscixcos_la-sci_warnBlockByUID.Plo
@@ -1052,13 +1037,6 @@ libscixcos_la-Xcos.lo: src/jni/Xcos.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-Xcos.lo `test -f 'src/jni/Xcos.cpp' || echo '$(srcdir)/'`src/jni/Xcos.cpp
 
-libscixcos_la-Signal.lo: src/jni/Signal.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-Signal.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-Signal.Tpo -c -o libscixcos_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixcos_la-Signal.Tpo $(DEPDIR)/libscixcos_la-Signal.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/jni/Signal.cpp' object='libscixcos_la-Signal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscixcos_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
-
 libscixcos_la-GiwsException.lo: src/jni/GiwsException.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscixcos_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscixcos_la-GiwsException.lo -MD -MP -MF $(DEPDIR)/libscixcos_la-GiwsException.Tpo -c -o libscixcos_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscixcos_la-GiwsException.Tpo $(DEPDIR)/libscixcos_la-GiwsException.Plo
index 245cd1e..fe787d6 100644 (file)
@@ -24,7 +24,6 @@ static BOOL loadedDep = FALSE;
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[] = {
   {sci_Xcos, "xcos"},
-  {sci_xcosNotify, "xcosNotify"},
   {sci_warnBlockByUID, "warnBlockByUID"},
   {sci_closeXcosFromScilab, "closeXcos"},
   {sci_xcosDiagramToHDF5, "xcosDiagramToHDF5"},
index 3736337..ebfd4b6 100644 (file)
 <!-- =================== -->
 
 <PRIMITIVE gatewayId="64" primitiveId="1" primitiveName="xcos" />
-<PRIMITIVE gatewayId="64" primitiveId="2" primitiveName="xcosNotify" />
-<PRIMITIVE gatewayId="64" primitiveId="3" primitiveName="warnBlockByUID" />
-<PRIMITIVE gatewayId="64" primitiveId="4" primitiveName="closeXcos" />
-<PRIMITIVE gatewayId="64" primitiveId="5" primitiveName="xcosDiagramToHDF5" />
-<PRIMITIVE gatewayId="64" primitiveId="6" primitiveName="xcosDiagramOpen" />
-<PRIMITIVE gatewayId="64" primitiveId="7" primitiveName="xcosDiagramClose" />
+<PRIMITIVE gatewayId="64" primitiveId="2" primitiveName="warnBlockByUID" />
+<PRIMITIVE gatewayId="64" primitiveId="3" primitiveName="closeXcos" />
+<PRIMITIVE gatewayId="64" primitiveId="4" primitiveName="xcosDiagramToHDF5" />
+<PRIMITIVE gatewayId="64" primitiveId="5" primitiveName="xcosDiagramOpen" />
+<PRIMITIVE gatewayId="64" primitiveId="6" primitiveName="xcosDiagramClose" />
 </GATEWAY>
index 4bf89a9..10592dc 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\cpp\sci_xcosNotify.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\jni\Signal.cpp"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\jni\Xcos.cpp"
                                >
                        </File>
index 56ce84a..7f75fbe 100644 (file)
@@ -24,8 +24,8 @@ import java.util.Map;
 import javax.swing.SwingUtilities;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.utils.ScilabExported;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.BlockFactory;
 import org.scilab.modules.xcos.block.SuperBlock;
index 4023e0c..def0c2e 100644 (file)
@@ -13,8 +13,8 @@
 
 package org.scilab.modules.xcos.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec;
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 import static org.scilab.modules.xcos.utils.FileUtils.delete;
 
 
@@ -24,8 +24,8 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.SuperBlock;
index 8e42557..2a4e382 100644 (file)
@@ -13,7 +13,7 @@
 
 package org.scilab.modules.xcos.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 import static org.scilab.modules.xcos.utils.FileUtils.delete;
 
 import java.awt.event.ActionEvent;
@@ -24,9 +24,9 @@ import java.io.IOException;
 import javax.swing.SwingWorker;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.FileUtils;
index 11b9003..ff7a33d 100644 (file)
 
 package org.scilab.modules.xcos.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
index 82569ad..c9b4eae 100644 (file)
@@ -11,8 +11,8 @@
  */
 package org.scilab.modules.xcos.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec;
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -20,9 +20,9 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
index 46f218c..b7bc002 100644 (file)
@@ -14,8 +14,8 @@
 
 package org.scilab.modules.xcos.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec;
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -24,10 +24,10 @@ import java.io.IOException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.actions.base.GraphActionManager;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
index d397ff4..5eddb05 100644 (file)
@@ -16,10 +16,10 @@ package org.scilab.modules.xcos.actions;
 
 import java.awt.event.ActionEvent;
 
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
 import org.scilab.modules.graph.actions.base.GraphActionManager;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.graph.XcosDiagram;
index 09b17b8..ad0ca8c 100644 (file)
@@ -18,10 +18,10 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.OneBlockDependantAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.xcos.graph.XcosDiagram;
 import org.scilab.modules.xcos.utils.FileUtils;
index f74a9e6..6efc9ae 100644 (file)
@@ -15,9 +15,9 @@ package org.scilab.modules.xcos.actions;
 
 import java.awt.event.ActionEvent;
 
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.utils.XcosMessages;
index e1859a2..f926781 100644 (file)
@@ -16,9 +16,9 @@ package org.scilab.modules.xcos.actions;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.DefaultAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.utils.XcosMessages;
index 7fa31fc..33d6c64 100644 (file)
@@ -35,8 +35,8 @@ import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.xcos.actions.DebugLevelAction;
 import org.scilab.modules.xcos.actions.DebugLevelAction.DebugLevel;
 import org.scilab.modules.xcos.graph.ScicosParameters;
index 8dda0bd..cb0fb5a 100644 (file)
@@ -27,15 +27,15 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.ScilabGraphUniqueObject;
 import org.scilab.modules.graph.actions.CopyAction;
 import org.scilab.modules.graph.actions.CutAction;
 import org.scilab.modules.graph.actions.DeleteAction;
 import org.scilab.modules.graph.actions.base.DefaultAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.graph.utils.StyleMap;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
 import org.scilab.modules.gui.contextmenu.ContextMenu;
 import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
index 6cce0c3..35a517d 100644 (file)
@@ -15,9 +15,9 @@ package org.scilab.modules.xcos.block.actions;
 
 import java.awt.event.ActionEvent;
 
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.xcos.block.BasicBlock;
index 3cb0710..a6000e2 100644 (file)
 
 package org.scilab.modules.xcos.block.actions;
 
-import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall;
+import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
 
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.logging.LogFactory;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.graph.ScilabGraph;
 import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.xcos.block.BasicBlock;
 import org.scilab.modules.xcos.block.SplitBlock;
index 2a52057..5171e5c 100644 (file)
@@ -15,8 +15,8 @@ package org.scilab.modules.xcos.block.io;
 import java.io.File;
 import java.io.IOException;
 
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.types.scilabTypes.ScilabDouble;
 import org.scilab.modules.types.scilabTypes.ScilabList;
 import org.scilab.modules.xcos.block.BasicBlock;
index c9c3cb0..ed32610 100644 (file)
@@ -41,6 +41,9 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.jvm.utils.ScilabConstants;
 
 import org.scilab.modules.graph.ScilabCanvas;
@@ -52,8 +55,6 @@ import org.scilab.modules.graph.actions.UndoAction;
 import org.scilab.modules.graph.actions.ZoomInAction;
 import org.scilab.modules.graph.actions.ZoomOutAction;
 import org.scilab.modules.graph.utils.ScilabExported;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
 import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
 import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
index 14c8e9b..fd4e37c 100644 (file)
@@ -19,8 +19,8 @@ import java.util.List;
 
 import javax.swing.SwingUtilities;
 
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
 import org.scilab.modules.gui.contextmenu.ContextMenu;
 import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
index a1f6cd6..f53f326 100644 (file)
@@ -18,8 +18,8 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.commons.logging.LogFactory;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
-import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
+import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
 
 /**
  * All the filetype recognized by Xcos.