summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan SIMON <allan.simon@scilab.org>2010-05-06 14:40:56 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-05-20 14:39:41 +0200
commitff17f5ec694e3d00662571e1f167d006644aa4e7 (patch)
treea96c3cd85bec7bddf0c4799a118a833a293d0bb5 /scilab/modules
parent91f3c686e4440842f629b9016049cf9506397622 (diff)
downloadscilab-ff17f5ec694e3d00662571e1f167d006644aa4e7.zip
scilab-ff17f5ec694e3d00662571e1f167d006644aa4e7.tar.gz
moved ScilabInterpreterManagement and related Classes into action_binding
Change-Id: Ia1e46e0db2355f3c7c90fd7f2c10cdadb8e0f600
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/action_binding/Makefile.am40
-rw-r--r--scilab/modules/action_binding/Makefile.in142
-rw-r--r--scilab/modules/action_binding/includes/gw_action_binding.h23
-rw-r--r--scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml27
-rw-r--r--scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c28
-rw-r--r--scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp (renamed from scilab/modules/xcos/sci_gateway/cpp/sci_xcosNotify.cpp)7
-rw-r--r--scilab/modules/action_binding/src/c/LibScilab_Import.def7
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcproj32
-rw-r--r--scilab/modules/action_binding/src/c/libjvm_Import.def1
-rw-r--r--scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/highlevel/ScilabInterpreterManagement.java (renamed from scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabInterpreterManagement.java)23
-rw-r--r--scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/ActionBindingMessages.java30
-rw-r--r--scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/Signal.java (renamed from scilab/modules/graph/src/java/org/scilab/modules/graph/utils/Signal.java)5
-rw-r--r--scilab/modules/action_binding/src/jni/GiwsException.cpp354
-rw-r--r--scilab/modules/action_binding/src/jni/GiwsException.hxx243
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.cpp (renamed from scilab/modules/xcos/src/jni/Signal.cpp)49
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.giws.xml (renamed from scilab/modules/xcos/src/jni/XcosUtils.giws.xml)2
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.hxx (renamed from scilab/modules/xcos/src/jni/Signal.hxx)12
-rw-r--r--scilab/modules/core/includes/callinterf.h1
-rw-r--r--scilab/modules/core/src/c/callinterf.c5
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java6
-rw-r--r--scilab/modules/xcos/Makefile.am6
-rw-r--r--scilab/modules/xcos/Makefile.in26
-rw-r--r--scilab/modules/xcos/sci_gateway/c/gw_xcos.c1
-rw-r--r--scilab/modules/xcos/sci_gateway/xcos_gateway.xml11
-rw-r--r--scilab/modules/xcos/src/c/xcos.vcproj8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java6
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java5
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java4
43 files changed, 1006 insertions, 158 deletions
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index 30ac3f39..9c45824 100644
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -15,9 +15,18 @@ USEANT=1
15# List of the c files 15# List of the c files
16ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c 16ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
17 17
18# List of the c++ file
19ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
20src/jni/Signal.hxx \
21src/jni/GiwsException.cpp
22
18# List of the gateway c files 23# List of the gateway c files
19CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c 24CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
20 25
26GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
27
28GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
29
21#### SWIG Declaration #### 30#### SWIG Declaration ####
22SWIG_WRAPPERS = src/jni/InterpreterManagement.i 31SWIG_WRAPPERS = src/jni/InterpreterManagement.i
23else 32else
@@ -30,6 +39,12 @@ if SWIG
30BUILT_SOURCES=swig 39BUILT_SOURCES=swig
31endif 40endif
32 41
42GIWS_WRAPPERS = src/jni/Signal.giws.xml
43
44if GIWS
45BUILT_SOURCES=giws
46endif
47
33 48
34# Includes need for the compilation 49# Includes need for the compilation
35libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \ 50libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
@@ -37,6 +52,17 @@ libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
37-I$(srcdir)/src/c/ \ 52-I$(srcdir)/src/c/ \
38-I$(srcdir)/src/jni/ \ 53-I$(srcdir)/src/jni/ \
39-I$(top_srcdir)/libs/MALLOC/includes/ \ 54-I$(top_srcdir)/libs/MALLOC/includes/ \
55-I$(top_srcdir)/modules/jvm/includes/ \
56-I$(top_srcdir)/modules/api_scilab/includes \
57-I$(top_srcdir)/modules/output_stream/includes
58
59# Includes need for the compilation
60libsciaction_binding_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
61-I$(srcdir)/includes/ \
62-I$(srcdir)/src/c/ \
63-I$(srcdir)/src/jni/ \
64-I$(top_srcdir)/libs/MALLOC/includes/ \
65-I$(top_srcdir)/modules/jvm/includes/ \
40-I$(top_srcdir)/modules/api_scilab/includes \ 66-I$(top_srcdir)/modules/api_scilab/includes \
41-I$(top_srcdir)/modules/output_stream/includes 67-I$(top_srcdir)/modules/output_stream/includes
42 68
@@ -44,18 +70,21 @@ libsciaction_binding_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
44# the system) 70# the system)
45pkglib_LTLIBRARIES = libsciaction_binding.la 71pkglib_LTLIBRARIES = libsciaction_binding.la
46 72
47libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 73libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
48 74
49# All the sources needed by libsciaction_binding.la 75# All the sources needed by libsciaction_binding.la
50libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(CONSOLE_C_JNI_SOURCES) 76libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
51 77
52# For the code check (splint) 78# For the code check (splint)
53CHECK_SRC= $(ACTION_BINDING_C_SOURCES) 79CHECK_SRC= $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
54INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS) 80INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
55 81
56## Libraries necessary 82## Libraries necessary
57## Change to include other Scilab modules/lib 83## Change to include other Scilab modules/lib
58libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 84libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
85 $(top_builddir)/libs/MALLOC/libscimalloc.la \
86 $(top_builddir)/modules/jvm/libscijvm.la \
87 $(top_builddir)/modules/output_stream/libscioutput_stream.la
59#### Name of the module and the path ###### 88#### Name of the module and the path ######
60modulename=action_binding 89modulename=action_binding
61 90
@@ -67,9 +96,10 @@ libsciaction_binding_la_root_DATA = changelog.txt license.txt readme.txt version
67libsciaction_binding_la_etcdir = $(mydatadir)/etc 96libsciaction_binding_la_etcdir = $(mydatadir)/etc
68libsciaction_binding_la_etc_DATA = etc/action_binding.quit etc/action_binding.start 97libsciaction_binding_la_etc_DATA = etc/action_binding.quit etc/action_binding.start
69 98
99
70####�action_binding : gateway declaration #### 100####�action_binding : gateway declaration ####
71libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway 101libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
72libsciaction_binding_la_sci_gateway_DATA = 102libsciaction_binding_la_sci_gateway_DATA = sci_gateway/action_binding_gateway.xml
73 103
74# Provides macros compilation, Java compilation, cleaning 104# Provides macros compilation, Java compilation, cleaning
75# If you want Makefile to call ant, added USEANT=1 105# If you want Makefile to call ant, added USEANT=1
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 5ef3853..2a86de2 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -118,24 +118,34 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
118libsciaction_binding_la_DEPENDENCIES = \ 118libsciaction_binding_la_DEPENDENCIES = \
119 $(top_builddir)/modules/core/libscicore.la \ 119 $(top_builddir)/modules/core/libscicore.la \
120 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 120 $(top_builddir)/libs/MALLOC/libscimalloc.la \
121 $(top_builddir)/modules/jvm/libscijvm.la \
121 $(top_builddir)/modules/output_stream/libscioutput_stream.la 122 $(top_builddir)/modules/output_stream/libscioutput_stream.la
122am__libsciaction_binding_la_SOURCES_DIST = \ 123am__libsciaction_binding_la_SOURCES_DIST = \
123 src/noaction_binding/noaction_binding.c src/c/dynamic_menus.c \ 124 src/noaction_binding/noaction_binding.c src/c/dynamic_menus.c \
124 src/c/InterpreterManagement.c \ 125 src/c/InterpreterManagement.c src/jni/Signal.cpp \
125 src/jni/InterpreterManagement_wrap.c 126 src/jni/Signal.hxx src/jni/GiwsException.cpp \
127 src/jni/InterpreterManagement_wrap.c \
128 sci_gateway/c/gw_action_binding.c \
129 sci_gateway/cpp/sci_notify.cpp
126@GUI_FALSE@am__objects_1 = \ 130@GUI_FALSE@am__objects_1 = \
127@GUI_FALSE@ libsciaction_binding_la-noaction_binding.lo \ 131@GUI_FALSE@ libsciaction_binding_la-noaction_binding.lo \
128@GUI_FALSE@ libsciaction_binding_la-dynamic_menus.lo 132@GUI_FALSE@ libsciaction_binding_la-dynamic_menus.lo
129@GUI_TRUE@am__objects_1 = \ 133@GUI_TRUE@am__objects_1 = \
130@GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo 134@GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo
131@GUI_TRUE@am__objects_2 = libsciaction_binding_la-InterpreterManagement_wrap.lo 135@GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \
132am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2) 136@GUI_TRUE@ libsciaction_binding_la-GiwsException.lo
137@GUI_TRUE@am__objects_3 = libsciaction_binding_la-InterpreterManagement_wrap.lo
138@GUI_TRUE@am__objects_4 = \
139@GUI_TRUE@ libsciaction_binding_la-gw_action_binding.lo
140@GUI_TRUE@am__objects_5 = libsciaction_binding_la-sci_notify.lo
141am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
142 $(am__objects_3) $(am__objects_4) $(am__objects_5)
133libsciaction_binding_la_OBJECTS = \ 143libsciaction_binding_la_OBJECTS = \
134 $(am_libsciaction_binding_la_OBJECTS) 144 $(am_libsciaction_binding_la_OBJECTS)
135libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 145libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
136 $(LIBTOOLFLAGS) --mode=link $(CCLD) \ 146 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
137 $(libsciaction_binding_la_CFLAGS) $(CFLAGS) \ 147 $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \
138 $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o $@ 148 $@
139DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 149DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
140depcomp = $(SHELL) $(top_srcdir)/config/depcomp 150depcomp = $(SHELL) $(top_srcdir)/config/depcomp
141am__depfiles_maybe = depfiles 151am__depfiles_maybe = depfiles
@@ -149,6 +159,15 @@ CCLD = $(CC)
149LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 159LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
150 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 160 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
151 $(LDFLAGS) -o $@ 161 $(LDFLAGS) -o $@
162CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
163 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
164LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
165 --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
166 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
167CXXLD = $(CXX)
168CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
169 --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
170 $(LDFLAGS) -o $@
152SOURCES = $(libsciaction_binding_la_SOURCES) 171SOURCES = $(libsciaction_binding_la_SOURCES)
153DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST) 172DIST_SOURCES = $(am__libsciaction_binding_la_SOURCES_DIST)
154DATA = $(libsciaction_binding_la_etc_DATA) \ 173DATA = $(libsciaction_binding_la_etc_DATA) \
@@ -406,12 +425,22 @@ top_srcdir = @top_srcdir@
406# List of the c files 425# List of the c files
407@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c 426@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
408 427
428# List of the c++ file
429@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
430@GUI_TRUE@src/jni/Signal.hxx \
431@GUI_TRUE@src/jni/GiwsException.cpp
432
433
409# List of the gateway c files 434# List of the gateway c files
410@GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c 435@GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
436@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
437@GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
411 438
412#### SWIG Declaration #### 439#### SWIG Declaration ####
413@GUI_TRUE@SWIG_WRAPPERS = src/jni/InterpreterManagement.i 440@GUI_TRUE@SWIG_WRAPPERS = src/jni/InterpreterManagement.i
441@GIWS_TRUE@BUILT_SOURCES = giws
414@SWIG_TRUE@BUILT_SOURCES = swig 442@SWIG_TRUE@BUILT_SOURCES = swig
443GIWS_WRAPPERS = src/jni/Signal.giws.xml
415 444
416# Includes need for the compilation 445# Includes need for the compilation
417libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \ 446libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
@@ -419,6 +448,18 @@ libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
419-I$(srcdir)/src/c/ \ 448-I$(srcdir)/src/c/ \
420-I$(srcdir)/src/jni/ \ 449-I$(srcdir)/src/jni/ \
421-I$(top_srcdir)/libs/MALLOC/includes/ \ 450-I$(top_srcdir)/libs/MALLOC/includes/ \
451-I$(top_srcdir)/modules/jvm/includes/ \
452-I$(top_srcdir)/modules/api_scilab/includes \
453-I$(top_srcdir)/modules/output_stream/includes
454
455
456# Includes need for the compilation
457libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
458-I$(srcdir)/includes/ \
459-I$(srcdir)/src/c/ \
460-I$(srcdir)/src/jni/ \
461-I$(top_srcdir)/libs/MALLOC/includes/ \
462-I$(top_srcdir)/modules/jvm/includes/ \
422-I$(top_srcdir)/modules/api_scilab/includes \ 463-I$(top_srcdir)/modules/api_scilab/includes \
423-I$(top_srcdir)/modules/output_stream/includes 464-I$(top_srcdir)/modules/output_stream/includes
424 465
@@ -426,15 +467,19 @@ libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
426# Name of the future library (.la will be replace by .so, .a, etc regarding 467# Name of the future library (.la will be replace by .so, .a, etc regarding
427# the system) 468# the system)
428pkglib_LTLIBRARIES = libsciaction_binding.la 469pkglib_LTLIBRARIES = libsciaction_binding.la
429libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) 470libsciaction_binding_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
430 471
431# All the sources needed by libsciaction_binding.la 472# All the sources needed by libsciaction_binding.la
432libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(CONSOLE_C_JNI_SOURCES) 473libsciaction_binding_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
433 474
434# For the code check (splint) 475# For the code check (splint)
435CHECK_SRC = $(ACTION_BINDING_C_SOURCES) 476CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
436INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS) 477INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
437libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 478libsciaction_binding_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
479 $(top_builddir)/libs/MALLOC/libscimalloc.la \
480 $(top_builddir)/modules/jvm/libscijvm.la \
481 $(top_builddir)/modules/output_stream/libscioutput_stream.la
482
438#### Name of the module and the path ###### 483#### Name of the module and the path ######
439modulename = action_binding 484modulename = action_binding
440 485
@@ -448,7 +493,7 @@ libsciaction_binding_la_etc_DATA = etc/action_binding.quit etc/action_binding.st
448 493
449####�action_binding : gateway declaration #### 494####�action_binding : gateway declaration ####
450libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway 495libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
451libsciaction_binding_la_sci_gateway_DATA = 496libsciaction_binding_la_sci_gateway_DATA = sci_gateway/action_binding_gateway.xml
452 497
453# Where all the Scilab stuff is installed (macros, help, ...) 498# Where all the Scilab stuff is installed (macros, help, ...)
454mydatadir = $(pkgdatadir)/modules/$(modulename) 499mydatadir = $(pkgdatadir)/modules/$(modulename)
@@ -516,7 +561,7 @@ all: $(BUILT_SOURCES)
516 $(MAKE) $(AM_MAKEFLAGS) all-am 561 $(MAKE) $(AM_MAKEFLAGS) all-am
517 562
518.SUFFIXES: 563.SUFFIXES:
519.SUFFIXES: .sci .bin .c .lo .o .obj 564.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
520$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps) 565$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
521 @for dep in $?; do \ 566 @for dep in $?; do \
522 case '$(am__configure_deps)' in \ 567 case '$(am__configure_deps)' in \
@@ -587,10 +632,14 @@ mostlyclean-compile:
587distclean-compile: 632distclean-compile:
588 -rm -f *.tab.c 633 -rm -f *.tab.c
589 634
635@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@
590@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@ 636@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@
591@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@ 637@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@
638@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@
592@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo@am__quote@ 639@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo@am__quote@
640@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@
593@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@ 641@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@
642@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@
594 643
595.c.o: 644.c.o:
596@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 645@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -614,32 +663,81 @@ distclean-compile:
614@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< 663@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
615 664
616libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c 665libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
617@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 666@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
618@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo 667@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo
619@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@ 668@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
620@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 669@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
621@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 670@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
622 671
623libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c 672libsciaction_binding_la-dynamic_menus.lo: src/c/dynamic_menus.c
624@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 673@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
625@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo 674@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Tpo $(DEPDIR)/libsciaction_binding_la-dynamic_menus.Plo
626@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@ 675@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/dynamic_menus.c' object='libsciaction_binding_la-dynamic_menus.lo' libtool=yes @AMDEPBACKSLASH@
627@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 676@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
628@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 677@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
629 678
630libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c 679libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
631@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 680@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
632@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo 681@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo
633@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@ 682@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@
634@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 683@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
635@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 684@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
636 685
637libsciaction_binding_la-InterpreterManagement_wrap.lo: src/jni/InterpreterManagement_wrap.c 686libsciaction_binding_la-InterpreterManagement_wrap.lo: src/jni/InterpreterManagement_wrap.c
638@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 687@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
639@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo 688@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo
640@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/jni/InterpreterManagement_wrap.c' object='libsciaction_binding_la-InterpreterManagement_wrap.lo' libtool=yes @AMDEPBACKSLASH@ 689@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/jni/InterpreterManagement_wrap.c' object='libsciaction_binding_la-InterpreterManagement_wrap.lo' libtool=yes @AMDEPBACKSLASH@
641@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 690@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
642@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 691@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
692
693libsciaction_binding_la-gw_action_binding.lo: sci_gateway/c/gw_action_binding.c
694@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
695@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Tpo $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo
696@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sci_gateway/c/gw_action_binding.c' object='libsciaction_binding_la-gw_action_binding.lo' libtool=yes @AMDEPBACKSLASH@
697@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
698@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
699
700.cpp.o:
701@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
702@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
703@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
704@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
705@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
706
707.cpp.obj:
708@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
709@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
710@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
711@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
712@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
713
714.cpp.lo:
715@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
716@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
717@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
718@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
719@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
720
721libsciaction_binding_la-Signal.lo: src/jni/Signal.cpp
722@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
723@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-Signal.Tpo $(DEPDIR)/libsciaction_binding_la-Signal.Plo
724@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/jni/Signal.cpp' object='libsciaction_binding_la-Signal.lo' libtool=yes @AMDEPBACKSLASH@
725@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
726@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
727
728libsciaction_binding_la-GiwsException.lo: src/jni/GiwsException.cpp
729@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
730@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-GiwsException.Tpo $(DEPDIR)/libsciaction_binding_la-GiwsException.Plo
731@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/jni/GiwsException.cpp' object='libsciaction_binding_la-GiwsException.lo' libtool=yes @AMDEPBACKSLASH@
732@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
733@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
734
735libsciaction_binding_la-sci_notify.lo: sci_gateway/cpp/sci_notify.cpp
736@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
737@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo $(DEPDIR)/libsciaction_binding_la-sci_notify.Plo
738@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_notify.cpp' object='libsciaction_binding_la-sci_notify.lo' libtool=yes @AMDEPBACKSLASH@
739@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
740@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
643 741
644mostlyclean-libtool: 742mostlyclean-libtool:
645 -rm -f *.lo 743 -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
index 0000000..3029f00
--- /dev/null
+++ b/scilab/modules/action_binding/includes/gw_action_binding.h
@@ -0,0 +1,23 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) 2010 - DIGITEO - Allan SIMON
4*
5* This file must be used under the terms of the CeCILL.
6* This source file is licensed as described in the file COPYING, which
7* you should have received as part of this distribution. The terms
8* are also available at
9* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10*
11*/
12
13#ifndef __GW_ACTION_BINDING__
14#define __GW_ACTION_BINDING__
15/*--------------------------------------------------------------------------*/
16#include "dynlib_action_binding.h"
17/*--------------------------------------------------------------------------*/
18ACTION_BINDING_IMPEXP int gw_action_binding(void);
19ACTION_BINDING_IMPEXP int sci_notify(char* fname, unsigned long l);
20/*--------------------------------------------------------------------------*/
21#endif /* __GW_ACTION_BINDING__ */
22/*--------------------------------------------------------------------------*/
23
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
index 0000000..742e55d
--- /dev/null
+++ b/scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml
@@ -0,0 +1,27 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
3<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
4<GATEWAY name="xcos">
5<!-- =================== -->
6<!--
7 Scilab
8 Interface description. In this file, we define the list of the function which
9 will be available into Scilab and the link to the "native" function.
10
11 gatewayId is the position in the hashtable 'Interfaces' defined in the
12 file SCI/modules/core/src/c/callinterf.h
13
14 primitiveId is the position in the hashtable '<module>Table Tab[]' defined
15 in the file modules/<module>/sci_gateway/c/gw_<module>.c
16
17 primitiveName is the name of the Scilab function
18
19 @author Allan SIMON
20 @date DIGITEO 2010
21 ===================
22 Don't touch if you do not know what you are doing
23-->
24<!-- =================== -->
25
26<PRIMITIVE gatewayId="65" primitiveId="1" primitiveName="notify" />
27</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
index 0000000..4f93325
--- /dev/null
+++ b/scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c
@@ -0,0 +1,28 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009 - DIGITEO - Allan SIMON
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12/*--------------------------------------------------------------------------*/
13#include "gw_action_binding.h"
14#include "stack-c.h"
15#include "callFunctionFromGateway.h"
16/*--------------------------------------------------------------------------*/
17static gw_generic_table Tab[] = {
18 {sci_notify, "notify"},
19};
20/*--------------------------------------------------------------------------*/
21int gw_action_binding(void)
22{
23 Rhs = Max(0, Rhs);
24
25 callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
26 return 0;
27}
28/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/xcos/sci_gateway/cpp/sci_xcosNotify.cpp b/scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
index c36fb11..b908024 100644
--- a/scilab/modules/xcos/sci_gateway/cpp/sci_xcosNotify.cpp
+++ b/scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
@@ -14,9 +14,8 @@
14 14
15extern "C" 15extern "C"
16{ 16{
17#include "gw_xcos.h" 17#include "gw_action_binding.h"
18#include "stack-c.h" 18#include "stack-c.h"
19#include "callxcos.h"
20#include "api_common.h" 19#include "api_common.h"
21#include "api_string.h" 20#include "api_string.h"
22#include "localization.h" 21#include "localization.h"
@@ -26,9 +25,9 @@ extern "C"
26#include "getScilabJavaVM.h" 25#include "getScilabJavaVM.h"
27} 26}
28/*--------------------------------------------------------------------------*/ 27/*--------------------------------------------------------------------------*/
29using namespace org_scilab_modules_graph_utils; 28using namespace org_scilab_modules_action_binding_utils;
30/*--------------------------------------------------------------------------*/ 29/*--------------------------------------------------------------------------*/
31int sci_xcosNotify(char *fname,unsigned long fname_len) 30int sci_notify(char *fname,unsigned long fname_len)
32{ 31{
33 CheckRhs(1,1); 32 CheckRhs(1,1);
34 CheckLhs(0,1); 33 CheckLhs(0,1);
diff --git a/scilab/modules/action_binding/src/c/LibScilab_Import.def b/scilab/modules/action_binding/src/c/LibScilab_Import.def
index 70a8266..bab878c 100644
--- a/scilab/modules/action_binding/src/c/LibScilab_Import.def
+++ b/scilab/modules/action_binding/src/c/LibScilab_Import.def
@@ -9,4 +9,11 @@ EXPORTS
9 sigbas_ 9 sigbas_
10 StoreCommand 10 StoreCommand
11 StoreCommandWithFlag 11 StoreCommandWithFlag
12 ;
13 callFunctionFromGateway
14 putlhsvar_
15 freeArrayOfString
16 checklhs_
17 checkrhs_
18 intersci_
12 \ No newline at end of file 19 \ No newline at end of file
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj
index 2098a52..1621bb2 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcproj
@@ -45,7 +45,7 @@
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 48 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"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
50 MinimalRebuild="true" 50 MinimalRebuild="true"
51 BasicRuntimeChecks="0" 51 BasicRuntimeChecks="0"
@@ -129,7 +129,7 @@
129 <Tool 129 <Tool
130 Name="VCCLCompilerTool" 130 Name="VCCLCompilerTool"
131 Optimization="0" 131 Optimization="0"
132 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 132 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"
133 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS" 133 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
134 MinimalRebuild="true" 134 MinimalRebuild="true"
135 BasicRuntimeChecks="0" 135 BasicRuntimeChecks="0"
@@ -216,7 +216,7 @@
216 InlineFunctionExpansion="1" 216 InlineFunctionExpansion="1"
217 FavorSizeOrSpeed="1" 217 FavorSizeOrSpeed="1"
218 WholeProgramOptimization="false" 218 WholeProgramOptimization="false"
219 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 219 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"
220 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS" 220 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
221 StringPooling="true" 221 StringPooling="true"
222 RuntimeLibrary="2" 222 RuntimeLibrary="2"
@@ -306,7 +306,7 @@
306 InlineFunctionExpansion="1" 306 InlineFunctionExpansion="1"
307 FavorSizeOrSpeed="1" 307 FavorSizeOrSpeed="1"
308 WholeProgramOptimization="false" 308 WholeProgramOptimization="false"
309 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 309 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"
310 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS" 310 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"
311 StringPooling="true" 311 StringPooling="true"
312 RuntimeLibrary="2" 312 RuntimeLibrary="2"
@@ -380,6 +380,14 @@
380 > 380 >
381 </File> 381 </File>
382 <File 382 <File
383 RelativePath="..\jni\GiwsException.cpp"
384 >
385 </File>
386 <File
387 RelativePath="..\..\sci_gateway\c\gw_action_binding.c"
388 >
389 </File>
390 <File
383 RelativePath=".\InterpreterManagement.c" 391 RelativePath=".\InterpreterManagement.c"
384 > 392 >
385 </File> 393 </File>
@@ -387,6 +395,14 @@
387 RelativePath="..\jni\InterpreterManagement_wrap.c" 395 RelativePath="..\jni\InterpreterManagement_wrap.c"
388 > 396 >
389 </File> 397 </File>
398 <File
399 RelativePath="..\..\sci_gateway\cpp\sci_notify.cpp"
400 >
401 </File>
402 <File
403 RelativePath="..\jni\Signal.cpp"
404 >
405 </File>
390 </Filter> 406 </Filter>
391 <Filter 407 <Filter
392 Name="Header Files" 408 Name="Header Files"
@@ -397,9 +413,17 @@
397 > 413 >
398 </File> 414 </File>
399 <File 415 <File
416 RelativePath="..\jni\GiwsException.hxx"
417 >
418 </File>
419 <File
400 RelativePath=".\InterpreterManagement.h" 420 RelativePath=".\InterpreterManagement.h"
401 > 421 >
402 </File> 422 </File>
423 <File
424 RelativePath="..\jni\Signal.hxx"
425 >
426 </File>
403 </Filter> 427 </Filter>
404 <Filter 428 <Filter
405 Name="localization" 429 Name="localization"
diff --git a/scilab/modules/action_binding/src/c/libjvm_Import.def b/scilab/modules/action_binding/src/c/libjvm_Import.def
index 41d0878..a854f3f 100644
--- a/scilab/modules/action_binding/src/c/libjvm_Import.def
+++ b/scilab/modules/action_binding/src/c/libjvm_Import.def
@@ -2,3 +2,4 @@ LIBRARY libjvm.dll
2 2
3 3
4EXPORTS 4EXPORTS
5
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabInterpreterManagement.java b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/highlevel/ScilabInterpreterManagement.java
index d9df4c3..74c3372 100644
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabInterpreterManagement.java
+++ b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/highlevel/ScilabInterpreterManagement.java
@@ -10,7 +10,7 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.graph.utils; 13package org.scilab.modules.action_binding.highlevel;
14 14
15import java.awt.event.ActionEvent; 15import java.awt.event.ActionEvent;
16import java.awt.event.ActionListener; 16import java.awt.event.ActionListener;
@@ -26,8 +26,9 @@ import java.util.concurrent.Executors;
26 26
27import javax.swing.SwingUtilities; 27import javax.swing.SwingUtilities;
28 28
29import org.scilab.modules.jvm.utils.ScilabConstants;
30import org.scilab.modules.action_binding.InterpreterManagement; 29import org.scilab.modules.action_binding.InterpreterManagement;
30import org.scilab.modules.action_binding.utils.ActionBindingMessages;
31import org.scilab.modules.action_binding.utils.Signal;
31 32
32/** 33/**
33 * Implements useful methods to communicate with the Scilab interpreter. 34 * Implements useful methods to communicate with the Scilab interpreter.
@@ -39,7 +40,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
39 private static Set<String> runningTasks = Collections 40 private static Set<String> runningTasks = Collections
40 .synchronizedSet(new HashSet<String>()); 41 .synchronizedSet(new HashSet<String>());
41 42
42 private static final String NOTIFY = ";xcosNotify(\""; 43 private static final String NOTIFY = ";notify(\"";
43 private static final String CLOSE = "\");"; 44 private static final String CLOSE = "\");";
44 45
45 /** This class is a static singleton, thus it must not be instantiated */ 46 /** This class is a static singleton, thus it must not be instantiated */
@@ -76,12 +77,12 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
76 77
77 if (runningTasks.contains(uidDesc)) { 78 if (runningTasks.contains(uidDesc)) {
78 throw new InterpreterException( 79 throw new InterpreterException(
79 ScilabGraphMessages.SCILAB_SAMECOMMAND); 80 ActionBindingMessages.SCILAB_SAMECOMMAND);
80 } 81 }
81 82
82 int ret = InterpreterManagement.requestScilabExec(fullCommand); 83 int ret = InterpreterManagement.requestScilabExec(fullCommand);
83 if (ret != 0) { 84 if (ret != 0) {
84 throw new InterpreterException(ScilabGraphMessages.SCILAB_UNABLE); 85 throw new InterpreterException(ActionBindingMessages.SCILAB_UNABLE);
85 } 86 }
86 runningTasks.add(uidDesc); 87 runningTasks.add(uidDesc);
87 Signal.wait(uidDesc); 88 Signal.wait(uidDesc);
@@ -145,7 +146,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
145 146
146 if (runningTasks.contains(uidDesc)) { 147 if (runningTasks.contains(uidDesc)) {
147 throw new InterpreterException( 148 throw new InterpreterException(
148 ScilabGraphMessages.SCILAB_SAMECOMMAND); 149 ActionBindingMessages.SCILAB_SAMECOMMAND);
149 } 150 }
150 151
151 executor.submit(new Callable<Void>() { 152 executor.submit(new Callable<Void>() {
@@ -154,7 +155,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
154 .putCommandInScilabQueue(fullCommand); 155 .putCommandInScilabQueue(fullCommand);
155 if (ret != 0) { 156 if (ret != 0) {
156 throw new InterpreterException( 157 throw new InterpreterException(
157 ScilabGraphMessages.SCILAB_UNABLE); 158 ActionBindingMessages.SCILAB_UNABLE);
158 } 159 }
159 runningTasks.add(uidDesc); 160 runningTasks.add(uidDesc);
160 Signal.wait(uidDesc); 161 Signal.wait(uidDesc);
@@ -201,7 +202,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
201 202
202 if (runningTasks.contains(uidDesc)) { 203 if (runningTasks.contains(uidDesc)) {
203 throw new InterpreterException( 204 throw new InterpreterException(
204 ScilabGraphMessages.SCILAB_SAMECOMMAND); 205 ActionBindingMessages.SCILAB_SAMECOMMAND);
205 } 206 }
206 207
207 executor.submit(new Callable<Void>() { 208 executor.submit(new Callable<Void>() {
@@ -210,7 +211,7 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
210 .putCommandInScilabQueue(fullCommand); 211 .putCommandInScilabQueue(fullCommand);
211 if (ret != 0) { 212 if (ret != 0) {
212 throw new InterpreterException( 213 throw new InterpreterException(
213 ScilabGraphMessages.SCILAB_UNABLE); 214 ActionBindingMessages.SCILAB_UNABLE);
214 } 215 }
215 runningTasks.add(uidDesc); 216 runningTasks.add(uidDesc);
216 Signal.wait(uidDesc); 217 Signal.wait(uidDesc);
@@ -315,9 +316,9 @@ public final class ScilabInterpreterManagement extends InterpreterManagement {
315 */ 316 */
316 if (object instanceof CharSequence) { 317 if (object instanceof CharSequence) {
317 // We escape any CharSequence 318 // We escape any CharSequence
318 b.append(ScilabConstants.QUOTE); 319 b.append("\"");
319 b.append(object); 320 b.append(object);
320 b.append(ScilabConstants.QUOTE); 321 b.append("\"");
321 } else if (object instanceof char[]) { 322 } else if (object instanceof char[]) {
322 // We don't escape char[] 323 // We don't escape char[]
323 b.append((char[]) object); 324 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
index 0000000..c59994e
--- /dev/null
+++ b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/ActionBindingMessages.java
@@ -0,0 +1,30 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - DIGITEO - Allan SIMON
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13
14package org.scilab.modules.action_binding.utils;
15
16import org.scilab.modules.localization.Messages;
17
18
19
20public final class ActionBindingMessages {
21
22 /* Interpreter errors */
23 public static final String SCILAB_SAMECOMMAND = Messages.gettext("Same command executed again");
24 public static final String SCILAB_UNABLE = Messages.gettext("Unable to communicate with the interpreter");
25
26
27 /** This class is a static singleton, thus it must not be instantiated */
28 private ActionBindingMessages() {
29 }
30}
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/Signal.java b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/Signal.java
index f809cff..95968f1 100644
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/Signal.java
+++ b/scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/utils/Signal.java
@@ -10,7 +10,7 @@
10 * 10 *
11 */ 11 */
12 12
13package org.scilab.modules.graph.utils; 13package org.scilab.modules.action_binding.utils;
14 14
15import java.util.Collections; 15import java.util.Collections;
16import java.util.HashMap; 16import java.util.HashMap;
@@ -37,7 +37,6 @@ public final class Signal {
37 * @param index 37 * @param index
38 * The uid we are waiting for. 38 * The uid we are waiting for.
39 */ 39 */
40 // FIXME: why Signal::notify is exported and not Signal::wait
41 public static void wait(String index) { 40 public static void wait(String index) {
42 Object data = new Object(); 41 Object data = new Object();
43 waiters.put(index, data); 42 waiters.put(index, data);
@@ -60,8 +59,6 @@ public final class Signal {
60 * The uid to be notified. No one is waiting for the uid at time 59 * The uid to be notified. No one is waiting for the uid at time
61 * N, this method wait and retry each 100 milliseconds. 60 * N, this method wait and retry each 100 milliseconds.
62 */ 61 */
63 @ScilabExported(module="xcos", filename="XcosUtils.giws.xml")
64 // FIXME: the graph module is dependent of the Xcos native libraries
65 public static void notify(String index) { 62 public static void notify(String index) {
66 Object data = waiters.get(index); 63 Object data = waiters.get(index);
67 while (data == null) { 64 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
index 0000000..7355cce
--- /dev/null
+++ b/scilab/modules/action_binding/src/jni/GiwsException.cpp
@@ -0,0 +1,354 @@
1/* Generated by GIWS (version 1.0.4) */
2/*
3
4Copyright 2007-2008 INRIA
5
6Author : Sylvestre Ledru & others
7
8This software is a computer program whose purpose is to hide the complexity
9of accessing Java objects/methods from C++ code.
10
11This software is governed by the CeCILL-B license under French law and
12abiding by the rules of distribution of free software. You can use,
13modify and/ or redistribute the software under the terms of the CeCILL-B
14license as circulated by CEA, CNRS and INRIA at the following URL
15"http://www.cecill.info".
16
17As a counterpart to the access to the source code and rights to copy,
18modify and redistribute granted by the license, users are provided only
19with a limited warranty and the software's author, the holder of the
20economic rights, and the successive licensors have only limited
21liability.
22
23In this respect, the user's attention is drawn to the risks associated
24with loading, using, modifying and/or developing or reproducing the
25software by the user in light of its specific status of free software,
26that may mean that it is complicated to manipulate, and that also
27therefore means that it is reserved for developers and experienced
28professionals having in-depth computer knowledge. Users are therefore
29encouraged to load and test the software's suitability as regards their
30requirements in conditions enabling the security of their systems and/or
31data to be ensured and, more generally, to use and operate it in the
32same conditions as regards security.
33
34The fact that you are presently reading this means that you have had
35knowledge of the CeCILL-B license and that you accept its terms.
36*/
37
38#include "GiwsException.hxx"
39namespace GiwsException {
40
41
42
43/**
44* Each subclass of JniExcpetion should call the super constructor
45* and the setErrorMessage function to set the message.
46* @param curEnv java envirnonment where the exception occured.
47*/
48JniException::JniException(JNIEnv * curEnv) throw() : exception()
49{
50// retrieve information about the exception
51javaException = curEnv->ExceptionOccurred();
52/* Clear the Java Exception to avoid calling it again & again */
53curEnv->ExceptionClear();
54m_oJavaMessage = this->retrieveExceptionMessage(curEnv);
55m_oJavaStackTrace = this->retrieveStackTrace(curEnv);
56m_oJavaExceptionName = this->retrieveExceptionName(curEnv);
57
58// by default JniExceptions display teh stack trace
59setErrorMessage(m_oJavaMessage + "\n" + m_oJavaStackTrace);
60curEnv->DeleteLocalRef(javaException);
61closeException(curEnv);
62}
63
64JniException::~JniException(void) throw()
65{
66m_oErrorMessage.clear();
67}
68
69/**
70* @return a description of the exception
71*/
72const char * JniException::what(void) const throw()
73{
74return m_oErrorMessage.c_str();
75}
76
77/**
78* @return Java description of the exception.
79*/
80std::string JniException::getJavaDescription(void) const throw()
81{
82return m_oJavaMessage;
83}
84
85/**
86* @return Java stack trace where the exception occured.
87*/
88std::string JniException::getJavaStackTrace(void) const throw()
89{
90return m_oJavaStackTrace;
91}
92
93/**
94* Get the name of the exception (ie its class name).
95*/
96std::string JniException::getJavaExceptionName(void) const throw()
97{
98return m_oJavaExceptionName;
99}
100
101
102/**
103* Set the error message that the exception should print.
104*/
105void JniException::setErrorMessage(const std::string & errorMessage)
106{
107m_oErrorMessage = errorMessage;
108}
109
110/**
111* Get the message that the exception will print.
112*/
113std::string JniException::getErrorMessage(void) const
114{
115return m_oErrorMessage;
116}
117
118/**
119* @return error message of the exception.
120*/
121std::string JniException::retrieveExceptionMessage(JNIEnv * curEnv)
122{
123// return the result of the getLocalizedMessage method
124
125// retrieve information from the exception.
126// get method id
127jmethodID getLocalizedMessageId = curEnv->GetMethodID(curEnv->GetObjectClass(javaException),
128 "getLocalizedMessage",
129 "()Ljava/lang/String;");
130
131// call getLocalizedMessage
132jstring description = (jstring) curEnv->CallObjectMethod(javaException, getLocalizedMessageId);
133
134 if (description == NULL)
135 {
136 return "";
137 }
138
139 std::string res = convertJavaString(curEnv, description);
140
141 // release java ressources
142 curEnv->DeleteLocalRef(description);
143
144 return res;
145 }
146
147 /**
148 * @return full stack trace when the exception occured.
149 */
150 std::string JniException::retrieveStackTrace(JNIEnv * curEnv)
151 {
152
153
154 // return the result of the getStackTrace method
155
156 // retrieve information from the exception.
157 // get method id
158 // getStackTrace returns an array of StackTraceElement
159 jmethodID getStackTraceId = curEnv->GetMethodID(curEnv->GetObjectClass(javaException),
160 "getStackTrace",
161 "()[Ljava/lang/StackTraceElement;");
162
163 // call getStackTrace
164 jobjectArray stackTrace = (jobjectArray) curEnv->CallObjectMethod(javaException, getStackTraceId);
165
166 if (stackTrace == NULL)
167 {
168 return "";
169 }
170
171 // get length of the array
172 jsize stackTraceLength = curEnv->GetArrayLength(stackTrace);
173 std::string res = "";
174
175 // get toString methodId of StackTraceElement class
176 jclass stackTraceElementClass = curEnv->FindClass("java/lang/StackTraceElement");
177 jmethodID toStringId = curEnv->GetMethodID(stackTraceElementClass, "toString", "()Ljava/lang/String;");
178
179 for (jsize i = 0; i < stackTraceLength; i++)
180 {
181 // add the result of toString method of each element in the result
182 jobject curStackTraceElement = curEnv->GetObjectArrayElement(stackTrace, i);
183
184 // call to string on the object
185 jstring stackElementString = (jstring) curEnv->CallObjectMethod(curStackTraceElement, toStringId);
186
187 if (stackElementString == NULL)
188 {
189 curEnv->DeleteLocalRef(stackTraceElementClass);
190 curEnv->DeleteLocalRef(stackTrace);
191 curEnv->DeleteLocalRef(curStackTraceElement);
192 return res;
193 }
194
195 // add a line to res
196 res += " at " + convertJavaString(curEnv, stackElementString) + "\n";
197
198 curEnv->DeleteLocalRef(curStackTraceElement);
199 curEnv->DeleteLocalRef(stackElementString);
200 }
201
202 // release java ressources
203 curEnv->DeleteLocalRef(stackTraceElementClass);
204 curEnv->DeleteLocalRef(stackTrace);
205
206
207 return res;
208 }
209
210 /**
211 * @return string containing the name of the exception (ie its class name).
212 */
213 std::string JniException::retrieveExceptionName(JNIEnv * curEnv)
214 {
215
216 // then get its class
217 jclass exceptionClass = curEnv->GetObjectClass(javaException);
218
219 // get the Class class
220 // we could also use curEnv->FindClass("Class");
221 jclass classClass = curEnv->GetObjectClass(exceptionClass);
222
223 // get the getName method
224 jmethodID getNameId = curEnv->GetMethodID(classClass, "getName", "()Ljava/lang/String;");
225
226 // call the getName function
227 jstring javaName = (jstring) curEnv->CallObjectMethod(exceptionClass, getNameId);
228
229 if (javaName == NULL)
230 {
231 return "";
232 }
233
234 std::string res = convertJavaString(curEnv, javaName);
235
236 // release java ressources
237 curEnv->DeleteLocalRef(exceptionClass);
238 curEnv->DeleteLocalRef(classClass);
239 curEnv->DeleteLocalRef(javaName);
240
241 return res;
242 }
243
244 /**
245 * To be called when all the information about the exceptions have been
246 * retrived.
247 * Remove the exception from the environment.
248 */
249 void JniException::closeException(JNIEnv * curEnv)
250 {
251 // remove the exception from the environment
252 // Beware, the exception is no longer reachable
253 curEnv->ExceptionClear();
254 }
255
256 /**
257 * Convert a Java string (jstring) into a C++ string
258 */
259 std::string JniException::convertJavaString(JNIEnv * curEnv, jstring javaString)
260 {
261 // get a pointer on a C string
262 const char * tempString = curEnv->GetStringUTFChars(javaString, 0);
263
264 // convert the C string into a C++ string
265 std::string res(tempString);
266
267 // release pointer
268 curEnv->ReleaseStringUTFChars(javaString, tempString);
269
270 return res;
271 }
272
273
274 /**
275 * Exception that should be thrown when allocation of Java ressources from C++
276 * code fails (sur as NewDoubleArray or NewStringUTF).
277 */
278
279 JniBadAllocException::JniBadAllocException(JNIEnv * curEnv) throw() : JniException(curEnv)
280 {
281 std::string message = "Error no more memory.";
282 setErrorMessage(message);
283 }
284
285 JniBadAllocException::~JniBadAllocException(void) throw() {}
286
287
288 /**
289 * Exception that should be thrown when a call to a Java method
290 * using Jni throw an exception.
291 * If possible, user should try to avoid this sitution because of the loss
292 * of information.
293 */
294
295 /**
296 * @param curEnv java environment where the exception occured.
297 */
298 JniCallMethodException::JniCallMethodException(JNIEnv * curEnv) throw() : JniException(curEnv)
299 {
300 std::string errorMessage = "Exception when calling Java method : ";
301 errorMessage += getJavaDescription() + "\n" + getJavaStackTrace();
302 errorMessage += what();
303 setErrorMessage(errorMessage);
304 }
305
306 JniCallMethodException::~JniCallMethodException(void) throw() {}
307 /**
308 * @param className name of the class which haven't been found
309 */
310 JniClassNotFoundException::JniClassNotFoundException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
311 {
312std::string errorMessage = "Could not get the Class " + className + ".";
313setErrorMessage(errorMessage);
314 }
315
316 JniClassNotFoundException::~JniClassNotFoundException(void) throw() {}
317
318 /**
319 * @param className name of the method which haven't been found
320 */
321 JniMethodNotFoundException::JniMethodNotFoundException(JNIEnv * curEnv, const std::string & methodName) throw() : JniException(curEnv)
322 {
323std::string errorMessage = "Could not access to the method " + methodName + ".";
324setErrorMessage(errorMessage);
325 }
326
327 JniMethodNotFoundException::~JniMethodNotFoundException(void) throw() {}
328
329 /**
330 * @param curEnv java envirnonment where the exception occured.
331 */
332 JniObjectCreationException::JniObjectCreationException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
333 {
334std::string errorMessage = "Could not instantiate the object " + className + ".";
335setErrorMessage(errorMessage);
336 }
337
338 JniObjectCreationException::~JniObjectCreationException(void) throw() {}
339
340 /**
341 * @param curEnv java envirnonment where the exception occured.
342 */
343 JniMonitorException::JniMonitorException(JNIEnv * curEnv, const std::string & className) throw() : JniException(curEnv)
344 {
345std::string errorMessage = "Error in the access (Enter or exit) or a Java env monitor of class " + className + ".";
346setErrorMessage(errorMessage);
347 }
348
349 JniMonitorException::~JniMonitorException(void) throw() {}
350
351
352
353}
354
diff --git a/scilab/modules/action_binding/src/jni/GiwsException.hxx b/scilab/modules/action_binding/src/jni/GiwsException.hxx
new file mode 100644
index 0000000..cdde15a
--- /dev/null
+++ b/scilab/modules/action_binding/src/jni/GiwsException.hxx
@@ -0,0 +1,243 @@
1/* Generated by GIWS (version 1.0.4) */
2/*
3
4Copyright 2007-2008 INRIA
5
6Author : Sylvestre Ledru & others
7
8This software is a computer program whose purpose is to hide the complexity
9of accessing Java objects/methods from C++ code.
10
11This software is governed by the CeCILL-B license under French law and
12abiding by the rules of distribution of free software. You can use,
13modify and/ or redistribute the software under the terms of the CeCILL-B
14license as circulated by CEA, CNRS and INRIA at the following URL
15"http://www.cecill.info".
16
17As a counterpart to the access to the source code and rights to copy,
18modify and redistribute granted by the license, users are provided only
19with a limited warranty and the software's author, the holder of the
20economic rights, and the successive licensors have only limited
21liability.
22
23In this respect, the user's attention is drawn to the risks associated
24with loading, using, modifying and/or developing or reproducing the
25software by the user in light of its specific status of free software,
26that may mean that it is complicated to manipulate, and that also
27therefore means that it is reserved for developers and experienced
28professionals having in-depth computer knowledge. Users are therefore
29encouraged to load and test the software's suitability as regards their
30requirements in conditions enabling the security of their systems and/or
31data to be ensured and, more generally, to use and operate it in the
32same conditions as regards security.
33
34The fact that you are presently reading this means that you have had
35knowledge of the CeCILL-B license and that you accept its terms.
36*/
37
38
39#ifndef __GIWSEXCEPTION__
40#define __GIWSEXCEPTION__
41#include <iostream>
42#include <string>
43#include <string.h>
44#include <stdlib.h>
45#include <jni.h>
46#include <exception>
47
48namespace GiwsException {
49
50
51/**
52* Parent class for exceptions which may occure in JNI code.
53*/
54class JniException : public std::exception
55{
56
57/** Error message to display */
58std::string m_oErrorMessage;
59
60/** Java description of the exception*/
61std::string m_oJavaMessage;
62
63/** Java stackTrace when the exception occured */
64std::string m_oJavaStackTrace;
65
66/** Name of the exception (ie class name).*/
67std::string m_oJavaExceptionName;
68
69/** The exception itself ... we store as a member otherwise JNI
70complains about 'WARNING in native method: JNI call made with
71exception pending' */
72jthrowable javaException;
73
74public:
75
76/**
77* Each subclass of JniExcpetion should call the super constructor
78* and the setErrorMessage function to set the message.
79* @param curEnv java environment where the exception occured.
80*/
81JniException(JNIEnv * curEnv) throw() ;
82
83virtual ~JniException(void) throw();
84
85/**
86* @return a description of the exception
87*/
88virtual const char * what(void) const throw();
89
90/**
91* @return Java description of the exception.
92*/
93std::string getJavaDescription(void) const throw();
94
95/**
96* @return Java stack trace where the exception occured.
97*/
98std::string getJavaStackTrace(void) const throw();
99
100/**
101* Get the name of the exception (ie its class name).
102*/
103std::string getJavaExceptionName(void) const throw();
104
105protected:
106
107/**
108* Set the error message that the exception should print.
109*/
110void setErrorMessage(const std::string & errorMessage);
111
112/**
113* Get the message that the exception will print.
114*/
115std::string getErrorMessage(void) const;
116
117private:
118 /**
119* @return error message of the exception.
120*/
121std::string retrieveExceptionMessage(JNIEnv * curEnv);
122/**
123* @return full stack trace when the exception occured.
124*/
125std::string retrieveStackTrace(JNIEnv * curEnv);
126
127/**
128* @return string containing the name of the exception (ie its class name).
129*/
130std::string retrieveExceptionName(JNIEnv * curEnv);
131/**
132* To be called when all the information about the exceptions have been
133* retrived.
134* Remove the exception from the environment.
135*/
136void closeException(JNIEnv * curEnv);
137
138/**
139* Convert a Java string (jstring) into a C++ string
140*/
141std::string convertJavaString(JNIEnv * curEnv, jstring javaString);
142};
143
144/**
145* Exception that should be thrown when allocation of Java ressources from C++
146* code fails (sur as NewDoubleArray or NewStringUTF).
147*/
148class JniBadAllocException : public JniException
149{
150public:
151
152JniBadAllocException(JNIEnv * curEnv) throw();
153virtual ~JniBadAllocException(void) throw();
154};
155
156/**
157* Exception that should be thrown when a call to a Java method
158* using Jni throw an exception.
159* If possible, user should try to avoid this sitution because of the loss
160* of information.
161*/
162class JniCallMethodException : public JniException
163{
164public:
165
166 /**
167 * @param curEnv java envirnonment where the exception occured.
168 */
169 JniCallMethodException(JNIEnv * curEnv) throw();
170
171 virtual ~JniCallMethodException(void) throw();
172};
173
174/**
175* Exception that should be thrown when Jni code could not find a Java class
176*/
177class JniClassNotFoundException : public JniException
178{
179public:
180
181/**
182* @param className name of the class which haven't been found
183*/
184JniClassNotFoundException(JNIEnv * curEnv, const std::string & className) throw();
185
186virtual ~JniClassNotFoundException(void) throw();
187
188};
189
190/**
191* Exception that should be thrown when Jni code could not find a Java method
192*/
193class JniMethodNotFoundException : public JniException
194{
195public:
196
197/**
198* @param className name of the method which haven't been found
199*/
200JniMethodNotFoundException(JNIEnv * curEnv, const std::string & methodName) throw();
201virtual ~JniMethodNotFoundException(void) throw();
202
203};
204
205/**
206* Exception that should be thrown when a call to a Java method
207* using Jni throw an exception.
208* If possible, user should try to avoid this sitution because of the loss
209* of information.
210*/
211class JniObjectCreationException : public JniException
212{
213public:
214
215/**
216* @param curEnv java envirnonment where the exception occured.
217*/
218JniObjectCreationException(JNIEnv * curEnv, const std::string & className) throw();
219virtual ~JniObjectCreationException(void) throw();
220
221};
222
223
224/**
225* Exception that should be thrown when a call to the Java monitor
226* failed
227*/
228class JniMonitorException : public JniException
229{
230public:
231
232/**
233* @param curEnv java envirnonment where the exception occured.
234*/
235JniMonitorException(JNIEnv * curEnv, const std::string & className) throw();
236virtual ~JniMonitorException(void) throw();
237
238};
239
240
241}
242#endif
243
diff --git a/scilab/modules/xcos/src/jni/Signal.cpp b/scilab/modules/action_binding/src/jni/Signal.cpp
index 62b43ac..bd34be1 100644
--- a/scilab/modules/xcos/src/jni/Signal.cpp
+++ b/scilab/modules/action_binding/src/jni/Signal.cpp
@@ -1,5 +1,5 @@
1#include "Signal.hxx" 1#include "Signal.hxx"
2/* Generated by GIWS (version 1.1.1) */ 2/* Generated by GIWS (version 1.1.0) */
3/* 3/*
4 4
5Copyright 2007-2008 INRIA 5Copyright 2007-2008 INRIA
@@ -39,7 +39,7 @@ The fact that you are presently reading this means that you have had
39knowledge of the CeCILL-B license and that you accept its terms. 39knowledge of the CeCILL-B license and that you accept its terms.
40*/ 40*/
41 41
42namespace org_scilab_modules_graph_utils { 42namespace org_scilab_modules_action_binding_utils {
43 43
44// Returns the current env 44// Returns the current env
45 45
@@ -71,7 +71,9 @@ JNIEnv * curEnv = getCurrentEnv();
71 71
72localClass = curEnv->FindClass( this->className().c_str() ) ; 72localClass = curEnv->FindClass( this->className().c_str() ) ;
73if (localClass == NULL) { 73if (localClass == NULL) {
74 throw GiwsException::JniClassNotFoundException(curEnv, this->className()); 74std::cerr << "Could not get the Class " << this->className() << std::endl;
75curEnv->ExceptionDescribe();
76exit(EXIT_FAILURE);
75} 77}
76 78
77this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass)); 79this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
@@ -80,23 +82,31 @@ this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
80curEnv->DeleteLocalRef(localClass); 82curEnv->DeleteLocalRef(localClass);
81 83
82if (this->instanceClass == NULL) { 84if (this->instanceClass == NULL) {
83throw GiwsException::JniObjectCreationException(curEnv, this->className()); 85std::cerr << "Could not create a Global Ref of " << this->className() << std::endl;
86curEnv->ExceptionDescribe();
87exit(EXIT_FAILURE);
84} 88}
85 89
86 90
87constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ; 91constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
88if(constructObject == NULL){ 92if(constructObject == NULL){
89throw GiwsException::JniObjectCreationException(curEnv, this->className()); 93std::cerr << "Could not retrieve the constructor of the class " << this->className() << " with the profile : " << construct << param << std::endl;
94curEnv->ExceptionDescribe();
95exit(EXIT_FAILURE);
90} 96}
91 97
92localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ; 98localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
93if(localInstance == NULL){ 99if(localInstance == NULL){
94throw GiwsException::JniObjectCreationException(curEnv, this->className()); 100std::cerr << "Could not instantiate the object " << this->className() << " with the constructor : " << construct << param << std::endl;
101curEnv->ExceptionDescribe();
102exit(EXIT_FAILURE);
95} 103}
96 104
97this->instance = curEnv->NewGlobalRef(localInstance) ; 105this->instance = curEnv->NewGlobalRef(localInstance) ;
98if(this->instance == NULL){ 106if(this->instance == NULL){
99throw GiwsException::JniObjectCreationException(curEnv, this->className()); 107std::cerr << "Could not create a new global ref of " << this->className() << std::endl;
108curEnv->ExceptionDescribe();
109exit(EXIT_FAILURE);
100} 110}
101/* localInstance not needed anymore */ 111/* localInstance not needed anymore */
102curEnv->DeleteLocalRef(localInstance); 112curEnv->DeleteLocalRef(localInstance);
@@ -117,12 +127,18 @@ jclass localClass = curEnv->GetObjectClass(JObj);
117 curEnv->DeleteLocalRef(localClass); 127 curEnv->DeleteLocalRef(localClass);
118 128
119 if (this->instanceClass == NULL) { 129 if (this->instanceClass == NULL) {
120throw GiwsException::JniObjectCreationException(curEnv, this->className()); 130
131std::cerr << "Could not create a Global Ref of " << this->className() << std::endl;
132curEnv->ExceptionDescribe();
133exit(EXIT_FAILURE);
121 } 134 }
122 135
123 this->instance = curEnv->NewGlobalRef(JObj) ; 136 this->instance = curEnv->NewGlobalRef(JObj) ;
124 if(this->instance == NULL){ 137 if(this->instance == NULL){
125throw GiwsException::JniObjectCreationException(curEnv, this->className()); 138
139std::cerr << "Could not create a new global ref of " << this->className() << std::endl;
140curEnv->ExceptionDescribe();
141exit(EXIT_FAILURE);
126 } 142 }
127 /* Methods ID set to NULL */ 143 /* Methods ID set to NULL */
128 voidnotifyjstringID=NULL; 144 voidnotifyjstringID=NULL;
@@ -134,13 +150,17 @@ throw GiwsException::JniObjectCreationException(curEnv, this->className());
134 150
135void Signal::synchronize() { 151void Signal::synchronize() {
136if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) { 152if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
137throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal"); 153std::cerr << "Fail to enter monitor." << std::endl;
154exit(EXIT_FAILURE);
155
138} 156}
139} 157}
140 158
141void Signal::endSynchronize() { 159void Signal::endSynchronize() {
142if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) { 160if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
143throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal"); 161
162std::cerr << "Fail to exit monitor." << std::endl;
163exit(EXIT_FAILURE);
144} 164}
145} 165}
146// Method(s) 166// Method(s)
@@ -153,14 +173,17 @@ jclass cls = curEnv->FindClass( className().c_str() );
153 173
154jmethodID voidnotifyjstringID = curEnv->GetStaticMethodID(cls, "notify", "(Ljava/lang/String;)V" ) ; 174jmethodID voidnotifyjstringID = curEnv->GetStaticMethodID(cls, "notify", "(Ljava/lang/String;)V" ) ;
155if (voidnotifyjstringID == NULL) { 175if (voidnotifyjstringID == NULL) {
156throw GiwsException::JniMethodNotFoundException(curEnv, "notify"); 176std::cerr << "Could not access to the method " << "notify" << std::endl;
177curEnv->ExceptionDescribe();
178exit(EXIT_FAILURE);
157} 179}
158 180
159jstring ID_ = curEnv->NewStringUTF( ID ); 181jstring ID_ = curEnv->NewStringUTF( ID );
160 182
161 curEnv->CallStaticVoidMethod(cls, voidnotifyjstringID ,ID_);if (curEnv->ExceptionCheck()) { 183 curEnv->CallStaticVoidMethod(cls, voidnotifyjstringID ,ID_);if (curEnv->ExceptionCheck()) {
162throw GiwsException::JniCallMethodException(curEnv); 184curEnv->ExceptionDescribe() ;
163} 185}
186
164} 187}
165 188
166} 189}
diff --git a/scilab/modules/xcos/src/jni/XcosUtils.giws.xml b/scilab/modules/action_binding/src/jni/Signal.giws.xml
index 0b2272b..16b2d0c 100644
--- a/scilab/modules/xcos/src/jni/XcosUtils.giws.xml
+++ b/scilab/modules/action_binding/src/jni/Signal.giws.xml
@@ -1,4 +1,4 @@
1<package name="org.scilab.modules.graph.utils"> 1<package name="org.scilab.modules.action_binding.utils">
2 <object name="Signal"> 2 <object name="Signal">
3 <method name="notify" returnType="void" modifier="static"> 3 <method name="notify" returnType="void" modifier="static">
4 <parameter name="ID" type="String"/> 4 <parameter name="ID" type="String"/>
diff --git a/scilab/modules/xcos/src/jni/Signal.hxx b/scilab/modules/action_binding/src/jni/Signal.hxx
index cb99037..3bc3b90 100644
--- a/scilab/modules/xcos/src/jni/Signal.hxx
+++ b/scilab/modules/action_binding/src/jni/Signal.hxx
@@ -1,4 +1,4 @@
1/* Generated by GIWS (version 1.1.1) */ 1/* Generated by GIWS (version 1.1.0) */
2/* 2/*
3 3
4Copyright 2007-2008 INRIA 4Copyright 2007-2008 INRIA
@@ -39,16 +39,14 @@ knowledge of the CeCILL-B license and that you accept its terms.
39*/ 39*/
40 40
41 41
42#ifndef __ORG_SCILAB_MODULES_GRAPH_UTILS_SIGNAL__ 42#ifndef __ORG_SCILAB_MODULES_ACTION_BINDING_UTILS_SIGNAL__
43#define __ORG_SCILAB_MODULES_GRAPH_UTILS_SIGNAL__ 43#define __ORG_SCILAB_MODULES_ACTION_BINDING_UTILS_SIGNAL__
44#include <iostream> 44#include <iostream>
45#include <string> 45#include <string>
46#include <string.h> 46#include <string.h>
47#include <stdlib.h> 47#include <stdlib.h>
48#include <jni.h> 48#include <jni.h>
49 49
50#include "GiwsException.hxx"
51
52#ifndef _MSC_VER /* Defined anyway with Visual */ 50#ifndef _MSC_VER /* Defined anyway with Visual */
53#if !defined(byte) 51#if !defined(byte)
54typedef signed char byte; 52typedef signed char byte;
@@ -57,7 +55,7 @@ typedef signed char byte;
57#endif 55#endif
58#endif 56#endif
59 57
60namespace org_scilab_modules_graph_utils { 58namespace org_scilab_modules_action_binding_utils {
61 59
62class Signal { 60class Signal {
63private: 61private:
@@ -117,7 +115,7 @@ static void notify(JavaVM * jvm_, char * ID);
117 115
118 static const std::string className() 116 static const std::string className()
119 { 117 {
120 return "org/scilab/modules/graph/utils/Signal"; 118 return "org/scilab/modules/action_binding/utils/Signal";
121 } 119 }
122 120
123}; 121};
diff --git a/scilab/modules/core/includes/callinterf.h b/scilab/modules/core/includes/callinterf.h
index 2cdd330..f970e2d 100644
--- a/scilab/modules/core/includes/callinterf.h
+++ b/scilab/modules/core/includes/callinterf.h
@@ -86,6 +86,7 @@
86/* 62 */ #include "dynamic_gateways.h" /* hdf5 */ 86/* 62 */ #include "dynamic_gateways.h" /* hdf5 */
87/* 63 */ #include "dynamic_gateways.h" /* xpad */ 87/* 63 */ #include "dynamic_gateways.h" /* xpad */
88/* 64 */ #include "dynamic_gateways.h" /* xcos */ 88/* 64 */ #include "dynamic_gateways.h" /* xcos */
89/* 65 */ #include "../../action_binding/includes/gw_action_binding.h"
89 90
90/*------------------------------------- 91/*-------------------------------------
91 * long jump to stop interface computation 92 * long jump to stop interface computation
diff --git a/scilab/modules/core/src/c/callinterf.c b/scilab/modules/core/src/c/callinterf.c
index 455100b..f87de16 100644
--- a/scilab/modules/core/src/c/callinterf.c
+++ b/scilab/modules/core/src/c/callinterf.c
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
33 ** Watch out the positions are crutial !!! 33 ** Watch out the positions are crutial !!!
34 ** @TODO : Make this less crappy... 34 ** @TODO : Make this less crappy...
35 **/ 35 **/
36#define INTERFACES_MAX 64 36#define INTERFACES_MAX 65
37static OpTab Interfaces[INTERFACES_MAX] = { 37static OpTab Interfaces[INTERFACES_MAX] = {
38 /* 01 */ {gw_user}, /* free position may be used */ 38 /* 01 */ {gw_user}, /* free position may be used */
39 /* 02 */ {gw_linear_algebra}, 39 /* 02 */ {gw_linear_algebra},
@@ -98,7 +98,8 @@ static OpTab Interfaces[INTERFACES_MAX] = {
98 /* 61 */ {gw_call_scilab}, 98 /* 61 */ {gw_call_scilab},
99 /* 62 */ {gw_dynamic_hdf5}, 99 /* 62 */ {gw_dynamic_hdf5},
100 /* 63 */ {gw_dynamic_xpad}, 100 /* 63 */ {gw_dynamic_xpad},
101 /* 64 */ {gw_dynamic_xcos} 101 /* 64 */ {gw_dynamic_xcos},
102 /* 65 */ {gw_action_binding}
102}; 103};
103/*--------------------------------------------------------------------------*/ 104/*--------------------------------------------------------------------------*/
104static int sig_ok = 0; 105static int sig_ok = 0;
diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java
index 5c8b07b..d2d85a4 100644
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphMessages.java
@@ -33,11 +33,9 @@ public final class ScilabGraphMessages {
33 public static final String INVERT_SELECTION = Messages.gettext("Invert selection"); 33 public static final String INVERT_SELECTION = Messages.gettext("Invert selection");
34 public static final String UNTITLED = Messages.gettext("Untitled"); 34 public static final String UNTITLED = Messages.gettext("Untitled");
35 35
36 /* Interpreter errors */ 36
37 public static final String SCILAB_SAMECOMMAND = Messages.gettext("Same command executed again");
38 public static final String SCILAB_UNABLE = Messages.gettext("Unable to communicate with the interpreter");
39
40 /** This class is a static singleton, thus it must not be instantiated */ 37 /** This class is a static singleton, thus it must not be instantiated */
41 private ScilabGraphMessages() { 38 private ScilabGraphMessages() {
42 } 39 }
40
43} 41}
diff --git a/scilab/modules/xcos/Makefile.am b/scilab/modules/xcos/Makefile.am
index ef24733..53367d5 100644
--- a/scilab/modules/xcos/Makefile.am
+++ b/scilab/modules/xcos/Makefile.am
@@ -35,12 +35,9 @@ XCOS_C_SOURCES =
35XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \ 35XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \
36 src/jni/Xcos.cpp \ 36 src/jni/Xcos.cpp \
37 src/jni/Xcos.hxx \ 37 src/jni/Xcos.hxx \
38 src/jni/Signal.cpp \
39 src/jni/Signal.hxx \
40 src/jni/GiwsException.cpp 38 src/jni/GiwsException.cpp
41 39
42GIWS_WRAPPERS = src/jni/Xcos.giws.xml \ 40GIWS_WRAPPERS = src/jni/Xcos.giws.xml
43src/jni/XcosUtils.giws.xml
44 41
45if GIWS 42if GIWS
46BUILT_SOURCES=giws 43BUILT_SOURCES=giws
@@ -51,7 +48,6 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_xcos.c
51 48
52GATEWAY_CPP_SOURCES = \ 49GATEWAY_CPP_SOURCES = \
53 sci_gateway/cpp/sci_Xcos.cpp \ 50 sci_gateway/cpp/sci_Xcos.cpp \
54 sci_gateway/cpp/sci_xcosNotify.cpp \
55 sci_gateway/cpp/sci_warnBlockByUID.cpp \ 51 sci_gateway/cpp/sci_warnBlockByUID.cpp \
56 sci_gateway/cpp/sci_closeXcosFromScilab.cpp \ 52 sci_gateway/cpp/sci_closeXcosFromScilab.cpp \
57 sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \ 53 sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index d15463d..2d3e4b5 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -134,14 +134,13 @@ libscixcos_la_DEPENDENCIES = \
134am__objects_2 = 134am__objects_2 =
135am__objects_3 = libscixcos_la-gw_xcos.lo 135am__objects_3 = libscixcos_la-gw_xcos.lo
136am__objects_4 = libscixcos_la-sci_Xcos.lo \ 136am__objects_4 = libscixcos_la-sci_Xcos.lo \
137 libscixcos_la-sci_xcosNotify.lo \
138 libscixcos_la-sci_warnBlockByUID.lo \ 137 libscixcos_la-sci_warnBlockByUID.lo \
139 libscixcos_la-sci_closeXcosFromScilab.lo \ 138 libscixcos_la-sci_closeXcosFromScilab.lo \
140 libscixcos_la-sci_xcosDiagramToHDF5.lo \ 139 libscixcos_la-sci_xcosDiagramToHDF5.lo \
141 libscixcos_la-sci_xcosDiagramOpen.lo \ 140 libscixcos_la-sci_xcosDiagramOpen.lo \
142 libscixcos_la-sci_xcosDiagramClose.lo 141 libscixcos_la-sci_xcosDiagramClose.lo
143am__objects_5 = libscixcos_la-callxcos.lo libscixcos_la-Xcos.lo \ 142am__objects_5 = libscixcos_la-callxcos.lo libscixcos_la-Xcos.lo \
144 libscixcos_la-Signal.lo libscixcos_la-GiwsException.lo 143 libscixcos_la-GiwsException.lo
145am_libscixcos_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ 144am_libscixcos_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
146 $(am__objects_4) $(am__objects_5) 145 $(am__objects_4) $(am__objects_5)
147libscixcos_la_OBJECTS = $(am_libscixcos_la_OBJECTS) 146libscixcos_la_OBJECTS = $(am_libscixcos_la_OBJECTS)
@@ -443,18 +442,13 @@ XCOS_C_SOURCES =
443XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \ 442XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \
444 src/jni/Xcos.cpp \ 443 src/jni/Xcos.cpp \
445 src/jni/Xcos.hxx \ 444 src/jni/Xcos.hxx \
446 src/jni/Signal.cpp \
447 src/jni/Signal.hxx \
448 src/jni/GiwsException.cpp 445 src/jni/GiwsException.cpp
449 446
450GIWS_WRAPPERS = src/jni/Xcos.giws.xml \ 447GIWS_WRAPPERS = src/jni/Xcos.giws.xml
451src/jni/XcosUtils.giws.xml
452
453@GIWS_TRUE@BUILT_SOURCES = giws 448@GIWS_TRUE@BUILT_SOURCES = giws
454GATEWAY_C_SOURCES = sci_gateway/c/gw_xcos.c 449GATEWAY_C_SOURCES = sci_gateway/c/gw_xcos.c
455GATEWAY_CPP_SOURCES = \ 450GATEWAY_CPP_SOURCES = \
456 sci_gateway/cpp/sci_Xcos.cpp \ 451 sci_gateway/cpp/sci_Xcos.cpp \
457 sci_gateway/cpp/sci_xcosNotify.cpp \
458 sci_gateway/cpp/sci_warnBlockByUID.cpp \ 452 sci_gateway/cpp/sci_warnBlockByUID.cpp \
459 sci_gateway/cpp/sci_closeXcosFromScilab.cpp \ 453 sci_gateway/cpp/sci_closeXcosFromScilab.cpp \
460 sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \ 454 sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp \
@@ -921,7 +915,6 @@ distclean-compile:
921 915
922@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_disable_la-noxcos.Plo@am__quote@ 916@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_disable_la-noxcos.Plo@am__quote@
923@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-GiwsException.Plo@am__quote@ 917@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-GiwsException.Plo@am__quote@
924@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-Signal.Plo@am__quote@
925@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-Xcos.Plo@am__quote@ 918@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-Xcos.Plo@am__quote@
926@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-callxcos.Plo@am__quote@ 919@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-callxcos.Plo@am__quote@
927@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-gw_xcos.Plo@am__quote@ 920@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-gw_xcos.Plo@am__quote@
@@ -931,7 +924,6 @@ distclean-compile:
931@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramClose.Plo@am__quote@ 924@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramClose.Plo@am__quote@
932@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramOpen.Plo@am__quote@ 925@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramOpen.Plo@am__quote@
933@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramToHDF5.Plo@am__quote@ 926@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosDiagramToHDF5.Plo@am__quote@
934@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscixcos_la-sci_xcosNotify.Plo@am__quote@
935 927
936.c.o: 928.c.o:
937@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 929@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
996@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 988@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
997@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 989@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
998 990
999libscixcos_la-sci_xcosNotify.lo: sci_gateway/cpp/sci_xcosNotify.cpp
1000@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
1001@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-sci_xcosNotify.Tpo $(DEPDIR)/libscixcos_la-sci_xcosNotify.Plo
1002@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sci_gateway/cpp/sci_xcosNotify.cpp' object='libscixcos_la-sci_xcosNotify.lo' libtool=yes @AMDEPBACKSLASH@
1003@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1004@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
1005
1006libscixcos_la-sci_warnBlockByUID.lo: sci_gateway/cpp/sci_warnBlockByUID.cpp 991libscixcos_la-sci_warnBlockByUID.lo: sci_gateway/cpp/sci_warnBlockByUID.cpp
1007@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 992@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
1008@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-sci_warnBlockByUID.Tpo $(DEPDIR)/libscixcos_la-sci_warnBlockByUID.Plo 993@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
1052@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1037@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1053@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 1038@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
1054 1039
1055libscixcos_la-Signal.lo: src/jni/Signal.cpp
1056@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
1057@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-Signal.Tpo $(DEPDIR)/libscixcos_la-Signal.Plo
1058@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/jni/Signal.cpp' object='libscixcos_la-Signal.lo' libtool=yes @AMDEPBACKSLASH@
1059@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1060@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
1061
1062libscixcos_la-GiwsException.lo: src/jni/GiwsException.cpp 1040libscixcos_la-GiwsException.lo: src/jni/GiwsException.cpp
1063@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 1041@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
1064@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-GiwsException.Tpo $(DEPDIR)/libscixcos_la-GiwsException.Plo 1042@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscixcos_la-GiwsException.Tpo $(DEPDIR)/libscixcos_la-GiwsException.Plo
diff --git a/scilab/modules/xcos/sci_gateway/c/gw_xcos.c b/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
index 245cd1e..fe787d6 100644
--- a/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
+++ b/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
@@ -24,7 +24,6 @@ static BOOL loadedDep = FALSE;
24/*--------------------------------------------------------------------------*/ 24/*--------------------------------------------------------------------------*/
25static gw_generic_table Tab[] = { 25static gw_generic_table Tab[] = {
26 {sci_Xcos, "xcos"}, 26 {sci_Xcos, "xcos"},
27 {sci_xcosNotify, "xcosNotify"},
28 {sci_warnBlockByUID, "warnBlockByUID"}, 27 {sci_warnBlockByUID, "warnBlockByUID"},
29 {sci_closeXcosFromScilab, "closeXcos"}, 28 {sci_closeXcosFromScilab, "closeXcos"},
30 {sci_xcosDiagramToHDF5, "xcosDiagramToHDF5"}, 29 {sci_xcosDiagramToHDF5, "xcosDiagramToHDF5"},
diff --git a/scilab/modules/xcos/sci_gateway/xcos_gateway.xml b/scilab/modules/xcos/sci_gateway/xcos_gateway.xml
index 3736337..ebfd4b6 100644
--- a/scilab/modules/xcos/sci_gateway/xcos_gateway.xml
+++ b/scilab/modules/xcos/sci_gateway/xcos_gateway.xml
@@ -24,10 +24,9 @@
24<!-- =================== --> 24<!-- =================== -->
25 25
26<PRIMITIVE gatewayId="64" primitiveId="1" primitiveName="xcos" /> 26<PRIMITIVE gatewayId="64" primitiveId="1" primitiveName="xcos" />
27<PRIMITIVE gatewayId="64" primitiveId="2" primitiveName="xcosNotify" /> 27<PRIMITIVE gatewayId="64" primitiveId="2" primitiveName="warnBlockByUID" />
28<PRIMITIVE gatewayId="64" primitiveId="3" primitiveName="warnBlockByUID" /> 28<PRIMITIVE gatewayId="64" primitiveId="3" primitiveName="closeXcos" />
29<PRIMITIVE gatewayId="64" primitiveId="4" primitiveName="closeXcos" /> 29<PRIMITIVE gatewayId="64" primitiveId="4" primitiveName="xcosDiagramToHDF5" />
30<PRIMITIVE gatewayId="64" primitiveId="5" primitiveName="xcosDiagramToHDF5" /> 30<PRIMITIVE gatewayId="64" primitiveId="5" primitiveName="xcosDiagramOpen" />
31<PRIMITIVE gatewayId="64" primitiveId="6" primitiveName="xcosDiagramOpen" /> 31<PRIMITIVE gatewayId="64" primitiveId="6" primitiveName="xcosDiagramClose" />
32<PRIMITIVE gatewayId="64" primitiveId="7" primitiveName="xcosDiagramClose" />
33</GATEWAY> 32</GATEWAY>
diff --git a/scilab/modules/xcos/src/c/xcos.vcproj b/scilab/modules/xcos/src/c/xcos.vcproj
index 4bf89a9..10592dc 100644
--- a/scilab/modules/xcos/src/c/xcos.vcproj
+++ b/scilab/modules/xcos/src/c/xcos.vcproj
@@ -412,14 +412,6 @@
412 > 412 >
413 </File> 413 </File>
414 <File 414 <File
415 RelativePath="..\..\sci_gateway\cpp\sci_xcosNotify.cpp"
416 >
417 </File>
418 <File
419 RelativePath="..\jni\Signal.cpp"
420 >
421 </File>
422 <File
423 RelativePath="..\jni\Xcos.cpp" 415 RelativePath="..\jni\Xcos.cpp"
424 > 416 >
425 </File> 417 </File>
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
index 56ce84a..7f75fbe 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
@@ -24,8 +24,8 @@ import java.util.Map;
24import javax.swing.SwingUtilities; 24import javax.swing.SwingUtilities;
25 25
26import org.apache.commons.logging.LogFactory; 26import org.apache.commons.logging.LogFactory;
27import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
27import org.scilab.modules.graph.utils.ScilabExported; 28import org.scilab.modules.graph.utils.ScilabExported;
28import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
29import org.scilab.modules.xcos.block.BasicBlock; 29import org.scilab.modules.xcos.block.BasicBlock;
30import org.scilab.modules.xcos.block.BlockFactory; 30import org.scilab.modules.xcos.block.BlockFactory;
31import org.scilab.modules.xcos.block.SuperBlock; 31import org.scilab.modules.xcos.block.SuperBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java
index 4023e0c..def0c2e 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CodeGenerationAction.java
@@ -13,8 +13,8 @@
13 13
14package org.scilab.modules.xcos.actions; 14package org.scilab.modules.xcos.actions;
15 15
16import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec; 16import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
17import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 17import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
18import static org.scilab.modules.xcos.utils.FileUtils.delete; 18import static org.scilab.modules.xcos.utils.FileUtils.delete;
19 19
20 20
@@ -24,8 +24,8 @@ import java.io.File;
24import java.io.IOException; 24import java.io.IOException;
25 25
26import org.apache.commons.logging.LogFactory; 26import org.apache.commons.logging.LogFactory;
27import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
27import org.scilab.modules.graph.ScilabGraph; 28import org.scilab.modules.graph.ScilabGraph;
28import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
29import org.scilab.modules.gui.menuitem.MenuItem; 29import org.scilab.modules.gui.menuitem.MenuItem;
30import org.scilab.modules.xcos.block.BasicBlock; 30import org.scilab.modules.xcos.block.BasicBlock;
31import org.scilab.modules.xcos.block.SuperBlock; 31import org.scilab.modules.xcos.block.SuperBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java
index 8e42557..2a4e382 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/CompileAction.java
@@ -13,7 +13,7 @@
13 13
14package org.scilab.modules.xcos.actions; 14package org.scilab.modules.xcos.actions;
15 15
16import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 16import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
17import static org.scilab.modules.xcos.utils.FileUtils.delete; 17import static org.scilab.modules.xcos.utils.FileUtils.delete;
18 18
19import java.awt.event.ActionEvent; 19import java.awt.event.ActionEvent;
@@ -24,9 +24,9 @@ import java.io.IOException;
24import javax.swing.SwingWorker; 24import javax.swing.SwingWorker;
25 25
26import org.apache.commons.logging.LogFactory; 26import org.apache.commons.logging.LogFactory;
27import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
28import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
27import org.scilab.modules.graph.ScilabGraph; 29import org.scilab.modules.graph.ScilabGraph;
28import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
29import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
30import org.scilab.modules.gui.menuitem.MenuItem; 30import org.scilab.modules.gui.menuitem.MenuItem;
31import org.scilab.modules.xcos.graph.XcosDiagram; 31import org.scilab.modules.xcos.graph.XcosDiagram;
32import org.scilab.modules.xcos.utils.FileUtils; 32import org.scilab.modules.xcos.utils.FileUtils;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
index 11b9003..ff7a33d 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/DumpAction.java
@@ -14,17 +14,17 @@
14 14
15package org.scilab.modules.xcos.actions; 15package org.scilab.modules.xcos.actions;
16 16
17import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 17import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
18 18
19import java.awt.event.ActionEvent; 19import java.awt.event.ActionEvent;
20import java.io.File; 20import java.io.File;
21import java.io.IOException; 21import java.io.IOException;
22 22
23import org.apache.commons.logging.LogFactory; 23import org.apache.commons.logging.LogFactory;
24import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
25import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
24import org.scilab.modules.graph.ScilabGraph; 26import org.scilab.modules.graph.ScilabGraph;
25import org.scilab.modules.graph.actions.base.DefaultAction; 27import org.scilab.modules.graph.actions.base.DefaultAction;
26import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
27import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
28import org.scilab.modules.gui.menuitem.MenuItem; 28import org.scilab.modules.gui.menuitem.MenuItem;
29import org.scilab.modules.gui.pushbutton.PushButton; 29import org.scilab.modules.gui.pushbutton.PushButton;
30import org.scilab.modules.xcos.graph.XcosDiagram; 30import org.scilab.modules.xcos.graph.XcosDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
index 82569ad..c9b4eae 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/InitModelicaAction.java
@@ -11,8 +11,8 @@
11 */ 11 */
12package org.scilab.modules.xcos.actions; 12package org.scilab.modules.xcos.actions;
13 13
14import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec; 14import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
15import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 15import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
16 16
17import java.awt.event.ActionEvent; 17import java.awt.event.ActionEvent;
18import java.awt.event.ActionListener; 18import java.awt.event.ActionListener;
@@ -20,9 +20,9 @@ import java.io.File;
20import java.io.IOException; 20import java.io.IOException;
21 21
22import org.apache.commons.logging.LogFactory; 22import org.apache.commons.logging.LogFactory;
23import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
23import org.scilab.modules.graph.ScilabGraph; 24import org.scilab.modules.graph.ScilabGraph;
24import org.scilab.modules.graph.actions.base.DefaultAction; 25import org.scilab.modules.graph.actions.base.DefaultAction;
25import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
26import org.scilab.modules.gui.menuitem.MenuItem; 26import org.scilab.modules.gui.menuitem.MenuItem;
27import org.scilab.modules.gui.pushbutton.PushButton; 27import org.scilab.modules.gui.pushbutton.PushButton;
28import org.scilab.modules.xcos.graph.XcosDiagram; 28import org.scilab.modules.xcos.graph.XcosDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
index 46f218c..b7bc002 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
@@ -14,8 +14,8 @@
14 14
15package org.scilab.modules.xcos.actions; 15package org.scilab.modules.xcos.actions;
16 16
17import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.asynchronousScilabExec; 17import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.asynchronousScilabExec;
18import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 18import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
19 19
20import java.awt.event.ActionEvent; 20import java.awt.event.ActionEvent;
21import java.awt.event.ActionListener; 21import java.awt.event.ActionListener;
@@ -24,10 +24,10 @@ import java.io.IOException;
24 24
25import org.apache.commons.logging.Log; 25import org.apache.commons.logging.Log;
26import org.apache.commons.logging.LogFactory; 26import org.apache.commons.logging.LogFactory;
27import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
27import org.scilab.modules.graph.ScilabGraph; 28import org.scilab.modules.graph.ScilabGraph;
28import org.scilab.modules.graph.actions.base.DefaultAction; 29import org.scilab.modules.graph.actions.base.DefaultAction;
29import org.scilab.modules.graph.actions.base.GraphActionManager; 30import org.scilab.modules.graph.actions.base.GraphActionManager;
30import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
31import org.scilab.modules.gui.menuitem.MenuItem; 31import org.scilab.modules.gui.menuitem.MenuItem;
32import org.scilab.modules.gui.pushbutton.PushButton; 32import org.scilab.modules.gui.pushbutton.PushButton;
33import org.scilab.modules.xcos.graph.XcosDiagram; 33import org.scilab.modules.xcos.graph.XcosDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
index d397ff4..5eddb05 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
@@ -16,10 +16,10 @@ package org.scilab.modules.xcos.actions;
16 16
17import java.awt.event.ActionEvent; 17import java.awt.event.ActionEvent;
18 18
19import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
19import org.scilab.modules.graph.ScilabGraph; 20import org.scilab.modules.graph.ScilabGraph;
20import org.scilab.modules.graph.actions.base.DefaultAction; 21import org.scilab.modules.graph.actions.base.DefaultAction;
21import org.scilab.modules.graph.actions.base.GraphActionManager; 22import org.scilab.modules.graph.actions.base.GraphActionManager;
22import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
23import org.scilab.modules.gui.menuitem.MenuItem; 23import org.scilab.modules.gui.menuitem.MenuItem;
24import org.scilab.modules.gui.pushbutton.PushButton; 24import org.scilab.modules.gui.pushbutton.PushButton;
25import org.scilab.modules.xcos.graph.XcosDiagram; 25import org.scilab.modules.xcos.graph.XcosDiagram;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java
index 09b17b8..ad0ca8c 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/ViewDiagramBrowserAction.java
@@ -18,10 +18,10 @@ import java.awt.event.ActionEvent;
18import java.io.File; 18import java.io.File;
19import java.io.IOException; 19import java.io.IOException;
20 20
21import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
22import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
21import org.scilab.modules.graph.ScilabGraph; 23import org.scilab.modules.graph.ScilabGraph;
22import org.scilab.modules.graph.actions.base.OneBlockDependantAction; 24import org.scilab.modules.graph.actions.base.OneBlockDependantAction;
23import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
24import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
25import org.scilab.modules.gui.menuitem.MenuItem; 25import org.scilab.modules.gui.menuitem.MenuItem;
26import org.scilab.modules.xcos.graph.XcosDiagram; 26import org.scilab.modules.xcos.graph.XcosDiagram;
27import org.scilab.modules.xcos.utils.FileUtils; 27import org.scilab.modules.xcos.utils.FileUtils;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
index f74a9e6..6efc9ae 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
@@ -15,9 +15,9 @@ package org.scilab.modules.xcos.actions;
15 15
16import java.awt.event.ActionEvent; 16import java.awt.event.ActionEvent;
17 17
18import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
18import org.scilab.modules.graph.ScilabGraph; 19import org.scilab.modules.graph.ScilabGraph;
19import org.scilab.modules.graph.actions.base.DefaultAction; 20import org.scilab.modules.graph.actions.base.DefaultAction;
20import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
21import org.scilab.modules.gui.menuitem.MenuItem; 21import org.scilab.modules.gui.menuitem.MenuItem;
22import org.scilab.modules.gui.pushbutton.PushButton; 22import org.scilab.modules.gui.pushbutton.PushButton;
23import org.scilab.modules.xcos.utils.XcosMessages; 23import org.scilab.modules.xcos.utils.XcosMessages;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
index e1859a2..f926781 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
@@ -16,9 +16,9 @@ package org.scilab.modules.xcos.actions;
16import java.awt.event.ActionEvent; 16import java.awt.event.ActionEvent;
17import java.awt.event.KeyEvent; 17import java.awt.event.KeyEvent;
18 18
19import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
19import org.scilab.modules.graph.ScilabGraph; 20import org.scilab.modules.graph.ScilabGraph;
20import org.scilab.modules.graph.actions.base.DefaultAction; 21import org.scilab.modules.graph.actions.base.DefaultAction;
21import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
22import org.scilab.modules.gui.menuitem.MenuItem; 22import org.scilab.modules.gui.menuitem.MenuItem;
23import org.scilab.modules.gui.pushbutton.PushButton; 23import org.scilab.modules.gui.pushbutton.PushButton;
24import org.scilab.modules.xcos.utils.XcosMessages; 24import org.scilab.modules.xcos.utils.XcosMessages;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java
index 7fa31fc..33d6c64 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java
@@ -35,8 +35,8 @@ import javax.swing.JPanel;
35import javax.swing.ListSelectionModel; 35import javax.swing.ListSelectionModel;
36 36
37import org.apache.commons.logging.LogFactory; 37import org.apache.commons.logging.LogFactory;
38import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 38import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
39import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 39import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
40import org.scilab.modules.xcos.actions.DebugLevelAction; 40import org.scilab.modules.xcos.actions.DebugLevelAction;
41import org.scilab.modules.xcos.actions.DebugLevelAction.DebugLevel; 41import org.scilab.modules.xcos.actions.DebugLevelAction.DebugLevel;
42import org.scilab.modules.xcos.graph.ScicosParameters; 42import org.scilab.modules.xcos.graph.ScicosParameters;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
index 8dda0bd..cb0fb5a 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
@@ -27,15 +27,15 @@ import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
27 27
28import org.apache.commons.logging.Log; 28import org.apache.commons.logging.Log;
29import org.apache.commons.logging.LogFactory; 29import org.apache.commons.logging.LogFactory;
30import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
31import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
30import org.scilab.modules.graph.ScilabGraph; 32import org.scilab.modules.graph.ScilabGraph;
31import org.scilab.modules.graph.ScilabGraphUniqueObject; 33import org.scilab.modules.graph.ScilabGraphUniqueObject;
32import org.scilab.modules.graph.actions.CopyAction; 34import org.scilab.modules.graph.actions.CopyAction;
33import org.scilab.modules.graph.actions.CutAction; 35import org.scilab.modules.graph.actions.CutAction;
34import org.scilab.modules.graph.actions.DeleteAction; 36import org.scilab.modules.graph.actions.DeleteAction;
35import org.scilab.modules.graph.actions.base.DefaultAction; 37import org.scilab.modules.graph.actions.base.DefaultAction;
36import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
37import org.scilab.modules.graph.utils.StyleMap; 38import org.scilab.modules.graph.utils.StyleMap;
38import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
39import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu; 39import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
40import org.scilab.modules.gui.contextmenu.ContextMenu; 40import org.scilab.modules.gui.contextmenu.ContextMenu;
41import org.scilab.modules.gui.contextmenu.ScilabContextMenu; 41import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
index 6cce0c3..35a517d 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
@@ -15,9 +15,9 @@ package org.scilab.modules.xcos.block.actions;
15 15
16import java.awt.event.ActionEvent; 16import java.awt.event.ActionEvent;
17 17
18import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
18import org.scilab.modules.graph.ScilabGraph; 19import org.scilab.modules.graph.ScilabGraph;
19import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction; 20import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
20import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
21import org.scilab.modules.gui.menuitem.MenuItem; 21import org.scilab.modules.gui.menuitem.MenuItem;
22import org.scilab.modules.gui.pushbutton.PushButton; 22import org.scilab.modules.gui.pushbutton.PushButton;
23import org.scilab.modules.xcos.block.BasicBlock; 23import org.scilab.modules.xcos.block.BasicBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
index 3cb0710..a6000e2 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/ViewDetailsAction.java
@@ -14,17 +14,17 @@
14 14
15package org.scilab.modules.xcos.block.actions; 15package org.scilab.modules.xcos.block.actions;
16 16
17import static org.scilab.modules.graph.utils.ScilabInterpreterManagement.buildCall; 17import static org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.buildCall;
18 18
19import java.awt.event.ActionEvent; 19import java.awt.event.ActionEvent;
20import java.io.File; 20import java.io.File;
21import java.io.IOException; 21import java.io.IOException;
22 22
23import org.apache.commons.logging.LogFactory; 23import org.apache.commons.logging.LogFactory;
24import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
25import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
24import org.scilab.modules.graph.ScilabGraph; 26import org.scilab.modules.graph.ScilabGraph;
25import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction; 27import org.scilab.modules.graph.actions.base.VertexSelectionDependantAction;
26import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
27import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
28import org.scilab.modules.gui.menuitem.MenuItem; 28import org.scilab.modules.gui.menuitem.MenuItem;
29import org.scilab.modules.xcos.block.BasicBlock; 29import org.scilab.modules.xcos.block.BasicBlock;
30import org.scilab.modules.xcos.block.SplitBlock; 30import org.scilab.modules.xcos.block.SplitBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
index 2a52057..5171e5c 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
@@ -15,8 +15,8 @@ package org.scilab.modules.xcos.block.io;
15import java.io.File; 15import java.io.File;
16import java.io.IOException; 16import java.io.IOException;
17 17
18import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 18import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
19import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 19import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
20import org.scilab.modules.types.scilabTypes.ScilabDouble; 20import org.scilab.modules.types.scilabTypes.ScilabDouble;
21import org.scilab.modules.types.scilabTypes.ScilabList; 21import org.scilab.modules.types.scilabTypes.ScilabList;
22import org.scilab.modules.xcos.block.BasicBlock; 22import org.scilab.modules.xcos.block.BasicBlock;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
index c9c3cb0..ed32610 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
@@ -41,6 +41,9 @@ import javax.xml.parsers.ParserConfigurationException;
41 41
42import org.apache.commons.logging.Log; 42import org.apache.commons.logging.Log;
43import org.apache.commons.logging.LogFactory; 43import org.apache.commons.logging.LogFactory;
44
45import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
46import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
44import org.scilab.modules.jvm.utils.ScilabConstants; 47import org.scilab.modules.jvm.utils.ScilabConstants;
45 48
46import org.scilab.modules.graph.ScilabCanvas; 49import org.scilab.modules.graph.ScilabCanvas;
@@ -52,8 +55,6 @@ import org.scilab.modules.graph.actions.UndoAction;
52import org.scilab.modules.graph.actions.ZoomInAction; 55import org.scilab.modules.graph.actions.ZoomInAction;
53import org.scilab.modules.graph.actions.ZoomOutAction; 56import org.scilab.modules.graph.actions.ZoomOutAction;
54import org.scilab.modules.graph.utils.ScilabExported; 57import org.scilab.modules.graph.utils.ScilabExported;
55import org.scilab.modules.graph.utils.ScilabInterpreterManagement;
56import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException;
57import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu; 58import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
58import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser; 59import org.scilab.modules.gui.bridge.filechooser.SwingScilabFileChooser;
59import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem; 60import org.scilab.modules.gui.checkboxmenuitem.CheckBoxMenuItem;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
index 14c8e9b..fd4e37c 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteBlockMouseListener.java
@@ -19,8 +19,8 @@ import java.util.List;
19 19
20import javax.swing.SwingUtilities; 20import javax.swing.SwingUtilities;
21 21
22import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 22import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
23import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 23import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
24import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu; 24import org.scilab.modules.gui.bridge.contextmenu.SwingScilabContextMenu;
25import org.scilab.modules.gui.contextmenu.ContextMenu; 25import org.scilab.modules.gui.contextmenu.ContextMenu;
26import org.scilab.modules.gui.contextmenu.ScilabContextMenu; 26import org.scilab.modules.gui.contextmenu.ScilabContextMenu;
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
index a1f6cd6..f53f326 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
@@ -18,8 +18,8 @@ import java.io.IOException;
18import java.util.Arrays; 18import java.util.Arrays;
19 19
20import org.apache.commons.logging.LogFactory; 20import org.apache.commons.logging.LogFactory;
21import org.scilab.modules.graph.utils.ScilabInterpreterManagement; 21import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement;
22import org.scilab.modules.graph.utils.ScilabInterpreterManagement.InterpreterException; 22import org.scilab.modules.action_binding.highlevel.ScilabInterpreterManagement.InterpreterException;
23 23
24/** 24/**
25 * All the filetype recognized by Xcos. 25 * All the filetype recognized by Xcos.