Merge remote-tracking branch 'origin/master' into graphic 82/5182/6
Vincent COUVERT [Mon, 10 Oct 2011 09:32:00 +0000 (11:32 +0200)]
Conflicts:
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphics/sci_gateway/c/sci_Legend.c
scilab/modules/graphics/sci_gateway/c/sci_addcb.c
scilab/modules/graphics/sci_gateway/c/sci_champ.c
scilab/modules/graphics/sci_gateway/c/sci_copy.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_drawlater.c
scilab/modules/graphics/sci_gateway/c/sci_drawnow.c
scilab/modules/graphics/sci_gateway/c/sci_fec.c
scilab/modules/graphics/sci_gateway/c/sci_get.c
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/graphics/sci_gateway/c/sci_grayplot.c
scilab/modules/graphics/sci_gateway/c/sci_move.c
scilab/modules/graphics/sci_gateway/c/sci_newaxes.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/c/sci_show_window.c
scilab/modules/graphics/sci_gateway/c/sci_swap_handles.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_xarc.c
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/sci_gateway/c/sci_xrects.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/sci_gateway/c/sci_xstring.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/get_anti_aliasing_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_alignment_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_auto_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_clip_state_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_mapping_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_hidden_axis_color_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_text_box_mode_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_ticks_property.c
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_getcallbackobject.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/c/sci_uiwait.c
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/pvm/Makefile.in
scilab/modules/renderer/src/cpp/figureDrawing/FigureScilabCall.cpp
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java

Change-Id: If2027117c011c8e0e558ee4a84cd3aa4a1875b80

213 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/librarypath.xml
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/sci_gateway/c/sci_Legend.c
scilab/modules/graphics/sci_gateway/c/sci_StringBox.c
scilab/modules/graphics/sci_gateway/c/sci_addcb.c
scilab/modules/graphics/sci_gateway/c/sci_champ.c
scilab/modules/graphics/sci_gateway/c/sci_clear_pixmap.c
scilab/modules/graphics/sci_gateway/c/sci_copy.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_draw.c
scilab/modules/graphics/sci_gateway/c/sci_drawaxis.c
scilab/modules/graphics/sci_gateway/c/sci_geom3d.c
scilab/modules/graphics/sci_gateway/c/sci_grayplot.c
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/sci_gateway/c/sci_move.c
scilab/modules/graphics/sci_gateway/c/sci_param3d.c
scilab/modules/graphics/sci_gateway/c/sci_param3d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/c/sci_rotate_axes.c
scilab/modules/graphics/sci_gateway/c/sci_rubberbox.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_show_pixmap.c
scilab/modules/graphics/sci_gateway/c/sci_showalluimenushandles.c
scilab/modules/graphics/sci_gateway/c/sci_swap_handles.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_xarc.c
scilab/modules/graphics/sci_gateway/c/sci_xarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xclick.c
scilab/modules/graphics/sci_gateway/c/sci_xdel.c
scilab/modules/graphics/sci_gateway/c/sci_xfarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xfpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/graphics/sci_gateway/c/sci_xgrid.c
scilab/modules/graphics/sci_gateway/c/sci_xname.c
scilab/modules/graphics/sci_gateway/c/sci_xpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/sci_gateway/c/sci_xrects.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/graphics/sci_gateway/c/sci_xtitle.c
scilab/modules/graphics/src/c/DrawObjects.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/get_anti_aliasing_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_alignment_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_axes_visible_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_figure_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_format_n_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_mark_size_unit_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_rotation_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_tics_direction_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_view_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_ticks_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_ticks_property.c
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_getcallbackobject.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontextmenu.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/c/sci_uiwait.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java
scilab/modules/gui/src/jni/CallGraphicJoGLView.cpp
scilab/modules/gui/src/jni/CallGraphicJoGLView.hxx
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/CommandHistoryMouseListener.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/ClearAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CloseAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/EditInScinotesAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/EvaluateAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/src/cpp/figureDrawing/FigureScilabCall.cpp
scilab/modules/renderer/src/cpp/grayplotDrawing/GrayplotDecomposer.cpp
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scinotes/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/datatable/SwingEditvarTableModel.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/ScilabVariableBrowser.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/ScilabTabbedPane.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/ScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/SupprAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
scilab/modules/xml/Makefile.in

@@@ -1,18 -1,36 +1,47 @@@
              Changes between version 5.3.3 and 5.4.0 of Scilab
              =================================================
  
 +Graphic capabilities
 +====================
 +
 +* Entire refactoring of Scilab graphic capabilities.
 +
 +
 +GUI:
 +====
 +
 +* New uicontrols added: TODO
 +
  
+ XML features:
+ =============
+ * Version 5.4.0 introduces XML management features. It allows easy access to
+ XML files, validation and writing.
+  - XMLObjects - Describe the properties of the different XML objects
+  - xmlAddNs - Add a namespace to a XML Element
+  - xmlClose - Close a XML document
+  - xmlDTD - Create a XML DTD object
+  - xmlDocument - Create a new XML document
+  - xmlDump - Dump a XML object
+  - xmlElement - Create a new XML element
+  - xmlFormat - Format a Scilab variable into XML
+  - xmlGetNsByHref - Get a namespace by its href
+  - xmlGetNsByPrefix - Get a namespace by prefix
+  - xmlGetOpenStreams - Get all open XML documents or all open XML Validation files.
+  - xmlNs - Create a new XML Namespace
+  - xmlRead - Read a XML stream from a local or distant file
+  - xmlReadStr - Read a XML tree from a string
+  - xmlRelaxNG - Create a XML Relax NG object
+  - xmlSchema - Create a XML Schema object
+  - xmlValidate - Validate a document in using a DTD, a Relax NG or a Schema.
+  - xmlWrite - Write a XML document in a file
+  - xmlXPath - Make an XPath query on a XML document
+ These features have been developped in the context of the OASIS R&D project.
  SciNotes:
  =========
  
Simple merge
@@@ -387,7 -380,9 +383,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui-Ant", "modules\gui\src\java\gui-JAVA.vcxproj", "{F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}"
        ProjectSection(ProjectDependencies) = postProject
 +              {A3193DF3-A764-4B51-B240-9285289C337E} = {A3193DF3-A764-4B51-B240-9285289C337E}
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
+               {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
+               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamiclibrary", "libs\dynamiclibrary\dynamiclibrary.vcxproj", "{77154919-8A20-4F35-B7C7-6B3B957BDCA1}"
@@@ -592,23 -627,12 +637,27 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
 +              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcxproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 +              {4235A847-ED0E-43A3-B62B-E59CB857EDE9} = {4235A847-ED0E-43A3-B62B-E59CB857EDE9}
 +              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 +      EndProjectSection
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@@ -28,7 -60,7 +60,8 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcxproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        ProjectSection(ProjectDependencies) = postProject
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985} = {30F9EE41-587B-4618-8DE7-698D3FBA4985}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcxproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
@@@ -360,12 -625,12 +626,16 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects-Ant", "modules\graphic_objects\src\java\graphic_objects-JAVA.vcxproj", "{A3193DF3-A764-4B51-B240-9285289C337E}"
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
Simple merge
@@@ -10301,7 -10293,7 +10294,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10304 "configure"
 -// #line 10296 "configure"
++// #line 10297 "configure"
  
  
  public class conftest {
@@@ -10367,7 -10359,7 +10360,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10370 "configure"
 -// #line 10362 "configure"
++// #line 10363 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10429,9 -10421,8 +10422,8 @@@ $as_echo_n "checking java API version..
  
      # The class java.nio.charset.Charset is new to 1.4
  
      cat << \EOF > conftest.java
- // #line 10434 "configure"
 -// #line 10425 "configure"
++// #line 10426 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
      # The class java.lang.StringBuilder is new to 1.5
  
      cat << \EOF > conftest.java
- // #line 10479 "configure"
 -// #line 10469 "configure"
++// #line 10470 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
  
      # The class java.util.ArrayDeque is new to 1.6
  
      cat << \EOF > conftest.java
- // #line 10524 "configure"
 -// #line 10513 "configure"
++// #line 10514 "configure"
  import java.util.ArrayDeque;
  
  public class conftest {
              fi
  
  
+     # The class java.nio.file.Path is new to 1.7
+     cat << \EOF > conftest.java
 -// #line 10557 "configure"
++// #line 10558 "configure"
+ import java.nio.file.Path;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               ac_java_jvm_version=1.7
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+                   ac_java_jvm_version=1.7
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             fi
      if test "x$ac_java_jvm_version" = "x" ; then
          as_fn_error $? "Could not detect Java version, 1.4 or newer is required" "$LINENO" 5
      fi
@@@ -11883,7 -11923,7 +11924,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11886 "configure"
 -// #line 11926 "configure"
++// #line 11927 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11977,7 -12017,7 +12018,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 11980 "configure"
 -// #line 12020 "configure"
++// #line 12021 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12031 "configure"
 -// #line 12071 "configure"
++// #line 12072 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -12105,7 -12145,7 +12146,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12108 "configure"
 -// #line 12148 "configure"
++// #line 12149 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12258,7 -12298,7 +12299,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12261 "configure"
 -// #line 12301 "configure"
++// #line 12302 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12316 "configure"
 -// #line 12356 "configure"
++// #line 12357 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
  
                  fi
  
 -                # Docking system
 +
 +                              # scirenderer
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking scirenderer" >&5
 +$as_echo_n "checking scirenderer... " >&6; }
 +    PACKAGE_JAR_FILE=
 +    found_jar=no
 +    saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
 +    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
 +      for jar in "$jardir/scirenderer.jar" "$jardir/libscirenderer.jar" "$jardir/libscirenderer-java.jar" "$jardir/scirenderer*.jar"; do
 +#    jar=`echo $jar|sed -e 's/ /\\ /'`
 +#    echo "protected $jar"
 +#    jar_resolved=`ls $jar 2>/dev/null`
 +#    echo "looking for $jar_resolved"
 +# TODO check the behaviour when spaces
 +    jars_resolved=`ls $jar 2>/dev/null`
 +    for jar_resolved in $jars_resolved; do # If several jars matches
 +        if test -e "$jar_resolved"; then
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
- // #line 12401 "configure"
++// #line 12442 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""no"" = "no"; then
 +           echo "yes" >&5
 +
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
 +            found_jar=yes
 +            PACKAGE_JAR_FILE=$jar_resolved
 +            break
 +
 +       else
 +              cmd="$JAVA conftest"
 +              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
 +               echo "yes" >&5
 +
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
 +            found_jar=yes
 +            PACKAGE_JAR_FILE=$jar_resolved
 +            break
 +
 +            else
 +                echo "configure: failed program was:" >&5
 +                cat conftest.java >&5
 +                if test -s conftest.java.output; then
 +                   STDOUT=`cat conftest.java.output`
 +                fi
 +                echo "configure: CLASSPATH was $CLASSPATH" >&5
 +
 +            ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +                            fi
 +        fi
 +        if test -f conftest.java.output; then
 +           rm conftest.java.output
 +        fi
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +
 +            ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +            fi
 +
 +        fi
 +      done
 +      # If ls returns several results and the first one is OK, stop the search
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +      done
 +      # If found, no need to search in other directory
 +      if test "$found_jar" = "yes"; then
 +        break
 +      fi
 +    done
 +    if test "$found_jar" = "no"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +      if test "" = "yes"; then
 +         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" >&5
 +$as_echo "$as_me: WARNING: Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" >&2;}
 +      else
 +          as_fn_error $? "Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" "$LINENO" 5
 +      fi
 +    fi
 +
 +                              SCIRENDERER=$PACKAGE_JAR_FILE
 +
 +
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.2.3) of scirenderer" >&5
 +$as_echo_n "checking minimal version (0.2.3) of scirenderer... " >&6; }
 +   saved_ac_java_classpath=$ac_java_classpath
 +   export ac_java_classpath="$SCIRENDERER:$ac_java_classpath"
 +   if test "x=" == "x"; then
 +
 +    cat << \EOF > conftest.java
- // #line 12495 "configure"
++// #line 12536 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +        String minVersion="0.2.3";
 +
 +                            System.out.println(PackageInfo.VERSION);
 +                                  if (minVersion.compareTo(PackageInfo.VERSION) > 0) {
 +                                   System.exit(-1);
 +                                }
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""yes"" = "no"; then
 +           echo "yes" >&5
 +              echo "yes"
 +       else
 +              cmd="$JAVA conftest"
 +              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
 +               echo "yes" >&5
 +                  echo "yes"
 +            else
 +                echo "configure: failed program was:" >&5
 +                cat conftest.java >&5
 +                if test -s conftest.java.output; then
 +                   STDOUT=`cat conftest.java.output`
 +                fi
 +                echo "configure: CLASSPATH was $CLASSPATH" >&5
 +                  as_fn_error $? "Wrong version of scirenderer. Expected at least 0.2.3. Found $STDOUT" "$LINENO" 5
 +                            fi
 +        fi
 +        if test -f conftest.java.output; then
 +           rm conftest.java.output
 +        fi
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +          as_fn_error $? "Wrong version of scirenderer. Expected at least 0.2.3. Found $STDOUT" "$LINENO" 5
 +            fi
 +
 +   else
 +
 +    cat << \EOF > conftest.java
- // #line 12546 "configure"
++// #line 12587 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +        String minVersion="0.2.3";
 +
 +                            System.out.println(PackageInfo.VERSION);
 +                                  if (minVersion.compareTo(PackageInfo.VERSION) != 0) {
 +                                   System.exit(-1);
 +                                }
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""yes"" = "no"; then
 +           echo "yes" >&5
 +              echo "yes"
 +       else
 +              cmd="$JAVA conftest"
 +              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
 +               echo "yes" >&5
 +                  echo "yes"
 +            else
 +                echo "configure: failed program was:" >&5
 +                cat conftest.java >&5
 +                if test -s conftest.java.output; then
 +                   STDOUT=`cat conftest.java.output`
 +                fi
 +                echo "configure: CLASSPATH was $CLASSPATH" >&5
 +                  as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.2.3. Found $STDOUT" "$LINENO" 5
 +                            fi
 +        fi
 +        if test -f conftest.java.output; then
 +           rm conftest.java.output
 +        fi
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +          as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.2.3. Found $STDOUT" "$LINENO" 5
 +            fi
 +
 +    fi
 +   ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +               # Docking system
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
  $as_echo_n "checking flexdock... " >&6; }
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12619 "configure"
 -// #line 12440 "configure"
++// #line 12660 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -12710,7 -12531,7 +12751,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12713 "configure"
 -// #line 12534 "configure"
++// #line 12754 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12764 "configure"
 -// #line 12585 "configure"
++// #line 12805 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -12834,7 -12655,7 +12875,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12837 "configure"
 -// #line 12658 "configure"
++// #line 12878 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -12941,7 -12762,7 +12982,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12944 "configure"
 -// #line 12765 "configure"
++// #line 12985 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13049,7 -12870,7 +13090,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13052 "configure"
 -// #line 12873 "configure"
++// #line 13093 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -13156,7 -12977,7 +13197,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13159 "configure"
 -// #line 12980 "configure"
++// #line 13200 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -13370,7 -13191,7 +13411,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13373 "configure"
 -// #line 13194 "configure"
++// #line 13414 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -13533,7 -13354,7 +13574,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13536 "configure"
 -// #line 13357 "configure"
++// #line 13577 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13640,7 -13461,7 +13681,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13643 "configure"
 -// #line 13464 "configure"
++// #line 13684 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13748,7 -13569,7 +13789,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13751 "configure"
 -// #line 13572 "configure"
++// #line 13792 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -13855,7 -13676,7 +13896,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13858 "configure"
 -// #line 13679 "configure"
++// #line 13899 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -13964,7 -13785,7 +14005,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13967 "configure"
 -// #line 13788 "configure"
++// #line 14008 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -14073,7 -13894,7 +14114,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14076 "configure"
 -// #line 13897 "configure"
++// #line 14117 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -14180,7 -14001,7 +14221,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14183 "configure"
 -// #line 14004 "configure"
++// #line 14224 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14287,7 -14108,7 +14328,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14290 "configure"
 -// #line 14111 "configure"
++// #line 14331 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14381,7 -14202,7 +14422,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14384 "configure"
 -// #line 14205 "configure"
++// #line 14425 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14435 "configure"
 -// #line 14256 "configure"
++// #line 14476 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -14505,7 -14326,7 +14546,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14508 "configure"
 -// #line 14329 "configure"
++// #line 14549 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -14612,7 -14433,7 +14653,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14615 "configure"
 -// #line 14436 "configure"
++// #line 14656 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -14719,7 -14540,7 +14760,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14722 "configure"
 -// #line 14543 "configure"
++// #line 14763 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -14826,7 -14647,7 +14867,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14829 "configure"
 -// #line 14650 "configure"
++// #line 14870 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14933,7 -14754,7 +14974,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14936 "configure"
 -// #line 14757 "configure"
++// #line 14977 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15044,7 -14865,7 +15085,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15047 "configure"
 -// #line 14868 "configure"
++// #line 15088 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -15151,7 -14972,7 +15192,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15154 "configure"
 -// #line 14975 "configure"
++// #line 15195 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15245,7 -15066,7 +15286,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15248 "configure"
 -// #line 15069 "configure"
++// #line 15289 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 15299 "configure"
 -// #line 15120 "configure"
++// #line 15340 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15375,7 -15196,7 +15416,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15378 "configure"
 -// #line 15199 "configure"
++// #line 15419 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -15482,7 -15303,7 +15523,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15485 "configure"
 -// #line 15306 "configure"
++// #line 15526 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -15589,7 -15410,7 +15630,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15592 "configure"
 -// #line 15413 "configure"
++// #line 15633 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -15696,7 -15517,7 +15737,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15699 "configure"
 -// #line 15520 "configure"
++// #line 15740 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -15803,7 -15624,7 +15844,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15806 "configure"
 -// #line 15627 "configure"
++// #line 15847 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -15910,7 -15731,7 +15951,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15913 "configure"
 -// #line 15734 "configure"
++// #line 15954 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -16017,7 -15838,7 +16058,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16020 "configure"
 -// #line 15841 "configure"
++// #line 16061 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -24056,7 -23372,7 +23592,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 24059 "configure"
 -#line 23375 "configure"
++#line 23595 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24366,7 -23682,7 +23902,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 24369 "configure"
 -#line 23685 "configure"
++#line 23905 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -24947,7 -24263,7 +24483,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24950 "configure"
 -// #line 24266 "configure"
++// #line 24486 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25054,7 -24370,7 +24590,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25057 "configure"
 -// #line 24373 "configure"
++// #line 24593 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31364 "configure"
 -#line 30680 "configure"
++#line 30900 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31470 "configure"
 -#line 30786 "configure"
++#line 31006 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -37594,7 -37176,7 +37396,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -157,11 -158,11 +158,11 @@@ ETAGS = etag
  CTAGS = ctags
  DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
        api_scilab dynamic_link fileio history_manager spreadsheet \
 -      tclsci localization commons jvm action_binding renderer \
 -      completion console graphic_export gui graphics optimization \
 -      symbolic randlib statistics special_functions interpolation \
 -      linear_algebra integer data_structures mexlib \
 +      tclsci localization commons jvm action_binding graphic_objects \
 +      renderer completion console graphic_export gui graphics \
 +      optimization symbolic randlib statistics special_functions \
 +      interpolation linear_algebra integer data_structures mexlib \
-       differential_equations cacsd polynomials boolean double pvm io \
+       differential_equations cacsd polynomials boolean double io \
        intersci signal_processing core call_scilab sound time sparse \
        windows_tools functions overloading maple2scilab m2sci texmacs \
        development_tools compatibility_functions helptools fftw \
@@@ -451,11 -446,11 +447,11 @@@ top_builddir = @top_builddir
  top_srcdir = @top_srcdir@
  SUBDIRS = output_stream arnoldi elementary_functions string api_scilab \
        dynamic_link fileio history_manager spreadsheet tclsci \
 -      localization commons jvm action_binding renderer completion \
 -      console graphic_export gui graphics optimization symbolic \
 -      randlib statistics special_functions interpolation \
 -      linear_algebra integer data_structures mexlib \
 +      localization commons jvm action_binding graphic_objects \
 +      renderer completion console graphic_export gui graphics \
 +      optimization symbolic randlib statistics special_functions \
 +      interpolation linear_algebra integer data_structures mexlib \
-       differential_equations cacsd polynomials boolean double pvm io \
+       differential_equations cacsd polynomials boolean double io \
        intersci signal_processing core call_scilab interpolation \
        sound time randlib sparse windows_tools functions overloading \
        maple2scilab m2sci texmacs development_tools \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Message>Make dependencies</Message>
-       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL</Command>
-     </PreLinkEvent>
+       <Message>
+       </Message>
+       </PreLinkEvent>
      <Link>
        <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Message>Make dependencies</Message>
-       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL</Command>
-     </PreLinkEvent>
+       <Message>
+       </Message>
+       </PreLinkEvent>
      <Link>
        <AdditionalDependencies>LibScilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
-       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -89,7 -89,7 +89,8 @@@
  /* 65 */                                              #include "dynamic_gateways.h" /* action_binding */
  /* 66 */                        #include "dynamic_parallel.h" /* parallel */
  /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
- /* 68 */                                              #include "dynamic_gateways.h" /* graphic_objects */
+ /* 68 */                        #include "dynamic_gateways.h" /* xml */
++/* 69 */                                              #include "dynamic_gateways.h" /* graphic_objects */
  
  
  
@@@ -34,7 -34,7 +34,7 @@@ jmp_buf jmp_env
   ** Watch out the positions are crutial !!!
   ** @TODO : Make this less crappy...
   **/
--#define INTERFACES_MAX 68
++#define INTERFACES_MAX 69
  static OpTab Interfaces[INTERFACES_MAX] = {
      /* 01  */ {gw_user}, /* free position may be used */
      /* 02  */ {gw_linear_algebra},
      /* 64  */ {gw_dynamic_xcos},
      /* 65  */ {gw_dynamic_action_binding},
      /* 66  */ {gw_dynamic_parallel},
-       /* 67  */ {gw_dynamic_ui_data},
-       /* 68  */ {gw_dynamic_graphic_objects}
+     /* 67  */ {gw_dynamic_ui_data},
 -    /* 68  */ {gw_dynamic_xml}
++    /* 68  */ {gw_dynamic_xml},
++    /* 69  */ {gw_dynamic_graphic_objects}
  };
  /*--------------------------------------------------------------------------*/
  /**
@@@ -401,29 -385,22 +385,45 @@@ int gw_dynamic_ui_data(void
          &ptr_gw_ui_data);
  }
  /*--------------------------------------------------------------------------*/
+ /* xml module */
+ #define XML_MODULE_NAME "xml"
+ static DynLibHandle hXmlLib = NULL;
+ static PROC_GATEWAY ptr_gw_xml = NULL;
+ static char* dynlibname_xml = NULL;
+ static char* gatewayname_xml = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_xml(void)
+ {
+     return gw_dynamic_generic(XML_MODULE_NAME,
+         &dynlibname_xml,
+         &gatewayname_xml,
+         &hXmlLib,
+         &ptr_gw_xml);
+ }
+ /*--------------------------------------------------------------------------*/
 +/* graphic_objects module */
 +#define GRAPHIC_OBJECTS_MODULE_NAME "graphic_objects"
 +static DynLibHandle hGraphic_objectsLib = NULL;
 +static PROC_GATEWAY ptr_gw_graphic_objects = NULL;
 +static char* dynlibname_graphic_objects = NULL;
 +static char* gatewayname_graphic_objects = NULL;
 +/*--------------------------------------------------------------------------*/
 +int gw_dynamic_graphic_objects(void)
 +{
 +#ifdef _MSC_VER
-       if (dynlibname_graphic_objects == NULL)
-       {
-               dynlibname_graphic_objects = buildModuleDynLibraryName(GRAPHIC_OBJECTS_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-       }
++    if (dynlibname_graphic_objects == NULL)
++    {
++        dynlibname_graphic_objects = buildModuleDynLibraryName(GRAPHIC_OBJECTS_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
++    }
 +#endif
 +
-       return gw_dynamic_generic(GRAPHIC_OBJECTS_MODULE_NAME,
-               &dynlibname_graphic_objects,
-               &gatewayname_graphic_objects,
-               &hGraphic_objectsLib,
-               &ptr_gw_graphic_objects);
++    return gw_dynamic_generic(GRAPHIC_OBJECTS_MODULE_NAME,
++                              &dynlibname_graphic_objects,
++                              &gatewayname_graphic_objects,
++                              &hGraphic_objectsLib,
++                              &ptr_gw_graphic_objects);
 +}
 +/*--------------------------------------------------------------------------*/
  void freeAllDynamicGateways(void)
  {
      freeDynamicGateway(&dynlibname_special_functions,
          &hUi_dataLib,
          &ptr_gw_ui_data);
  
+     freeDynamicGateway(&dynlibname_xml,
+         &gatewayname_xml,
+         &hXmlLib,
+         &ptr_gw_xml);
++
 +    freeDynamicGateway(&dynlibname_graphic_objects,
 +        &gatewayname_graphic_objects,
 +        &hGraphic_objectsLib,
 +        &ptr_gw_graphic_objects);
  }
  /*--------------------------------------------------------------------------*/
  
@@@ -22,11 -22,11 +22,12 @@@ import org.flexdock.docking.DockingCons
  
  import org.scilab.modules.commons.ScilabConstants;
  import org.scilab.modules.jvm.LoadClassPath;
++import org.scilab.modules.graphic_objects.graphicObject.CallBack;
 +import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
 +import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
  import org.scilab.modules.gui.console.ScilabConsole;
--import org.scilab.modules.gui.events.callback.CallBack;
++import org.scilab.modules.gui.events.callback.CommonCallBack;
  import org.scilab.modules.gui.menubar.MenuBar;
 -import org.scilab.modules.gui.tab.ScilabTab;
 -import org.scilab.modules.gui.tab.Tab;
  import org.scilab.modules.gui.textbox.ScilabTextBox;
  import org.scilab.modules.gui.textbox.TextBox;
  import org.scilab.modules.gui.toolbar.ToolBar;
@@@ -178,9 -180,9 +179,9 @@@ public class Scilab 
                  /* CONSOLE */
                  /* Create a tab to put console into */
                  LoadClassPath.loadOnUse("Console");
 -                consoleTab = ScilabTab.createTab(Messages.gettext("Scilab Console"));
 +                consoleTab = new SwingScilabTab(Messages.gettext("Scilab Console"));
                  /* Exit Scilab when the console is closed */
--                consoleTab.setCallback(CallBack.createCallback("exit();", CallBack.SCILAB_INSTRUCTION));
++                consoleTab.setCallback(CommonCallBack.createCallback("exit();", CallBack.SCILAB_INSTRUCTION));
  
                  ScilabConsole.createConsole();
              } catch (NoClassDefFoundError exception) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -35,205 -37,191 +35,195 @@@ static BOOL isVectorialExport(ExportFil
  /*--------------------------------------------------------------------------*/
  int xs2file(char * fname, ExportFileType fileType )
  {
 -  /* Check input and output sizes */
 -  CheckLhs(0,1);
 -  if (isVectorialExport(fileType) || fileType == JPG_EXPORT)
 +    // FIXME
 +    abort();
 +#if 0
-   /* Check input and output sizes */
-   CheckLhs(0,1);
-   if (isVectorialExport(fileType) || fileType == JPG_EXPORT)
++    /* Check input and output sizes */
++    CheckLhs(0,1);
++    if (isVectorialExport(fileType) || fileType == JPG_EXPORT)
      {
--      CheckRhs(2,3);
++        CheckRhs(2,3);
      }
--  else
++    else
      {
--      CheckRhs(2,2);
++        CheckRhs(2,2);
      }
  
--  if (GetType(1) != sci_matrix && GetType(1) != sci_handles)
++    if (GetType(1) != sci_matrix && GetType(1) != sci_handles)
      {
--      Scierror(999,_("%s: Wrong type for input argument #%d: An integer or a handle expected.\n"),fname, 1);
--      LhsVar(1) = 0;
-       C2F(putlhsvar)();
-       return 0;
 -      PutLhsVar();
 -      return 0;
++        Scierror(999,_("%s: Wrong type for input argument #%d: An integer or a handle expected.\n"),fname, 1);
++        LhsVar(1) = 0;
++        PutLhsVar();
++        return 0;
      }
  
--  if ( (GetType(2) == sci_strings) )
 -    { 
 -      char **fileName = NULL;
 -      char *real_filename = NULL;
 -      float jpegCompressionQuality = 0.95f;
 -      ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
 -      long int lout = 0;
 -      int out_n = 0;
 -      int m1 = 0, n1 = 0, l1 = 0;
 -      int figurenum = -1;
 -      sciPointObj* figurePtr = NULL;
 -      char *status = NULL;
 -
 -      /* get handle by figure number */
 -      if(GetType(1) == sci_matrix)
 -      {
 -        GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
 -        if(m1*n1 != 1)
 -          {
 -            Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);        
 -            return 0;
 -          }
 -
 -        figurenum = *istk(l1);
 -        if (!sciIsExistingFigure(figurenum))
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
 -            return 0;
 -          }
 -        figurePtr = getFigureFromIndex(figurenum);
 -      }
 -      /* check given handle */
 -      if(GetType(1) == sci_handles)
 -      {
 -        GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&m1,&n1,&l1);
 -        if(m1*n1 != 1)
 -          {
 -            Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);        
 -            return 0;
 -          }
 -        figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
 -
 -        if(figurePtr == NULL)
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
 -            return 0;        
 -          }
 -        startFigureDataReading(figurePtr);
 -        if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
 -            return 0;        
 -          }
 -        endFigureDataReading(figurePtr);
 -      }
 -
 -      /* get file name */
 -      GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&fileName);
 -      if (m1*n1 == 1)
 -      {
 -        if (Rhs == 3)
 -          {
 -            int nbCol = 0;
 -            int nbRow = 0;
 -            
 -            if (isVectorialExport(fileType))
 -              {
 -
 -                char **sciOrientation = NULL;
 -                
 -                if (GetType(3) != sci_strings)
 -                  {
 -                    freeArrayOfString(fileName,m1*n1);
 -                    Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -                
 -                GetRhsVar(3,MATRIX_OF_STRING_DATATYPE,&nbRow,&nbCol,&sciOrientation);
 -                if (nbRow*nbCol == 1)
 -                  {
 -                    /* Value should be 'landscape' or 'portrait' but check only the first character */
 -                    /* for compatibility with Scilab 4*/
 -                    if (strcmp(sciOrientation[0], "landscape") == 0 || strcmp(sciOrientation[0], "l") == 0)
 -                      {
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        orientation = EXPORT_LANDSCAPE;
 -                      }
 -                    else if(strcmp(sciOrientation[0], "portrait") == 0 || strcmp(sciOrientation[0], "p") == 0)
 -                      {
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        orientation = EXPORT_PORTRAIT;
 -                      }
 -                    else
 -                      {
 -                        freeArrayOfString(fileName,m1*n1);
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
 -                        return 0;
 -                      }
 -                  }
 -                else
 -                  {
 -                    freeArrayOfString(fileName,m1*n1);
 -                    freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                    Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -              }
 -            else
 -              {
 -                int quality = 0;
 -                GetRhsVar(3, MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &quality);
 -                if (nbRow != 1 || nbCol != 1 || *stk(quality) < 0 || *stk(quality) > 1)
 -                  {
 -                    freeArrayOfString(fileName, m1 * n1);
 -                    Scierror(999,_("%s: Wrong type for input argument #%d: A real between 0 and 1 expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -                jpegCompressionQuality = (float) *stk(quality);
 -              }
 -          }
 -
 -        /* Replaces SCI, ~, HOME, TMPDIR by the real path */
 -        real_filename = expandPathVariable(fileName[0]);
 -
 -        /* Call the function for exporting file */
 -        status = exportToFile(figurePtr, real_filename, fileType, jpegCompressionQuality, orientation);
 -        
 -        /* free pointers no more used */
 -        if (real_filename)
 -          {
 -            FREE(real_filename);
 -            real_filename = NULL;
 -          }
 -        freeArrayOfString(fileName,m1*n1);
 -
 -        /* treat errors */
 -        if (strlen(status) != 0)
 -        { 
 -            Scierror(999,_("%s: %s\n"), fname, status);
 -            return 0;
 -        }
 -      }
 -      else
 -      {
 -        freeArrayOfString(fileName,m1*n1);
 -        Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 2);
 -        return 0;
 -      }
++    if ( (GetType(2) == sci_strings) )
 +    {
-       char **fileName = NULL;
-       char *real_filename = NULL;
-       float jpegCompressionQuality = 0.95f;
-       ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
-       long int lout = 0;
-       int out_n = 0;
-       int m1 = 0, n1 = 0, l1 = 0;
-       int figurenum = -1;
-       sciPointObj* figurePtr = NULL;
-       char *status = NULL;
-       /* get handle by figure number */
-       if(GetType(1) == sci_matrix)
-       {
-         GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
-         if(m1*n1 != 1)
-           {
-             Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
-             return 0;
-           }
-         figurenum = *istk(l1);
-         if (!sciIsExistingFigure(figurenum))
-           {
-             Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
-             return 0;
-           }
-         figurePtr = getFigureFromIndex(figurenum);
-       }
-       /* check given handle */
-       if(GetType(1) == sci_handles)
-       {
-         GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&m1,&n1,&l1);
-         if(m1*n1 != 1)
-           {
-             Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
-             return 0;
-           }
-         figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
-         if(figurePtr == NULL)
-           {
-             Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
-             return 0;
-           }
-         startFigureDataReading(figurePtr);
-         if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
-           {
-             Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
-             LhsVar(1) = 0;
-             C2F(putlhsvar)();
-             return 0;
-           }
-         endFigureDataReading(figurePtr);
-       }
-       /* get file name */
-       GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&fileName);
-       if (m1*n1 == 1)
-       {
-         if (Rhs == 3)
-           {
-             int nbCol = 0;
-             int nbRow = 0;
-             if (isVectorialExport(fileType))
-               {
-                 char **sciOrientation = NULL;
-                 if (GetType(3) != sci_strings)
-                   {
-                     freeArrayOfString(fileName,m1*n1);
-                     Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 3);
-                     return 0;
-                   }
-                 GetRhsVar(3,MATRIX_OF_STRING_DATATYPE,&nbRow,&nbCol,&sciOrientation);
-                 if (nbRow*nbCol == 1)
-                   {
-                     /* Value should be 'landscape' or 'portrait' but check only the first character */
-                     /* for compatibility with Scilab 4*/
-                     if (strcmp(sciOrientation[0], "landscape") == 0 || strcmp(sciOrientation[0], "l") == 0)
-                       {
-                         freeArrayOfString(sciOrientation,nbRow*nbCol);
-                         orientation = EXPORT_LANDSCAPE;
-                       }
-                     else if(strcmp(sciOrientation[0], "portrait") == 0 || strcmp(sciOrientation[0], "p") == 0)
-                       {
-                         freeArrayOfString(sciOrientation,nbRow*nbCol);
-                         orientation = EXPORT_PORTRAIT;
-                       }
-                     else
-                       {
-                         freeArrayOfString(fileName,m1*n1);
-                         freeArrayOfString(sciOrientation,nbRow*nbCol);
-                         Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
-                         return 0;
-                       }
-                   }
-                 else
-                   {
-                     freeArrayOfString(fileName,m1*n1);
-                     freeArrayOfString(sciOrientation,nbRow*nbCol);
-                     Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 3);
-                     return 0;
-                   }
-               }
-             else
-               {
-                 int quality = 0;
-                 GetRhsVar(3, MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &quality);
-                 if (nbRow != 1 || nbCol != 1 || *stk(quality) < 0 || *stk(quality) > 1)
-                   {
-                     freeArrayOfString(fileName, m1 * n1);
-                     Scierror(999,_("%s: Wrong type for input argument #%d: A real between 0 and 1 expected.\n"),fname, 3);
-                     return 0;
-                   }
-                 jpegCompressionQuality = (float) *stk(quality);
-               }
-           }
-         /* Replaces SCI, ~, HOME, TMPDIR by the real path */
-         real_filename = expandPathVariable(fileName[0]);
-         /* Call the function for exporting file */
-         status = exportToFile(figurePtr, real_filename, fileType, jpegCompressionQuality, orientation);
-         /* free pointers no more used */
-         if (real_filename)
-           {
-             FREE(real_filename);
-             real_filename = NULL;
-           }
-         freeArrayOfString(fileName,m1*n1);
-         /* treat errors */
-         if (strlen(status) != 0)
-         {
-             Scierror(999,_("%s: %s\n"), fname, status);
-             return 0;
-         }
-       }
-       else
-       {
-         freeArrayOfString(fileName,m1*n1);
-         Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 2);
-         return 0;
-       }
++        char **fileName = NULL;
++        char *real_filename = NULL;
++        float jpegCompressionQuality = 0.95f;
++        ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
++        long int lout = 0;
++        int out_n = 0;
++        int m1 = 0, n1 = 0, l1 = 0;
++        int figurenum = -1;
++        sciPointObj* figurePtr = NULL;
++        char *status = NULL;
++
++        /* get handle by figure number */
++        if(GetType(1) == sci_matrix)
++        {
++            GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
++            if(m1*n1 != 1)
++            {
++                Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);
++                return 0;
++            }
++
++            figurenum = *istk(l1);
++            if (!sciIsExistingFigure(figurenum))
++            {
++                Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
++                return 0;
++            }
++            figurePtr = getFigureFromIndex(figurenum);
++        }
++        /* check given handle */
++        if(GetType(1) == sci_handles)
++        {
++            GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&m1,&n1,&l1);
++            if(m1*n1 != 1)
++            {
++                Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);
++                return 0;
++            }
++            figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
++
++            if(figurePtr == NULL)
++            {
++                Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
++                return 0;
++            }
++            startFigureDataReading(figurePtr);
++            if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
++            {
++                Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
++                return 0;
++            }
++            endFigureDataReading(figurePtr);
++        }
++
++        /* get file name */
++        GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&fileName);
++        if (m1*n1 == 1)
++        {
++            if (Rhs == 3)
++            {
++                int nbCol = 0;
++                int nbRow = 0;
++
++                if (isVectorialExport(fileType))
++                {
++
++                    char **sciOrientation = NULL;
++
++                    if (GetType(3) != sci_strings)
++                    {
++                        freeArrayOfString(fileName,m1*n1);
++                        Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 3);
++                        return 0;
++                    }
++
++                    GetRhsVar(3,MATRIX_OF_STRING_DATATYPE,&nbRow,&nbCol,&sciOrientation);
++                    if (nbRow*nbCol == 1)
++                    {
++                        /* Value should be 'landscape' or 'portrait' but check only the first character */
++                        /* for compatibility with Scilab 4*/
++                        if (strcmp(sciOrientation[0], "landscape") == 0 || strcmp(sciOrientation[0], "l") == 0)
++                        {
++                            freeArrayOfString(sciOrientation,nbRow*nbCol);
++                            orientation = EXPORT_LANDSCAPE;
++                        }
++                        else if(strcmp(sciOrientation[0], "portrait") == 0 || strcmp(sciOrientation[0], "p") == 0)
++                        {
++                            freeArrayOfString(sciOrientation,nbRow*nbCol);
++                            orientation = EXPORT_PORTRAIT;
++                        }
++                        else
++                        {
++                            freeArrayOfString(fileName,m1*n1);
++                            freeArrayOfString(sciOrientation,nbRow*nbCol);
++                            Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
++                            return 0;
++                        }
++                    }
++                    else
++                    {
++                        freeArrayOfString(fileName,m1*n1);
++                        freeArrayOfString(sciOrientation,nbRow*nbCol);
++                        Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 3);
++                        return 0;
++                    }
++                }
++                else
++                {
++                    int quality = 0;
++                    GetRhsVar(3, MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &quality);
++                    if (nbRow != 1 || nbCol != 1 || *stk(quality) < 0 || *stk(quality) > 1)
++                    {
++                        freeArrayOfString(fileName, m1 * n1);
++                        Scierror(999,_("%s: Wrong type for input argument #%d: A real between 0 and 1 expected.\n"),fname, 3);
++                        return 0;
++                    }
++                    jpegCompressionQuality = (float) *stk(quality);
++                }
++            }
++
++            /* Replaces SCI, ~, HOME, TMPDIR by the real path */
++            real_filename = expandPathVariable(fileName[0]);
++
++            /* Call the function for exporting file */
++            status = exportToFile(figurePtr, real_filename, fileType, jpegCompressionQuality, orientation);
++
++            /* free pointers no more used */
++            if (real_filename)
++            {
++                FREE(real_filename);
++                real_filename = NULL;
++            }
++            freeArrayOfString(fileName,m1*n1);
++
++            /* treat errors */
++            if (strlen(status) != 0)
++            {
++                Scierror(999,_("%s: %s\n"), fname, status);
++                return 0;
++            }
++        }
++        else
++        {
++            freeArrayOfString(fileName,m1*n1);
++            Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 2);
++            return 0;
++        }
      }
--  else
++    else
      {
--      Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 2);
--      return 0;
++        Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 2);
++        return 0;
      }
  
--  LhsVar(1) = 0;
-   C2F(putlhsvar)();
 -  PutLhsVar();
 -  return 0;
++    LhsVar(1) = 0;
++    PutLhsVar();
 +#endif
-   return 0;
++    return 0;
  }
  /*--------------------------------------------------------------------------*/
  static BOOL isVectorialExport(ExportFileType fileType)
  {
--  return fileType == EPS_EXPORT
--    || fileType == PS_EXPORT
--    || fileType == PDF_EXPORT
--    || fileType == SVG_EXPORT;
++    return fileType == EPS_EXPORT
++        || fileType == PS_EXPORT
++        || fileType == PDF_EXPORT
++        || fileType == SVG_EXPORT;
  }
  /*--------------------------------------------------------------------------*/
index 1df8b33,0000000..8894de8
mode 100644,000000..100644
--- /dev/null
@@@ -1,1550 -1,0 +1,1551 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +#
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) DIGITEO - 2010 - Allan CORNET
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +#
 +
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 +# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be usefull in every makefile.am
 +##########
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 +      $(top_srcdir)/Makefile.incl.am
 +@NEED_JAVA_TRUE@am__append_1 = java
 +@GIWS_TRUE@am__append_2 = giws
 +@GUI_TRUE@am__append_3 = libscigraphic_objects.la
 +@SWIG_TRUE@am__append_4 = swig
 +subdir = modules/graphic_objects
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
-       $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
-       $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
-       $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++      $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
 +      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 +      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" \
 +      "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" \
 +      "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscigraphic_objects_disable_la_LIBADD =
 +am__objects_1 = libscigraphic_objects_disable_la-nographic_objects.lo
 +am_libscigraphic_objects_disable_la_OBJECTS = $(am__objects_1)
 +libscigraphic_objects_disable_la_OBJECTS =  \
 +      $(am_libscigraphic_objects_disable_la_OBJECTS)
 +libscigraphic_objects_disable_la_LINK = $(LIBTOOL) --tag=CC \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 +      $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) \
 +      $(libscigraphic_objects_disable_la_LDFLAGS) $(LDFLAGS) -o $@
 +libscigraphic_objects_la_DEPENDENCIES =  \
 +      $(top_builddir)/libs/MALLOC/libscimalloc.la \
 +      $(top_builddir)/modules/output_stream/libscioutput_stream.la
 +am__objects_2 = libscigraphic_objects_la-DataLoader_wrap.lo \
 +      libscigraphic_objects_la-ScilabNativeView_wrap.lo
 +am__objects_3 = libscigraphic_objects_la-CallGraphicController.lo
 +am__objects_4 = libscigraphic_objects_la-gw_graphic_objects.lo
 +am__objects_5 = libscigraphic_objects_la-sci_graphicfunction.lo
 +am__objects_6 = libscigraphic_objects_la-createGraphicObject.lo \
 +      libscigraphic_objects_la-getGraphicObjectProperty.lo \
 +      libscigraphic_objects_la-setGraphicObjectProperty.lo \
 +      libscigraphic_objects_la-deleteGraphicObject.lo \
 +      libscigraphic_objects_la-dataModel.lo \
 +      libscigraphic_objects_la-Data3D.lo \
 +      libscigraphic_objects_la-DataLoader.lo \
 +      libscigraphic_objects_la-NgonData.lo \
 +      libscigraphic_objects_la-NgonGeneralData.lo \
 +      libscigraphic_objects_la-NgonGridData.lo \
 +      libscigraphic_objects_la-NgonGridMatplotData.lo \
 +      libscigraphic_objects_la-NgonPolylineData.lo \
 +      libscigraphic_objects_la-TriangleMeshData.lo \
 +      libscigraphic_objects_la-TriangleMeshFecData.lo \
 +      libscigraphic_objects_la-ColorComputer.lo \
 +      libscigraphic_objects_la-DecompositionUtils.lo \
 +      libscigraphic_objects_la-Fac3DColorComputer.lo \
 +      libscigraphic_objects_la-Fac3DDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridDataDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo \
 +      libscigraphic_objects_la-Plot3DDecomposer.lo \
 +      libscigraphic_objects_la-PolylineDecomposer.lo \
 +      libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo \
 +      libscigraphic_objects_la-ScilabView.lo \
 +      libscigraphic_objects_la-FigureList.lo \
 +      libscigraphic_objects_la-HandleManagement.lo \
 +      libscigraphic_objects_la-AxesModel.lo \
 +      libscigraphic_objects_la-FigureModel.lo \
 +      libscigraphic_objects_la-CurrentFigure.lo \
 +      libscigraphic_objects_la-CurrentObject.lo \
 +      libscigraphic_objects_la-CurrentSubwin.lo
 +am_libscigraphic_objects_la_OBJECTS = $(am__objects_2) \
 +      $(am__objects_3) $(am__objects_4) $(am__objects_5) \
 +      $(am__objects_6)
 +libscigraphic_objects_la_OBJECTS =  \
 +      $(am_libscigraphic_objects_la_OBJECTS)
 +libscigraphic_objects_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(AM_CXXFLAGS) $(CXXFLAGS) $(libscigraphic_objects_la_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +@GUI_TRUE@am_libscigraphic_objects_la_rpath = -rpath $(pkglibdir)
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscigraphic_objects_disable_la_SOURCES) \
 +      $(libscigraphic_objects_la_SOURCES)
 +DIST_SOURCES = $(libscigraphic_objects_disable_la_SOURCES) \
 +      $(libscigraphic_objects_la_SOURCES)
 +DATA = $(libscigraphic_objects_la_etc_DATA) \
 +      $(libscigraphic_objects_la_root_DATA) \
 +      $(libscigraphic_objects_la_sci_gateway_DATA)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOGGING_LEVEL = @LOGGING_LEVEL@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
- PVMGETARCH = @PVMGETARCH@
- PVM_ARCH = @PVM_ARCH@
- PVM_ENABLE = @PVM_ENABLE@
- PVM_INCLUDE = @PVM_INCLUDE@
- PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
 +SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
 +SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SCIRENDERER = @SCIRENDERER@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +
 +#### Target ######
 +modulename = graphic_objects
 +
 +#### graphic_objects : Conf files ####
 +libscigraphic_objects_la_rootdir = $(mydatadir)
 +libscigraphic_objects_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 +
 +#### graphic_objects : init scripts ####
 +libscigraphic_objects_la_etcdir = $(mydatadir)/etc
 +libscigraphic_objects_la_etc_DATA = etc/graphic_objects.quit \
 +                              etc/graphic_objects.start
 +
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# splint options
 +SPLINT_OPTIONS = -weak -booltype BOOL
 +
 +########################### JAVA ######################################
 +#### We are delegating java compilation to ant... Thanks to that
 +#### the procedure will be the same with Microsoft Windows (C)
 +#### and Linux/Unix
 +#######################################################################
 +TARGETS_ALL = $(am__append_1)
 +
 +################ MACROS ######################
 +# Rule to build a macro
 +# NOT USED  AT THE MOMENT
 +SUFFIXES = .sci 
 +
 +########### INSTALL DOCUMENTATION ###################
 +
 +# Install documentation files into the right target
 +# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
 +# automake needs the html files to be present which is not the case when
 +# we are building Scilab
 +
 +# Where it should be installed
 +pkgdocdir = $(mydatadir)
 +
 +# What is the mask of the help source
 +DOCMASKXML = *.xml
 +
 +# What is the mask of the MathML sources
 +DOCMASKMML = *.mml
 +
 +########### INSTALL DATA ###################
 +# Install macros, help & demos
 +# Where it should be installed
 +pkgmacrosdir = $(mydatadir)
 +# Which directory we process
 +MACRODIRS = macros/
 +# Mask of the Scilab sources macros
 +MACROMASK = *.sci
 +# Mask of the Scilab executable sources macros
 +MACROBUILDMASK = *.sce
 +# Mask of the Scilab compiled macros
 +MACROBINMASK = *.bin
 +# List of the standard directory for tests
 +TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 +# Where the demos should be installed
 +pkgdemosdir = $(mydatadir)
 +# List of the standard directory for demos
 +DEMOS_DIR = demos
 +# List of the standard directory for examples
 +EXAMPLES_DIR = examples
 +# Where to export JAVA archives (.jar)
 +JARDIR = jar/
 +# JAR files mask
 +JARMASK = *.jar
 +# Chapter file 
 +HELP_CHAPTERDIR = help/
 +HELP_CHAPTERFILE = addchapter.sce
 +HELP_CHAPTERLANG = en_US fr_FR pt_BR
 +BUILT_SOURCES = includes/graphicObjectsProperties.h $(am__append_2) \
 +      $(am__append_4)
 +#This file is also generated, but can not be listed to prevent GCJ call.
 +#src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
 +GRAPHIC_OBJECTS_JNI_SOURCES = src/jni/CallGraphicController.cpp
 +GRAPHIC_OBJECTS_C_SOURCES = src/jni/DataLoader_wrap.c \
 +                                                      src/jni/ScilabNativeView_wrap.c
 +
 +GRAPHIC_OBJECTS_CPP_SOURCES = src/cpp/createGraphicObject.cpp \
 +                                                              src/cpp/getGraphicObjectProperty.cpp \
 +                                                              src/cpp/setGraphicObjectProperty.cpp \
 +                                                              src/cpp/deleteGraphicObject.cpp \
 +                                                              src/cpp/dataModel.cpp \
 +                                                              src/cpp/Data3D.cpp \
 +                                                              src/cpp/DataLoader.cpp \
 +                                                              src/cpp/NgonData.cpp \
 +                                                              src/cpp/NgonGeneralData.cpp \
 +                                                              src/cpp/NgonGridData.cpp \
 +                                                              src/cpp/NgonGridMatplotData.cpp \
 +                                                              src/cpp/NgonPolylineData.cpp \
 +                                                              src/cpp/TriangleMeshData.cpp \
 +                                                              src/cpp/TriangleMeshFecData.cpp \
 +                                                              src/cpp/ColorComputer.cpp \
 +                                                              src/cpp/DecompositionUtils.cpp \
 +                                                              src/cpp/Fac3DColorComputer.cpp \
 +                                                              src/cpp/Fac3DDecomposer.cpp \
 +                                                              src/cpp/NgonGridDataDecomposer.cpp \
 +                                                              src/cpp/NgonGridGrayplotDataDecomposer.cpp \
 +                                                              src/cpp/NgonGridMatplotDataDecomposer.cpp \
 +                                                              src/cpp/Plot3DDecomposer.cpp \
 +                                                              src/cpp/PolylineDecomposer.cpp \
 +                                                              src/cpp/TriangleMeshFecDataDecomposer.cpp \
 +                                                              src/cpp/ScilabView.cpp \
 +                                                              src/cpp/FigureList.cpp \
 +                                                              src/cpp/HandleManagement.cpp \
 +                                                              src/cpp/AxesModel.cpp \
 +                                                              src/cpp/FigureModel.cpp \
 +                                                              src/cpp/CurrentFigure.cpp \
 +                                                              src/cpp/CurrentObject.cpp \
 +                                                              src/cpp/CurrentSubwin.cpp
 +
 +GIWS_WRAPPERS = src/jni/graphic_objects.giws.xml
 +GATEWAY_C_SOURCES = sci_gateway/c/gw_graphic_objects.c
 +GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_graphicfunction.cpp
 +libscigraphic_objects_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 +                      -I$(top_srcdir)/libs/MALLOC/includes/ \
 +                      -I$(top_srcdir)/modules/jvm/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes \
 +                      -I$(top_srcdir)/modules/localization/includes \
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/core/includes
 +
 +libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 +                      -I$(srcdir)/includes/ \
 +                      -I$(srcdir)/src/cpp/ \
 +                      -I$(srcdir)/src/c/ \
 +                      -I$(srcdir)/src/jni/ \
 +                      -I$(top_srcdir)/modules/jvm/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes \
 +                      -I$(top_srcdir)/modules/localization/includes \
 +                      -I$(top_srcdir)/modules/api_scilab/includes
 +
 +
 +# Without the graphic_objects module
 +libscigraphic_objects_disable_la_CFLAGS = -Iincludes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes
 +
 +GRAPHIC_OBJECTS_DISABLE_C_SOURCES = src/nographic_objects/nographic_objects.c
 +libscigraphic_objects_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 +libscigraphic_objects_disable_la_SOURCES = $(GRAPHIC_OBJECTS_DISABLE_C_SOURCES)
 +pkglib_LTLIBRARIES = libscigraphic_objects-disable.la $(am__append_3)
 +libscigraphic_objects_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) $(X_LIBS) $(X_EXTRA_LIBS)
 +libscigraphic_objects_la_SOURCES = $(GRAPHIC_OBJECTS_GEN_SOURCES) $(GRAPHIC_OBJECTS_C_SOURCES) $(GRAPHIC_OBJECTS_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(GRAPHIC_OBJECTS_CPP_SOURCES)
 +
 +# For the code check (splint)
 +CHECK_SRC = $(GRAPHIC_OBJECTS_C_SOURCES) $(GATEWAY_C_SOURCES)
 +INCLUDE_FLAGS = $(libscigraphic_objects_la_CFLAGS)
 +
 +#### SWIG Declaration ####
 +SWIG_WRAPPERS = src/jni/DataLoader.i \
 +                              src/jni/ScilabNativeView.i
 +
 +libscigraphic_objects_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
 +$(top_builddir)/modules/output_stream/libscioutput_stream.la
 +
 +
 +#### graphic_objects : gateway declaration ####
 +libscigraphic_objects_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 +libscigraphic_objects_la_sci_gateway_DATA = sci_gateway/graphic_objects_gateway.xml
 +@GUI_TRUE@USEANT = 1
 +all: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/graphic_objects/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/graphic_objects/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libscigraphic_objects-disable.la: $(libscigraphic_objects_disable_la_OBJECTS) $(libscigraphic_objects_disable_la_DEPENDENCIES) 
 +      $(libscigraphic_objects_disable_la_LINK) -rpath $(pkglibdir) $(libscigraphic_objects_disable_la_OBJECTS) $(libscigraphic_objects_disable_la_LIBADD) $(LIBS)
 +libscigraphic_objects.la: $(libscigraphic_objects_la_OBJECTS) $(libscigraphic_objects_la_DEPENDENCIES) 
 +      $(libscigraphic_objects_la_LINK) $(am_libscigraphic_objects_la_rpath) $(libscigraphic_objects_la_OBJECTS) $(libscigraphic_objects_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-AxesModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ColorComputer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Data3D.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DataLoader.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-FigureList.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-dataModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Plo@am__quote@
 +
 +.c.o:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@  $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
 +
 +libscigraphic_objects_disable_la-nographic_objects.lo: src/nographic_objects/nographic_objects.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_disable_la-nographic_objects.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Tpo -c -o libscigraphic_objects_disable_la-nographic_objects.lo `test -f 'src/nographic_objects/nographic_objects.c' || echo '$(srcdir)/'`src/nographic_objects/nographic_objects.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Tpo $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/nographic_objects/nographic_objects.c' object='libscigraphic_objects_disable_la-nographic_objects.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_disable_la-nographic_objects.lo `test -f 'src/nographic_objects/nographic_objects.c' || echo '$(srcdir)/'`src/nographic_objects/nographic_objects.c
 +
 +libscigraphic_objects_la-DataLoader_wrap.lo: src/jni/DataLoader_wrap.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-DataLoader_wrap.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Tpo -c -o libscigraphic_objects_la-DataLoader_wrap.lo `test -f 'src/jni/DataLoader_wrap.c' || echo '$(srcdir)/'`src/jni/DataLoader_wrap.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Tpo $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/jni/DataLoader_wrap.c' object='libscigraphic_objects_la-DataLoader_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-DataLoader_wrap.lo `test -f 'src/jni/DataLoader_wrap.c' || echo '$(srcdir)/'`src/jni/DataLoader_wrap.c
 +
 +libscigraphic_objects_la-ScilabNativeView_wrap.lo: src/jni/ScilabNativeView_wrap.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-ScilabNativeView_wrap.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Tpo -c -o libscigraphic_objects_la-ScilabNativeView_wrap.lo `test -f 'src/jni/ScilabNativeView_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabNativeView_wrap.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Tpo $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/jni/ScilabNativeView_wrap.c' object='libscigraphic_objects_la-ScilabNativeView_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-ScilabNativeView_wrap.lo `test -f 'src/jni/ScilabNativeView_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabNativeView_wrap.c
 +
 +libscigraphic_objects_la-gw_graphic_objects.lo: sci_gateway/c/gw_graphic_objects.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-gw_graphic_objects.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/gw_graphic_objects.c' object='libscigraphic_objects_la-gw_graphic_objects.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libscigraphic_objects_la-CallGraphicController.lo: src/jni/CallGraphicController.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CallGraphicController.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Tpo -c -o libscigraphic_objects_la-CallGraphicController.lo `test -f 'src/jni/CallGraphicController.cpp' || echo '$(srcdir)/'`src/jni/CallGraphicController.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Tpo $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/jni/CallGraphicController.cpp' object='libscigraphic_objects_la-CallGraphicController.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CallGraphicController.lo `test -f 'src/jni/CallGraphicController.cpp' || echo '$(srcdir)/'`src/jni/CallGraphicController.cpp
 +
 +libscigraphic_objects_la-sci_graphicfunction.lo: sci_gateway/cpp/sci_graphicfunction.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-sci_graphicfunction.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='sci_gateway/cpp/sci_graphicfunction.cpp' object='libscigraphic_objects_la-sci_graphicfunction.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
 +
 +libscigraphic_objects_la-createGraphicObject.lo: src/cpp/createGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-createGraphicObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo -c -o libscigraphic_objects_la-createGraphicObject.lo `test -f 'src/cpp/createGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/createGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/createGraphicObject.cpp' object='libscigraphic_objects_la-createGraphicObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-createGraphicObject.lo `test -f 'src/cpp/createGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/createGraphicObject.cpp
 +
 +libscigraphic_objects_la-getGraphicObjectProperty.lo: src/cpp/getGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-getGraphicObjectProperty.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Tpo -c -o libscigraphic_objects_la-getGraphicObjectProperty.lo `test -f 'src/cpp/getGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/getGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Tpo $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/getGraphicObjectProperty.cpp' object='libscigraphic_objects_la-getGraphicObjectProperty.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-getGraphicObjectProperty.lo `test -f 'src/cpp/getGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/getGraphicObjectProperty.cpp
 +
 +libscigraphic_objects_la-setGraphicObjectProperty.lo: src/cpp/setGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-setGraphicObjectProperty.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Tpo -c -o libscigraphic_objects_la-setGraphicObjectProperty.lo `test -f 'src/cpp/setGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/setGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Tpo $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/setGraphicObjectProperty.cpp' object='libscigraphic_objects_la-setGraphicObjectProperty.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-setGraphicObjectProperty.lo `test -f 'src/cpp/setGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/setGraphicObjectProperty.cpp
 +
 +libscigraphic_objects_la-deleteGraphicObject.lo: src/cpp/deleteGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-deleteGraphicObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Tpo -c -o libscigraphic_objects_la-deleteGraphicObject.lo `test -f 'src/cpp/deleteGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/deleteGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Tpo $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/deleteGraphicObject.cpp' object='libscigraphic_objects_la-deleteGraphicObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-deleteGraphicObject.lo `test -f 'src/cpp/deleteGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/deleteGraphicObject.cpp
 +
 +libscigraphic_objects_la-dataModel.lo: src/cpp/dataModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-dataModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-dataModel.Tpo -c -o libscigraphic_objects_la-dataModel.lo `test -f 'src/cpp/dataModel.cpp' || echo '$(srcdir)/'`src/cpp/dataModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-dataModel.Tpo $(DEPDIR)/libscigraphic_objects_la-dataModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/dataModel.cpp' object='libscigraphic_objects_la-dataModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-dataModel.lo `test -f 'src/cpp/dataModel.cpp' || echo '$(srcdir)/'`src/cpp/dataModel.cpp
 +
 +libscigraphic_objects_la-Data3D.lo: src/cpp/Data3D.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Data3D.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Data3D.Tpo -c -o libscigraphic_objects_la-Data3D.lo `test -f 'src/cpp/Data3D.cpp' || echo '$(srcdir)/'`src/cpp/Data3D.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Data3D.Tpo $(DEPDIR)/libscigraphic_objects_la-Data3D.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Data3D.cpp' object='libscigraphic_objects_la-Data3D.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Data3D.lo `test -f 'src/cpp/Data3D.cpp' || echo '$(srcdir)/'`src/cpp/Data3D.cpp
 +
 +libscigraphic_objects_la-DataLoader.lo: src/cpp/DataLoader.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-DataLoader.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DataLoader.Tpo -c -o libscigraphic_objects_la-DataLoader.lo `test -f 'src/cpp/DataLoader.cpp' || echo '$(srcdir)/'`src/cpp/DataLoader.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DataLoader.Tpo $(DEPDIR)/libscigraphic_objects_la-DataLoader.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/DataLoader.cpp' object='libscigraphic_objects_la-DataLoader.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-DataLoader.lo `test -f 'src/cpp/DataLoader.cpp' || echo '$(srcdir)/'`src/cpp/DataLoader.cpp
 +
 +libscigraphic_objects_la-NgonData.lo: src/cpp/NgonData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonData.Tpo -c -o libscigraphic_objects_la-NgonData.lo `test -f 'src/cpp/NgonData.cpp' || echo '$(srcdir)/'`src/cpp/NgonData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonData.cpp' object='libscigraphic_objects_la-NgonData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonData.lo `test -f 'src/cpp/NgonData.cpp' || echo '$(srcdir)/'`src/cpp/NgonData.cpp
 +
 +libscigraphic_objects_la-NgonGeneralData.lo: src/cpp/NgonGeneralData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGeneralData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Tpo -c -o libscigraphic_objects_la-NgonGeneralData.lo `test -f 'src/cpp/NgonGeneralData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGeneralData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGeneralData.cpp' object='libscigraphic_objects_la-NgonGeneralData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGeneralData.lo `test -f 'src/cpp/NgonGeneralData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGeneralData.cpp
 +
 +libscigraphic_objects_la-NgonGridData.lo: src/cpp/NgonGridData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Tpo -c -o libscigraphic_objects_la-NgonGridData.lo `test -f 'src/cpp/NgonGridData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridData.cpp' object='libscigraphic_objects_la-NgonGridData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridData.lo `test -f 'src/cpp/NgonGridData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridData.cpp
 +
 +libscigraphic_objects_la-NgonGridMatplotData.lo: src/cpp/NgonGridMatplotData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridMatplotData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Tpo -c -o libscigraphic_objects_la-NgonGridMatplotData.lo `test -f 'src/cpp/NgonGridMatplotData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridMatplotData.cpp' object='libscigraphic_objects_la-NgonGridMatplotData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridMatplotData.lo `test -f 'src/cpp/NgonGridMatplotData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotData.cpp
 +
 +libscigraphic_objects_la-NgonPolylineData.lo: src/cpp/NgonPolylineData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonPolylineData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Tpo -c -o libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonPolylineData.cpp' object='libscigraphic_objects_la-NgonPolylineData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp
 +
 +libscigraphic_objects_la-TriangleMeshData.lo: src/cpp/TriangleMeshData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo -c -o libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshData.cpp' object='libscigraphic_objects_la-TriangleMeshData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp
 +
 +libscigraphic_objects_la-TriangleMeshFecData.lo: src/cpp/TriangleMeshFecData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshFecData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo -c -o libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshFecData.cpp' object='libscigraphic_objects_la-TriangleMeshFecData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp
 +
 +libscigraphic_objects_la-ColorComputer.lo: src/cpp/ColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-ColorComputer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo -c -o libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/ColorComputer.cpp' object='libscigraphic_objects_la-ColorComputer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp
 +
 +libscigraphic_objects_la-DecompositionUtils.lo: src/cpp/DecompositionUtils.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-DecompositionUtils.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Tpo -c -o libscigraphic_objects_la-DecompositionUtils.lo `test -f 'src/cpp/DecompositionUtils.cpp' || echo '$(srcdir)/'`src/cpp/DecompositionUtils.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Tpo $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/DecompositionUtils.cpp' object='libscigraphic_objects_la-DecompositionUtils.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-DecompositionUtils.lo `test -f 'src/cpp/DecompositionUtils.cpp' || echo '$(srcdir)/'`src/cpp/DecompositionUtils.cpp
 +
 +libscigraphic_objects_la-Fac3DColorComputer.lo: src/cpp/Fac3DColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Fac3DColorComputer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Tpo -c -o libscigraphic_objects_la-Fac3DColorComputer.lo `test -f 'src/cpp/Fac3DColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Tpo $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Fac3DColorComputer.cpp' object='libscigraphic_objects_la-Fac3DColorComputer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Fac3DColorComputer.lo `test -f 'src/cpp/Fac3DColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DColorComputer.cpp
 +
 +libscigraphic_objects_la-Fac3DDecomposer.lo: src/cpp/Fac3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Fac3DDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Tpo -c -o libscigraphic_objects_la-Fac3DDecomposer.lo `test -f 'src/cpp/Fac3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Fac3DDecomposer.cpp' object='libscigraphic_objects_la-Fac3DDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Fac3DDecomposer.lo `test -f 'src/cpp/Fac3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridDataDecomposer.lo: src/cpp/NgonGridDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridDataDecomposer.lo `test -f 'src/cpp/NgonGridDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridDataDecomposer.lo `test -f 'src/cpp/NgonGridDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridDataDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo: src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo `test -f 'src/cpp/NgonGridGrayplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridGrayplotDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo `test -f 'src/cpp/NgonGridGrayplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo: src/cpp/NgonGridMatplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo `test -f 'src/cpp/NgonGridMatplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridMatplotDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo `test -f 'src/cpp/NgonGridMatplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotDataDecomposer.cpp
 +
 +libscigraphic_objects_la-Plot3DDecomposer.lo: src/cpp/Plot3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Plot3DDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Tpo -c -o libscigraphic_objects_la-Plot3DDecomposer.lo `test -f 'src/cpp/Plot3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Plot3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Plot3DDecomposer.cpp' object='libscigraphic_objects_la-Plot3DDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Plot3DDecomposer.lo `test -f 'src/cpp/Plot3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Plot3DDecomposer.cpp
 +
 +libscigraphic_objects_la-PolylineDecomposer.lo: src/cpp/PolylineDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-PolylineDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Tpo -c -o libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/PolylineDecomposer.cpp' object='libscigraphic_objects_la-PolylineDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp
 +
 +libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo: src/cpp/TriangleMeshFecDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo -c -o libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshFecDataDecomposer.cpp' object='libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp
 +
 +libscigraphic_objects_la-ScilabView.lo: src/cpp/ScilabView.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-ScilabView.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ScilabView.Tpo -c -o libscigraphic_objects_la-ScilabView.lo `test -f 'src/cpp/ScilabView.cpp' || echo '$(srcdir)/'`src/cpp/ScilabView.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ScilabView.Tpo $(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/ScilabView.cpp' object='libscigraphic_objects_la-ScilabView.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-ScilabView.lo `test -f 'src/cpp/ScilabView.cpp' || echo '$(srcdir)/'`src/cpp/ScilabView.cpp
 +
 +libscigraphic_objects_la-FigureList.lo: src/cpp/FigureList.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-FigureList.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-FigureList.Tpo -c -o libscigraphic_objects_la-FigureList.lo `test -f 'src/cpp/FigureList.cpp' || echo '$(srcdir)/'`src/cpp/FigureList.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-FigureList.Tpo $(DEPDIR)/libscigraphic_objects_la-FigureList.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/FigureList.cpp' object='libscigraphic_objects_la-FigureList.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-FigureList.lo `test -f 'src/cpp/FigureList.cpp' || echo '$(srcdir)/'`src/cpp/FigureList.cpp
 +
 +libscigraphic_objects_la-HandleManagement.lo: src/cpp/HandleManagement.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-HandleManagement.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Tpo -c -o libscigraphic_objects_la-HandleManagement.lo `test -f 'src/cpp/HandleManagement.cpp' || echo '$(srcdir)/'`src/cpp/HandleManagement.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Tpo $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/HandleManagement.cpp' object='libscigraphic_objects_la-HandleManagement.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-HandleManagement.lo `test -f 'src/cpp/HandleManagement.cpp' || echo '$(srcdir)/'`src/cpp/HandleManagement.cpp
 +
 +libscigraphic_objects_la-AxesModel.lo: src/cpp/AxesModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-AxesModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-AxesModel.Tpo -c -o libscigraphic_objects_la-AxesModel.lo `test -f 'src/cpp/AxesModel.cpp' || echo '$(srcdir)/'`src/cpp/AxesModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-AxesModel.Tpo $(DEPDIR)/libscigraphic_objects_la-AxesModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/AxesModel.cpp' object='libscigraphic_objects_la-AxesModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-AxesModel.lo `test -f 'src/cpp/AxesModel.cpp' || echo '$(srcdir)/'`src/cpp/AxesModel.cpp
 +
 +libscigraphic_objects_la-FigureModel.lo: src/cpp/FigureModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-FigureModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-FigureModel.Tpo -c -o libscigraphic_objects_la-FigureModel.lo `test -f 'src/cpp/FigureModel.cpp' || echo '$(srcdir)/'`src/cpp/FigureModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-FigureModel.Tpo $(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/FigureModel.cpp' object='libscigraphic_objects_la-FigureModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-FigureModel.lo `test -f 'src/cpp/FigureModel.cpp' || echo '$(srcdir)/'`src/cpp/FigureModel.cpp
 +
 +libscigraphic_objects_la-CurrentFigure.lo: src/cpp/CurrentFigure.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentFigure.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Tpo -c -o libscigraphic_objects_la-CurrentFigure.lo `test -f 'src/cpp/CurrentFigure.cpp' || echo '$(srcdir)/'`src/cpp/CurrentFigure.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentFigure.cpp' object='libscigraphic_objects_la-CurrentFigure.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentFigure.lo `test -f 'src/cpp/CurrentFigure.cpp' || echo '$(srcdir)/'`src/cpp/CurrentFigure.cpp
 +
 +libscigraphic_objects_la-CurrentObject.lo: src/cpp/CurrentObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Tpo -c -o libscigraphic_objects_la-CurrentObject.lo `test -f 'src/cpp/CurrentObject.cpp' || echo '$(srcdir)/'`src/cpp/CurrentObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentObject.cpp' object='libscigraphic_objects_la-CurrentObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentObject.lo `test -f 'src/cpp/CurrentObject.cpp' || echo '$(srcdir)/'`src/cpp/CurrentObject.cpp
 +
 +libscigraphic_objects_la-CurrentSubwin.lo: src/cpp/CurrentSubwin.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentSubwin.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Tpo -c -o libscigraphic_objects_la-CurrentSubwin.lo `test -f 'src/cpp/CurrentSubwin.cpp' || echo '$(srcdir)/'`src/cpp/CurrentSubwin.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentSubwin.cpp' object='libscigraphic_objects_la-CurrentSubwin.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentSubwin.lo `test -f 'src/cpp/CurrentSubwin.cpp' || echo '$(srcdir)/'`src/cpp/CurrentSubwin.cpp
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libscigraphic_objects_la_etcDATA: $(libscigraphic_objects_la_etc_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_etcdir)"
 +      @list='$(libscigraphic_objects_la_etc_DATA)'; test -n "$(libscigraphic_objects_la_etcdir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_etcdir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_etcDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_etc_DATA)'; test -n "$(libscigraphic_objects_la_etcdir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libscigraphic_objects_la_etcdir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" && rm -f $$files
 +install-libscigraphic_objects_la_rootDATA: $(libscigraphic_objects_la_root_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_rootdir)"
 +      @list='$(libscigraphic_objects_la_root_DATA)'; test -n "$(libscigraphic_objects_la_rootdir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_rootdir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_rootDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_root_DATA)'; test -n "$(libscigraphic_objects_la_rootdir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libscigraphic_objects_la_rootdir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" && rm -f $$files
 +install-libscigraphic_objects_la_sci_gatewayDATA: $(libscigraphic_objects_la_sci_gateway_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"
 +      @list='$(libscigraphic_objects_la_sci_gateway_DATA)'; test -n "$(libscigraphic_objects_la_sci_gatewaydir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_sci_gatewayDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_sci_gateway_DATA)'; test -n "$(libscigraphic_objects_la_sci_gatewaydir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) check-local
 +check: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) check-am
 +all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +      -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-local distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-data-local \
 +      install-libscigraphic_objects_la_etcDATA \
 +      install-libscigraphic_objects_la_rootDATA \
 +      install-libscigraphic_objects_la_sci_gatewayDATA
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am: install-html-local
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libscigraphic_objects_la_etcDATA \
 +      uninstall-libscigraphic_objects_la_rootDATA \
 +      uninstall-libscigraphic_objects_la_sci_gatewayDATA \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: all check check-am install install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
 +      clean clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-local \
 +      distclean-tags distdir dvi dvi-am html html-am info info-am \
 +      install install-am install-data install-data-am \
 +      install-data-local install-dvi install-dvi-am install-exec \
 +      install-exec-am install-html install-html-am \
 +      install-html-local install-info install-info-am \
 +      install-libscigraphic_objects_la_etcDATA \
 +      install-libscigraphic_objects_la_rootDATA \
 +      install-libscigraphic_objects_la_sci_gatewayDATA install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libscigraphic_objects_la_etcDATA \
 +      uninstall-libscigraphic_objects_la_rootDATA \
 +      uninstall-libscigraphic_objects_la_sci_gatewayDATA \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# This target enables tests for Scilab
 +check-local: $(top_builddir)/scilab-bin test
 +      @COMMAND="test_run('$(modulename)');quit";\
 +      export LANG=C;\
 +      $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
 +check-code:
 +      if test -f build.xml; then \
 +              $(ANT) checkstyle; \
 +      fi
 +      if test -x "$(SPLINT)"; then \
 +              $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
 +      fi
 +@NEED_JAVA_TRUE@java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT); \
 +@NEED_JAVA_TRUE@      fi
 +
 +@NEED_JAVA_TRUE@clean-java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT) clean; \
 +@NEED_JAVA_TRUE@      fi;
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
 +@SWIG_TRUE@   @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
 +@SWIG_TRUE@   SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
 +@SWIG_TRUE@   if test -n "$(SWIG_WRAPPERS)"; then \
 +@SWIG_TRUE@           for file in $(SWIG_WRAPPERS) ; do \
 +@SWIG_TRUE@                   echo "Swig process of $$file ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
 +@SWIG_TRUE@           done; \
 +@SWIG_TRUE@   fi
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
 +@GIWS_TRUE@   if test -n "$(GIWS_WRAPPERS)"; then \
 +@GIWS_TRUE@           for file in $(GIWS_WRAPPERS) ; do \
 +@GIWS_TRUE@                   echo "GIWS process of $$file ..."; \
 +@GIWS_TRUE@                   $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
 +@GIWS_TRUE@           done; \
 +@GIWS_TRUE@   fi
 +
++@GIWS_TRUE@giws-exception:
++@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
++@GIWS_TRUE@   echo "GIWS: Generation of exception class ..."; \
++@GIWS_TRUE@   $(GIWS_BIN) --generate-exception-class --output-dir $$GIWS_OUTPUTDIR 
++
 +macros:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +              echo "Error : Cannot build $< : Scilab has not been built"; \
 +      else \
 +              $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
 +      fi)
 +
 +# Removes the macros
 +clean-macros:
 +# Removes macros (*.bin generated from .sci)
 +      @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +              echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
 +              rm -f $(builddir)/$$dir/$(MACROBINMASK); \
 +      done
 +
 +test:
 +# More tests could be added here
 +      @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +      if test -f build.xml -a $$USEANT -eq 1; then \
 +              $(ANT) test; \
 +      fi
 +
 +all-local: $(TARGETS_ALL)
 +
 +.sci.bin:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +      echo "Error : Cannot build $< : Scilab has not been build"; \
 +      else \
 +      echo "Creating $@"; \
 +      $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
 +      fi )
 +
 +install-html-local:
 +
 +install-data-local-local:
 +# Mainly for javasci
 +      @if test -d $(srcdir)/javadoc; then \
 +              cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
 +      fi
 +# If the user wants the help sources to be installed
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of XML sources of help files --------"; \
 +@INSTALL_HELP_XML_TRUE@       for lang in $(ALL_LINGUAS); do \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/$$lang; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@        fi; \
 +@INSTALL_HELP_XML_TRUE@       done; \
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of MathML sources --------"; \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/mml/; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@       fi
 +install-data-local:
 +# Install the tests
 +      @echo "-------- Install tests (if any) --------"; \
 +      for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the help chapter
 +      @echo "-------- Install the help chapter (if any) --------"; \
 +      for lang in $(HELP_CHAPTERLANG); do \
 +              HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
 +              if test -f $$HELPFILE; then \
 +                      echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +                      $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +              fi; \
 +      done
 +# Install the demos & examples
 +      @echo "-------- Install demos & examples (if any) --------"; \
 +      for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the macros
 +      @echo "-------- Install macros (if any) --------"; \
 +      for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +        $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +              if test -d $(srcdir)/$$dir/; then \
 +                      FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 +                      if test -n "$(MACROSSPECIALEXT)"; then \
 +                              specialExtDir=""; \
 +                              for specialExt in $(MACROSSPECIALEXT); do \
 +                                      specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 +                              done; \
 +                              FILELIST="$$FILELIST $$specialExtDir"; \
 +                      fi; \
 +                for file in `ls -1 $$FILELIST 2>/dev/null`; do \
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
 +                done; \
 +              fi; \
 +      done
 +# Install java files (.jar)
 +      @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
 +      echo "-------- Install jar files --------"; \
 +    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
 +        for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
 +        done ; \
 +      fi
 +
 +########### CLEAN ###################
 +# Clean help (generated automatically by Scilab)
 +# It used to clean the macro (clean-macros) but this was causing
 +# make clean && make to fail Scilab startup
 +@NEED_JAVA_TRUE@clean-local: clean-java
 +@NEED_JAVA_FALSE@clean-local:
 +
 +distclean-local:
 +      rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
 +
 +.PHONY: macros java swig giws
 +
 +includes/graphicObjectsProperties.h: Makefile.am src/scripts/propertiesMap.properties
 +      @echo "-- Building includes/graphicObjectProperties.h --"
 +      @$(top_srcdir)/modules/graphic_objects/src/scripts/genPropertiesName.sh --C $(top_srcdir)/modules/graphic_objects/src/scripts/propertiesMap.properties $(top_srcdir)/modules/graphic_objects/includes/graphicObjectProperties.h
 +      @echo "-- Building GraphicObjectProperties.java --"
 +      @$(top_srcdir)/modules/graphic_objects/src/scripts/genPropertiesName.sh --java $(top_srcdir)/modules/graphic_objects/src/scripts/propertiesMap.properties $(top_srcdir)/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
index 05836f3,0000000..6bce40f
mode 100644,000000..100644
--- /dev/null
@@@ -1,1092 -1,0 +1,1092 @@@
 +#include "CallGraphicController.hxx"
- /* Generated by GIWS (version 1.2.4) */
++/* Generated by GIWS (version 1.3.0) */
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +namespace org_scilab_modules_graphic_objects {
 +
 +// Returns the current env
 +
 +JNIEnv * CallGraphicController::getCurrentEnv() {
 +JNIEnv * curEnv = NULL;
 +jint res=this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +if (res != JNI_OK) {
 +throw GiwsException::JniException(getCurrentEnv());
 +}
 +return curEnv;
 +}
 +// Destructor
 +
 +CallGraphicController::~CallGraphicController() {
 +JNIEnv * curEnv = NULL;
 +this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +
 +curEnv->DeleteGlobalRef(this->instance);
 +curEnv->DeleteGlobalRef(this->instanceClass);
 +curEnv->DeleteGlobalRef(this->stringArrayClass);}
 +// Constructors
 +CallGraphicController::CallGraphicController(JavaVM * jvm_) {
 +jmethodID constructObject = NULL ;
 +jobject localInstance ;
 +jclass localClass ;
 +const std::string construct="<init>";
 +const std::string param="()V";
 +jvm=jvm_;
 +
 +JNIEnv * curEnv = getCurrentEnv();
 +
 +localClass = curEnv->FindClass( this->className().c_str() ) ;
 +if (localClass == NULL) {
 +  throw GiwsException::JniClassNotFoundException(curEnv, this->className());
 +}
 +
 +this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +
 +/* localClass is not needed anymore */
 +curEnv->DeleteLocalRef(localClass);
 +
 +if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +
 +constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
 +if(constructObject == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
 +if(localInstance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 + 
 +this->instance = curEnv->NewGlobalRef(localInstance) ;
 +if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +/* localInstance not needed anymore */
 +curEnv->DeleteLocalRef(localInstance);
 +
 +                /* Methods ID set to NULL */
- voiddeleteGraphicObjectjstringID=NULL; 
- jstringcloneGraphicObjectjstringID=NULL; 
- jstringaskGraphicObjectjstringID=NULL; 
- voidsetGraphicObjectRelationshipjstringjstringID=NULL; 
- voidremoveRelationShipAndDeletejstringID=NULL; 
- jstringgetGraphicObjectPropertyAsStringjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjstringID=NULL; 
- jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID=NULL; 
- jdoublegetGraphicObjectPropertyAsDoublejstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjdoubleID=NULL; 
- jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID=NULL; 
- jintgetGraphicObjectPropertyAsIntegerjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjintID=NULL; 
- jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID=NULL; 
- jintgetGraphicObjectPropertyAsBooleanjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjbooleanID=NULL; 
- jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID=NULL; 
- voidregisterScilabViewID=NULL; 
++voiddeleteGraphicObjectjstringjava_lang_StringID=NULL;
++jstringcloneGraphicObjectjstringjava_lang_StringID=NULL;
++jstringaskGraphicObjectjstringjava_lang_StringID=NULL;
++voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++voidremoveRelationShipAndDeletejstringjava_lang_StringID=NULL;
++jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID=NULL;
++jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID=NULL;
++jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID=NULL;
++jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID=NULL;
++jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID=NULL;
++jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
++jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID=NULL;
++voidregisterScilabViewID=NULL;
 +
 +
 +}
 +
 +CallGraphicController::CallGraphicController(JavaVM * jvm_, jobject JObj) {
 +        jvm=jvm_;
 +
 +        JNIEnv * curEnv = getCurrentEnv();
 +
 +jclass localClass = curEnv->GetObjectClass(JObj);
 +        this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +        curEnv->DeleteLocalRef(localClass);
 +
 +        if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +
 +        this->instance = curEnv->NewGlobalRef(JObj) ;
 +        if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +        /* Methods ID set to NULL */
-         voiddeleteGraphicObjectjstringID=NULL; 
- jstringcloneGraphicObjectjstringID=NULL; 
- jstringaskGraphicObjectjstringID=NULL; 
- voidsetGraphicObjectRelationshipjstringjstringID=NULL; 
- voidremoveRelationShipAndDeletejstringID=NULL; 
- jstringgetGraphicObjectPropertyAsStringjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjstringID=NULL; 
- jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID=NULL; 
- jdoublegetGraphicObjectPropertyAsDoublejstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjdoubleID=NULL; 
- jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID=NULL; 
- jintgetGraphicObjectPropertyAsIntegerjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjintID=NULL; 
- jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID=NULL; 
- jintgetGraphicObjectPropertyAsBooleanjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjbooleanID=NULL; 
- jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID=NULL; 
- jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID=NULL; 
- voidregisterScilabViewID=NULL; 
++        voiddeleteGraphicObjectjstringjava_lang_StringID=NULL;
++jstringcloneGraphicObjectjstringjava_lang_StringID=NULL;
++jstringaskGraphicObjectjstringjava_lang_StringID=NULL;
++voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++voidremoveRelationShipAndDeletejstringjava_lang_StringID=NULL;
++jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID=NULL;
++jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID=NULL;
++jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID=NULL;
++jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID=NULL;
++jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID=NULL;
++jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
++jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID=NULL;
++voidregisterScilabViewID=NULL;
 +
 +
 +}
 +
 +// Generic methods
 +
 +void CallGraphicController::synchronize() {
 +if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "CallGraphicController");
 +}
 +}
 +
 +void CallGraphicController::endSynchronize() {
 +if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "CallGraphicController");
 +}
 +}
 +// Method(s)
 +
 +void CallGraphicController::deleteGraphicObject (JavaVM * jvm_, char * id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID voiddeleteGraphicObjectjstringID = curEnv->GetStaticMethodID(cls, "deleteGraphicObject", "(Ljava/lang/String;)V" ) ;
- if (voiddeleteGraphicObjectjstringID == NULL) {
++jmethodID voiddeleteGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "deleteGraphicObject", "(Ljava/lang/String;)V" ) ;
++if (voiddeleteGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "deleteGraphicObject");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                          curEnv->CallStaticVoidMethod(cls, voiddeleteGraphicObjectjstringID ,id_);
++                         curEnv->CallStaticVoidMethod(cls, voiddeleteGraphicObjectjstringjava_lang_StringID ,id_);
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +char * CallGraphicController::cloneGraphicObject (JavaVM * jvm_, char * id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jstringcloneGraphicObjectjstringID = curEnv->GetStaticMethodID(cls, "cloneGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
- if (jstringcloneGraphicObjectjstringID == NULL) {
++jmethodID jstringcloneGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "cloneGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
++if (jstringcloneGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "cloneGraphicObject");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringcloneGraphicObjectjstringID ,id_));
++                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringcloneGraphicObjectjstringjava_lang_StringID ,id_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
 +char * CallGraphicController::askGraphicObject (JavaVM * jvm_, char * typeName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jstringaskGraphicObjectjstringID = curEnv->GetStaticMethodID(cls, "askGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
- if (jstringaskGraphicObjectjstringID == NULL) {
++jmethodID jstringaskGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "askGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
++if (jstringaskGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "askGraphicObject");
 +}
 +
 +jstring typeName_ = curEnv->NewStringUTF( typeName );
- if (typeName_ == NULL)
++if (typeName != NULL && typeName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringaskGraphicObjectjstringID ,typeName_));
++                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringaskGraphicObjectjstringjava_lang_StringID ,typeName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(typeName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
 +void CallGraphicController::setGraphicObjectRelationship (JavaVM * jvm_, char * parentId, char * childId){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID voidsetGraphicObjectRelationshipjstringjstringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectRelationship", "(Ljava/lang/String;Ljava/lang/String;)V" ) ;
- if (voidsetGraphicObjectRelationshipjstringjstringID == NULL) {
++jmethodID voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectRelationship", "(Ljava/lang/String;Ljava/lang/String;)V" ) ;
++if (voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectRelationship");
 +}
 +
 +jstring parentId_ = curEnv->NewStringUTF( parentId );
- if (parentId_ == NULL)
++if (parentId != NULL && parentId_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring childId_ = curEnv->NewStringUTF( childId );
- if (childId_ == NULL)
++if (childId != NULL && childId_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                          curEnv->CallStaticVoidMethod(cls, voidsetGraphicObjectRelationshipjstringjstringID ,parentId_, childId_);
++                         curEnv->CallStaticVoidMethod(cls, voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID ,parentId_, childId_);
 +                        curEnv->DeleteLocalRef(parentId_);
 +curEnv->DeleteLocalRef(childId_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +void CallGraphicController::removeRelationShipAndDelete (JavaVM * jvm_, char * id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID voidremoveRelationShipAndDeletejstringID = curEnv->GetStaticMethodID(cls, "removeRelationShipAndDelete", "(Ljava/lang/String;)V" ) ;
- if (voidremoveRelationShipAndDeletejstringID == NULL) {
++jmethodID voidremoveRelationShipAndDeletejstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "removeRelationShipAndDelete", "(Ljava/lang/String;)V" ) ;
++if (voidremoveRelationShipAndDeletejstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "removeRelationShipAndDelete");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                          curEnv->CallStaticVoidMethod(cls, voidremoveRelationShipAndDeletejstringID ,id_);
++                         curEnv->CallStaticVoidMethod(cls, voidremoveRelationShipAndDeletejstringjava_lang_StringID ,id_);
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +char * CallGraphicController::getGraphicObjectPropertyAsString (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jstringgetGraphicObjectPropertyAsStringjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsString", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" ) ;
- if (jstringgetGraphicObjectPropertyAsStringjstringjstringID == NULL) {
++jmethodID jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsString", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" ) ;
++if (jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsString");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringgetGraphicObjectPropertyAsStringjstringjstringID ,id_, propertyName_));
++                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, char * value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjstringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjstringID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring value_ = curEnv->NewStringUTF( value );
- if (value_ == NULL)
++if (value != NULL && value_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjstringID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +char ** CallGraphicController::getGraphicObjectPropertyAsStringVector (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsStringVector", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;" ) ;
- if (jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID == NULL) {
++jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsStringVector", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;" ) ;
++if (jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsStringVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jobjectArray res =  static_cast<jobjectArray>( curEnv->CallStaticObjectMethod(cls, jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID ,id_, propertyName_));
++                        jobjectArray res =  static_cast<jobjectArray>( curEnv->CallStaticObjectMethod(cls, jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +
 +char **arrayOfString;
 +arrayOfString = new char *[lenRow];
 +for (jsize i = 0; i < lenRow; i++){
 +jstring resString = reinterpret_cast<jstring>(curEnv->GetObjectArrayElement(res, i));
 +const char *tempString = curEnv->GetStringUTFChars(resString, 0);
 +arrayOfString[i] = new char[strlen(tempString) + 1];
 +
 +strcpy(arrayOfString[i], tempString);
 +curEnv->ReleaseStringUTFChars(resString, tempString);
 +curEnv->DeleteLocalRef(resString);
 +}
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] arrayOfString;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +curEnv->DeleteLocalRef(res);
 +return arrayOfString;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, char ** value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +jclass stringArrayClass = curEnv->FindClass("java/lang/String");
 +
 +// create java array of strings.
 +jobjectArray value_ = curEnv->NewObjectArray( valueSize, stringArrayClass, NULL);
 +if (value_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +// convert each char * to java strings and fill the java array.
 +for ( int i = 0; i < valueSize; i++)
 +{
 +jstring TempString = curEnv->NewStringUTF( value[i] );
 +if (TempString == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetObjectArrayElement( value_, i, TempString);
 +
 +// avoid keeping reference on to many strings
 +curEnv->DeleteLocalRef(TempString);
 +}
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(stringArrayClass);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +double CallGraphicController::getGraphicObjectPropertyAsDouble (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDouble", "(Ljava/lang/String;Ljava/lang/String;)D" ) ;
- if (jdoublegetGraphicObjectPropertyAsDoublejstringjstringID == NULL) {
++jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDouble", "(Ljava/lang/String;Ljava/lang/String;)D" ) ;
++if (jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsDouble");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jdouble res =  static_cast<jdouble>( curEnv->CallStaticDoubleMethod(cls, jdoublegetGraphicObjectPropertyAsDoublejstringjstringID ,id_, propertyName_));
++                        jdouble res =  static_cast<jdouble>( curEnv->CallStaticDoubleMethod(cls, jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, double value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjdoubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;D)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjdoubleID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;D)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjdoubleID ,id_, propertyName_, value));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID ,id_, propertyName_, value));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +double* CallGraphicController::getGraphicObjectPropertyAsDoubleVector (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDoubleVector", "(Ljava/lang/String;Ljava/lang/String;)[D" ) ;
- if (jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID == NULL) {
++jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDoubleVector", "(Ljava/lang/String;Ljava/lang/String;)[D" ) ;
++if (jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsDoubleVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jdoubleArray res =  static_cast<jdoubleArray>( curEnv->CallStaticObjectMethod(cls, jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID ,id_, propertyName_));
++                        jdoubleArray res =  static_cast<jdoubleArray>( curEnv->CallStaticObjectMethod(cls, jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jdouble *resultsArray = static_cast<jdouble *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +double* myArray= new double[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, double* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[D)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[D)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jdoubleArray value_ = curEnv->NewDoubleArray( valueSize ) ;
 +
 +if (value_ == NULL)
 +{
 +// check that allocation succeed
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetDoubleArrayRegion( value_, 0, valueSize, (jdouble*)(value) ) ;
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +int CallGraphicController::getGraphicObjectPropertyAsInteger (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsInteger", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
- if (jintgetGraphicObjectPropertyAsIntegerjstringjstringID == NULL) {
++jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsInteger", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
++if (jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsInteger");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsIntegerjstringjstringID ,id_, propertyName_));
++                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, int value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjintID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;I)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjintID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;I)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjintID ,id_, propertyName_, value));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID ,id_, propertyName_, value));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +int* CallGraphicController::getGraphicObjectPropertyAsIntegerVector (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsIntegerVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
- if (jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID == NULL) {
++jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsIntegerVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
++if (jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsIntegerVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID ,id_, propertyName_));
++                        jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jint *resultsArray = static_cast<jint *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +int* myArray= new int[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, int* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[I)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[I)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jintArray value_ = curEnv->NewIntArray( valueSize ) ;
 +
 +if (value_ == NULL)
 +{
 +// check that allocation succeed
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetIntArrayRegion( value_, 0, valueSize, (jint*)(value) ) ;
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +int CallGraphicController::getGraphicObjectPropertyAsBoolean (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBoolean", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
- if (jintgetGraphicObjectPropertyAsBooleanjstringjstringID == NULL) {
++jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBoolean", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
++if (jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsBoolean");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsBooleanjstringjstringID ,id_, propertyName_));
++                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, bool value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjbooleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Z)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjbooleanID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Z)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jboolean value_ = (static_cast<bool>(value) ? JNI_TRUE : JNI_FALSE);
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjbooleanID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +int* CallGraphicController::getGraphicObjectPropertyAsBooleanVector (JavaVM * jvm_, char * id, char * propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBooleanVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
- if (jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID == NULL) {
++jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBooleanVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
++if (jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsBooleanVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                         jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID ,id_, propertyName_));
++                        jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jint *resultsArray = static_cast<jint *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +int* myArray= new int[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
 +bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, bool* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Z)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Z)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
- if (id_ == NULL)
++if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
- if (propertyName_ == NULL)
++if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jbooleanArray value_ = curEnv->NewBooleanArray( valueSize ) ;
 +curEnv->SetBooleanArrayRegion( value_, 0, valueSize, (jboolean*)value ) ;
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +void CallGraphicController::registerScilabView (JavaVM * jvm_){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidregisterScilabViewID = curEnv->GetStaticMethodID(cls, "registerScilabView", "()V" ) ;
 +if (voidregisterScilabViewID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "registerScilabView");
 +}
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidregisterScilabViewID );
 +                        curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +}
index 2444832,0000000..5df5410
mode 100644,000000..100644
--- /dev/null
@@@ -1,205 -1,0 +1,218 @@@
- /* Generated by GIWS (version 1.2.4) */
++/* Generated by GIWS (version 1.3.0) */
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +
 +#ifndef __ORG_SCILAB_MODULES_GRAPHIC_OBJECTS_CALLGRAPHICCONTROLLER__
 +#define __ORG_SCILAB_MODULES_GRAPHIC_OBJECTS_CALLGRAPHICCONTROLLER__
 +#include <iostream>
 +#include <string>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <jni.h>
 +
 +#include "GiwsException.hxx"
 +
 +#ifndef _MSC_VER /* Defined anyway with Visual */
 +#if !defined(byte)
 +typedef signed char byte;
 +#else
 +#pragma message("Byte has been redefined elsewhere. Some problems can happen")
 +#endif
 +#endif
 +
++
++#ifndef GIWSEXPORT
++# if defined(_MSC_VER) || defined(__WIN32__) || defined(__CYGWIN__)
++#   if defined(STATIC_LINKED)
++#     define GIWSEXPORT
++#   else
++#     define GIWSEXPORT __declspec(dllexport)
++#   endif
++# else
++#     define GIWSEXPORT
++# endif
++#endif
++
 +namespace org_scilab_modules_graphic_objects {
- class CallGraphicController {
++class GIWSEXPORT CallGraphicController {
 +
 +private:
 +JavaVM * jvm;
 +
 +protected:
- jmethodID voiddeleteGraphicObjectjstringID; // cache method id
- jmethodID jstringcloneGraphicObjectjstringID; // cache method id
- jmethodID jstringaskGraphicObjectjstringID; // cache method id
- jmethodID voidsetGraphicObjectRelationshipjstringjstringID; // cache method id
- jmethodID voidremoveRelationShipAndDeletejstringID; // cache method id
- jmethodID jstringgetGraphicObjectPropertyAsStringjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjstringID; // cache method id
- jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjobjectArray_ID; // cache method id
++jmethodID voiddeleteGraphicObjectjstringjava_lang_StringID; // cache method id
++jmethodID jstringcloneGraphicObjectjstringjava_lang_StringID; // cache method id
++jmethodID jstringaskGraphicObjectjstringjava_lang_StringID; // cache method id
++jmethodID voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID voidremoveRelationShipAndDeletejstringjava_lang_StringID; // cache method id
++jmethodID jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID; // cache method id
 +jclass stringArrayClass;
- jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjdoubleID; // cache method id
- jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjdoubleArray_ID; // cache method id
- jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjintID; // cache method id
- jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjintArray_ID; // cache method id
- jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjbooleanID; // cache method id
- jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjstringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjstringjbooleanArray_ID; // cache method id
++jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID; // cache method id
++jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID; // cache method id
++jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID; // cache method id
++jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID; // cache method id
++jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID; // cache method id
++jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID; // cache method id
 +jmethodID voidregisterScilabViewID; // cache method id
 +
 +
 +
 +jobject instance;
 +jclass instanceClass; // cache class
 +
 +
 +/**
 +* Get the environment matching to the current thread.
 +*/
 +virtual JNIEnv * getCurrentEnv();
 +
 +public:
 +// Constructor
 +/**
 +* Create a wrapping of the object from a JNIEnv.
 +* It will call the default constructor
 +* @param JEnv_ the Java Env
 +*/
 +CallGraphicController(JavaVM * jvm_);
 +
 +/**
 +* Create a wrapping of an already existing object from a JNIEnv.
 +* The object must have already been instantiated
 +* @param JEnv_ the Java Env
 +* @param JObj the object
 +*/
 +CallGraphicController(JavaVM * jvm_, jobject JObj);
 +
 +
 +/** 
 +* This is a fake constructor to avoid the constructor
 +* chaining when dealing with extended giws classes 
 +*/
 +#ifdef FAKEGIWSDATATYPE
 +CallGraphicController(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
 +#endif
 +
 +// Destructor
 +~CallGraphicController();
 +
 +// Generic method
 +// Synchronization methods
 +/**
 +* Enter monitor associated with the object.
 +* Equivalent of creating a "synchronized(obj)" scope in Java.
 +*/
 +void synchronize();
 +
 +/**
 +* Exit monitor associated with the object.
 +* Equivalent of ending a "synchronized(obj)" scope.
 +*/
 +void endSynchronize();
 +
 +// Methods
 +static void deleteGraphicObject(JavaVM * jvm_, char * id);
 +
 +static char * cloneGraphicObject(JavaVM * jvm_, char * id);
 +
 +static char * askGraphicObject(JavaVM * jvm_, char * typeName);
 +
 +static void setGraphicObjectRelationship(JavaVM * jvm_, char * parentId, char * childId);
 +
 +static void removeRelationShipAndDelete(JavaVM * jvm_, char * id);
 +
 +static char * getGraphicObjectPropertyAsString(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, char * value);
 +
 +static char ** getGraphicObjectPropertyAsStringVector(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, char ** value, int valueSize);
 +
 +static double getGraphicObjectPropertyAsDouble(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, double value);
 +
 +static double* getGraphicObjectPropertyAsDoubleVector(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, double* value, int valueSize);
 +
 +static int getGraphicObjectPropertyAsInteger(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, int value);
 +
 +static int* getGraphicObjectPropertyAsIntegerVector(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, int* value, int valueSize);
 +
 +static int getGraphicObjectPropertyAsBoolean(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, bool value);
 +
 +static int* getGraphicObjectPropertyAsBooleanVector(JavaVM * jvm_, char * id, char * propertyName);
 +
 +static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, bool* value, int valueSize);
 +
 +static void registerScilabView(JavaVM * jvm_);
 +
 +
 +                        /**
 +                        * Get class name to use for static methods
 +                        * @return class name to use for static methods
 +                        */
 +                        
 +                static const std::string className()
 +                {
 +                return "org/scilab/modules/graphic_objects/CallGraphicController";
 +                }
 +                
 +};
 +
 +
 +}
 +#endif
Simple merge
Simple merge
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -116,15 -104,10 +104,10 @@@ lib /DEF:"$(ProjectDir)scilab_windows_I
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -151,10 -128,8 +128,8 @@@ lib /DEF:"$(ProjectDir)scilab_windows_I
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -199,9 -161,8 +161,8 @@@ lib /DEF:"$(ProjectDir)scilab_windows_I
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
-       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 -      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../graphic_objects/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  /*--------------------------------------------------------------------------*/
  int sci_Legend( char * fname, unsigned long fname_len )
  {
 -  int numrow,numcol,l1,l2,n,m2,n2;
 -  long handelsvalue = 0 ;
 -  int outindex,i;
 -  sciPointObj *pobj;
 -  long long *tabofhandles;
 -  sciPointObj * psubwin = NULL;
 -  sciPointObj * pFigure = NULL;
 -  sciLegendPlace location;
 -  sciEntityType type;
 -  char **Str = NULL;
 -      sciPointObj * legend;
 -
 -  CheckRhs(2,3);
 -  CheckLhs(0,1);
 -
 -  
 -  GetMatrixdims(1,&numrow,&numcol);
 -  n=numrow*numcol;
 -  if (numrow==0 || numcol==0) 
 -  {
 -    CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,&numrow,&numcol,&l1);
 -    LhsVar(1) = Rhs+1;
 -      PutLhsVar();
 -    return 0;
 -  }
 -  GetMatrixdims(2,&m2,&n2);
 -  if (m2*n2 != n) 
 -  {
 -    Scierror(999,_("%s: Wrong size for input arguments #%d and #%d: Incompatible length.\n"),fname,1,2);
 -    return 0;
 -  }
 -
 -
 -  GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&l1); 
 -  GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m2,&n2,&Str);
 -  if (Rhs==3) 
 -  {
 -    GetRhsVar(3,STRING_DATATYPE,&m2,&n2,&l2);
 -    location = propertyNameToLegendPlace(cstk(l2));
 -    if (location == SCI_LEGEND_POSITION_UNSPECIFIED) 
 -      {
 -      Scierror(999,_("%s: Wrong value for input argument #%d: Incorrect value.\n"),fname,3);
 -      return 0;
 +    int numrow,numcol,l1,l2,n,m2,n2;
 +    long handlesvalue = 0;
 +    int outindex,i;
 +    char *pobjUID;
 +    long long *tabofhandles;
 +    char * psubwinUID = NULL;
 +    char * pFigureUID = NULL;
 +    sciLegendPlace location;
 +    char * type;
 +    char **Str = NULL;
 +    char * legendUID;
 +
 +    CheckRhs(2,3);
 +    CheckLhs(0,1);
 +
 +
 +    GetMatrixdims(1,&numrow,&numcol);
 +    n=numrow*numcol;
 +    if (numrow==0 || numcol==0)
 +    {
 +        CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE,&numrow,&numcol,&l1);
 +        LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
++        PutLhsVar();
 +        return 0;
      }
 -  }
 -  else 
 -  {
 -    location = propertyNameToLegendPlace(DEF_LEGEND_LOCATION);
 -  }
 -
 -  tabofhandles = (long long *)MALLOC(n*sizeof(long long));
 -  if (tabofhandles == NULL) {
 -    freeArrayOfString(Str,n);
 -    Scierror(999,_("%s: No more memory.\n"),fname);
 -    return 0;
 -  }
 -
 -  for (i = 0; i < n;i++)
 -  {
 -    handelsvalue = (unsigned long) (hstk(l1))[n-1-i];
 -    pobj = sciGetPointerFromHandle(handelsvalue);
 -
 -    /**
 -      We get the current pSubwin & pFigure from the first handel's parents.
 -    **/
 -    if (i==0) {
 -      psubwin = sciGetParentSubwin( pobj );
 -      pFigure = sciGetParentFigure( pobj );
 +    GetMatrixdims(2,&m2,&n2);
 +    if (m2*n2 != n)
 +    {
 +        Scierror(999,_("%s: Wrong size for input arguments #%d and #%d: Incompatible length.\n"),fname,1,2);
 +        return 0;
      }
  
 -    /**
 -      We check that the pSubwin is the same for all given handle.
 -    **/
 -    if (psubwin!=sciGetParentSubwin(pobj)) 
 +
 +    GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&l1);
 +    GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m2,&n2,&Str);
 +    if (Rhs==3)
      {
 -      Scierror(999,_("%s: Objects must have the same axes.\n"),fname);
 -      return 0;
 +        GetRhsVar(3,STRING_DATATYPE,&m2,&n2,&l2);
 +        location = propertyNameToLegendPlace(cstk(l2));
 +
 +        if (location == SCI_LEGEND_POSITION_UNSPECIFIED)
 +        {
 +            Scierror(999,_("%s: Wrong value for input argument #%d: Incorrect value.\n"),fname,3);
 +            return 0;
 +        }
 +    }
 +    else
 +    {
 +        location = propertyNameToLegendPlace(DEF_LEGEND_LOCATION);
      }
  
 -    if (pobj == NULL) 
 +    tabofhandles = (long long *)MALLOC(n*sizeof(long long));
 +    if (tabofhandles == NULL)
      {
 -      freeArrayOfString(Str,n);
 -      FREE(tabofhandles);
 -      Scierror(999,_("%s: The handle is no more valid.\n"),fname);
 -      return 0;
 +        freeArrayOfString(Str,n);
 +        Scierror(999,_("%s: No more memory.\n"),fname);
 +        return 0;
      }
 -    type=sciGetEntityType(pobj);
 -    if (type != SCI_POLYLINE) 
 +
 +    for (i = 0; i < n; i++)
      {
 -      freeArrayOfString(Str,n);
 -      FREE(tabofhandles);
 -      Scierror(999,_("%s: The %d th handle is not a polyline handle.\n"),fname,i+1);
 -      return 0;
 +        char* subwinUID;
 +
 +        handlesvalue = (unsigned long) (hstk(l1))[n-1-i];
 +        pobjUID = getObjectFromHandle(handlesvalue);
 +
 +        /**
 +         * We get the current pSubwin & pFigure from the first handle's parents.
 +         */
 +        if (i==0)
 +        {
 +            getGraphicObjectProperty(pobjUID, __GO_PARENT_FIGURE__, jni_string, &pFigureUID);
 +            getGraphicObjectProperty(pobjUID, __GO_PARENT_AXES__, jni_string, &psubwinUID);
 +        }
 +
 +        /**
 +         * We check that the pSubwin UID is the same for all given handles.
 +         */
 +        getGraphicObjectProperty(pobjUID, __GO_PARENT_AXES__, jni_string, &subwinUID);
 +
 +        if (strcmp(psubwinUID, subwinUID) != 0)
 +        {
 +            Scierror(999,_("%s: Objects must have the same axes.\n"),fname);
 +            return 0;
 +        }
 +
 +        if (pobjUID == NULL)
 +        {
 +            freeArrayOfString(Str,n);
 +            FREE(tabofhandles);
 +            Scierror(999,_("%s: The handle is no more valid.\n"),fname);
 +            return 0;
 +        }
 +
 +
 +        getGraphicObjectProperty(pobjUID, __GO_TYPE__, jni_string, &type);
 +
 +        if (strcmp(type, __GO_POLYLINE__) != 0)
 +        {
 +            freeArrayOfString(Str,n);
 +            FREE(tabofhandles);
 +            Scierror(999,_("%s: The %d th handle is not a polyline handle.\n"),fname,i+1);
 +            return 0;
 +        }
 +
 +        tabofhandles[i]=handlesvalue;
      }
 -    tabofhandles[i]=handelsvalue;
 -    
 -  }
 -
 -  /* Create the legend */
 -  legend = ConstructLegend (psubwin, Str, tabofhandles, n);
 -  sciSetLegendLocation(legend, location);
 -
 -  /* Draw it */
 -  sciSetCurrentObj(legend);
 -  startFigureDataReading(pFigure);
 -  sciDrawObjIfRequired(legend);
 -  endFigureDataReading(pFigure);
 -
 -  freeArrayOfString(Str,n);
 -  FREE(tabofhandles);
 -
 -  /* Return the handle of the newly create dlegend */
 -  numrow = 1;
 -  numcol = 1;
 -  CreateVar(Rhs+1,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&outindex);
 -  hstk(outindex)[0] = sciGetHandle((sciPointObj *) sciGetCurrentObj());
 -  LhsVar(1) = Rhs+1;
 -  PutLhsVar();
 -  return 0;
 +
 +    /* Create the legend */
 +    legendUID = ConstructLegend (psubwinUID, Str, tabofhandles, n);
 +
 +    setGraphicObjectProperty(legendUID, __GO_LEGEND_LOCATION__, &location, jni_int, 1);
 +
 +    setCurrentObject(legendUID);
 +
 +    /* Deactivated (drawing using the former renderer) */
 +#if 0
 +    startFigureDataReading(pFigure);
 +    sciDrawObjIfRequired(legend);
 +    endFigureDataReading(pFigure);
 +#endif
 +
 +    freeArrayOfString(Str,n);
 +    FREE(tabofhandles);
 +
 +    /* Return the handle of the newly created legend */
 +    numrow = 1;
 +    numcol = 1;
 +    CreateVar(Rhs+1,GRAPHICAL_HANDLE_DATATYPE,&numrow,&numcol,&outindex);
 +    hstk(outindex)[0] = getHandle((char *) getCurrentObject());
 +    LhsVar(1) = Rhs+1;
-     C2F(putlhsvar)();
++    PutLhsVar();
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
@@@ -68,8 -64,8 +68,8 @@@ int sci_addcb(char *fname,unsigned lon
    }
  
    LhsVar(1) = 0;
-   C2F(putlhsvar)();
+   PutLhsVar();
 -
 +#endif
    return 0;
  }
  /*--------------------------------------------------------------------------*/
@@@ -40,79 -39,67 +40,79 @@@ int sci_champ_G(char *fname
                  int (*func) (double *, double *, double *, double *, int *, int *, char *, double *, double *, int),
                  unsigned long fname_len)
  {
 -  double arfact_def=1.0;
 -  double * arfact=&arfact_def;
 -  int m1, n1, l1, m2, n2, l2, m3, n3, l3, m4, n4, l4;
 -  static rhs_opts opts[]= { {-1,"arfact","?",0,0,0},
 -  {-1,"rect","?",0,0,0},
 -  {-1,"strf","?",0,0,0},
 -  {-1,NULL,NULL,0,0}};
 +    double arfact_def=1.0;
 +    double * arfact=&arfact_def;
 +    int m1, n1, l1, m2, n2, l2, m3, n3, l3, m4, n4, l4;
 +    static rhs_opts opts[]= { {-1,"arfact","?",0,0,0},
 +                              {-1,"rect","?",0,0,0},
 +                              {-1,"strf","?",0,0,0},
 +                              {-1,NULL,NULL,0,0}};
  
 -  char   * strf = NULL ;
 -  double * rect = NULL ;
 +    char   * strf = NULL ;
 +    double * rect = NULL ;
  
 -  CheckRhs(-1,7) ;
 -  CheckLhs(0,1) ;
 +    char * pfigureUID = NULL;
 +    char * psubwinUID = NULL;
  
 -  if (Rhs <= 0) 
 -  {
 -              sci_demo(fname, fname_len);
 -    return 0;
 -  } 
 -  else if ( Rhs < 4 ) 
 -  {
 -    Scierror(999,_("%s: Wrong number of input arguments: At least %d expected.\n"),fname,4);
 -    return 0;
 -  }
 -  if ( get_optionals(fname,opts) == 0) { return 0 ; }
 -  if ( FirstOpt() < 5 )
 -  {
 -    Scierror(999, _("%s: Misplaced optional argument: #%d must be at position %d.\n"), fname,1, 5);
 -    return -1;
 -  }
 -  GetRhsVar(1,MATRIX_OF_DOUBLE_DATATYPE, &m1, &n1, &l1);
 -  GetRhsVar(2,MATRIX_OF_DOUBLE_DATATYPE, &m2, &n2, &l2);
 -  GetRhsVar(3,MATRIX_OF_DOUBLE_DATATYPE, &m3, &n3, &l3);
 -  GetRhsVar(4,MATRIX_OF_DOUBLE_DATATYPE, &m4, &n4, &l4);
 -  CheckSameDims(3,4,m3,n3,m4,n4);
 -  CheckDimProp(2,3,m2 * n2 != n3);
 -  CheckDimProp(1,3,m1 * n1 != m3); 
 -  if (m3 * n3 == 0)
 -  { 
 -    LhsVar(1) = 0;
 -      PutLhsVar();
 -    return 0;
 -  } 
 +    CheckRhs(-1,7) ;
 +    CheckLhs(0,1) ;
 +
 +    if (Rhs <= 0)
 +    {
-               sci_demo(fname, fname_len);
++        sci_demo(fname, fname_len);
 +        return 0;
 +    }
 +    else if ( Rhs < 4 )
 +    {
 +        Scierror(999,_("%s: Wrong number of input arguments: At least %d expected.\n"),fname,4);
 +        return 0;
 +    }
  
 -  GetOptionalDoubleArg(fname,5,"arfact",&arfact,1,opts);
 -  GetRect(fname,6,opts,&rect);
 -  GetStrf(fname,7,opts,&strf);
 +    if ( get_optionals(fname,opts) == 0)
 +    {
 +        return 0;
 +    }
  
 -  SciWin();
 +    if ( FirstOpt() < 5 )
 +    {
 +        Scierror(999, _("%s: Misplaced optional argument: #%d must be at position %d.\n"), fname,1, 5);
 +        return -1;
 +    }
  
 -  if ( isDefStrf( strf ) )
 -  {
 -    char strfl[4];
 -    strcpy(strfl,DEFSTRFN);
 -    strf = strfl;
 -    if ( !isDefRect( rect ) ) {strf[1]='5';} 
 -  }
 +    GetRhsVar(1,MATRIX_OF_DOUBLE_DATATYPE, &m1, &n1, &l1);
 +    GetRhsVar(2,MATRIX_OF_DOUBLE_DATATYPE, &m2, &n2, &l2);
 +    GetRhsVar(3,MATRIX_OF_DOUBLE_DATATYPE, &m3, &n3, &l3);
 +    GetRhsVar(4,MATRIX_OF_DOUBLE_DATATYPE, &m4, &n4, &l4);
 +    CheckSameDims(3,4,m3,n3,m4,n4);
 +    CheckDimProp(2,3,m2 * n2 != n3);
 +    CheckDimProp(1,3,m1 * n1 != m3);
 +    if (m3 * n3 == 0)
 +    {
 +        LhsVar(1) = 0;
 +        PutLhsVar();
 +        return 0;
 +    }
  
 -  (*func)(stk(l1 ),stk(l2 ),stk(l3 ),stk(l4 ),&m3,&n3,strf,rect, arfact, 4L);
 -  LhsVar(1) = 0;
 -  PutLhsVar();
 -  return 0;
 +    GetOptionalDoubleArg(fname,5,"arfact",&arfact,1,opts);
 +    GetRect(fname,6,opts,&rect);
 +    GetStrf(fname,7,opts,&strf);
 +
 +    getOrCreateDefaultSubwin();
 +
 +    if ( isDefStrf( strf ) )
 +    {
 +        char strfl[4];
 +        strcpy(strfl,DEFSTRFN);
 +        strf = strfl;
 +        if ( !isDefRect( rect ) )
 +        {
 +            strf[1]='5';
 +        }
 +    }
 +
 +    (*func)(stk(l1 ),stk(l2 ),stk(l3 ),stk(l4 ),&m3,&n3,strf,rect, arfact, 4L);
 +    LhsVar(1) = 0;
 +    PutLhsVar();
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
@@@ -91,8 -86,7 +91,8 @@@ int sci_copy(char *fname,unsigned long 
    *hstk(outindex) = sciGetHandle(pcopyobj = sciCopyObj((sciPointObj *)pobj,(sciPointObj *)psubwinparenttarget));
    sciDrawObj((sciPointObj *)sciGetParentFigure(pcopyobj));
    LhsVar(1) = Rhs+1;
-     C2F(putlhsvar)();
+   PutLhsVar();
 +#endif
    return 0;
  }
  
@@@ -39,179 -31,175 +39,179 @@@ static int check_xy(char *fname, char d
  /*--------------------------------------------------------------------------*/
  int sci_drawaxis( char * fname, unsigned long fname_len )
  {
 -  /** XXXXX : un point en suspens c'est le "S" ou une adresse est 
 -  *  stockees ds un unsigned long : est ce sufisant ? 
 -  */
 -  static rhs_opts opts[]= { 
 -    {-1,"dir","c",0,0,0},
 -    {-1,"fontsize","i",0,0,0},
 -    {-1,"format_n","c",0,0,0},
 -    {-1,"seg","i",0,0,0},
 -    {-1,"sub_int","i",0,0,0},
 -    {-1,"textcolor","i",0,0,0},
 -    {-1,"tics","c",0,0,0},
 -    {-1,"ticscolor","i",0,0,0},
 -    {-1,"val","S",0,0,0},
 -    {-1,"x","d",0,0,0},
 -    {-1,"y","d",0,0,0},
 -    {-1,NULL,NULL,0,0}
 -  };
 -
 -  int minrhs = -1,maxrhs = 0,minlhs=0,maxlhs=1,nopt;
 -  char dir = 'l', *format = NULL, tics = 'v', **val = NULL;
 -  int fontsize = 0, sub_int=2, seg_flag = 1,textcolor = -1,ticscolor=-1;
 -  double *x = NULL,*y = NULL;
 -  int nx=0,ny=0,ntics;
 -  int nb_tics_labels = -1;
 -
 -  nopt = NumOpt();
 -
 -  CheckRhs(minrhs,maxrhs+nopt) ;
 -  CheckLhs(minlhs,maxlhs) ;
 -
 -  if ( get_optionals(fname,opts) == 0)
 -      {
 -              /* error */
 -              return 0;
 -      }
 -  if ( opts[0].position != -1 ) 
 -  { 
 -    CheckLength(opts[0].position,opts[0].m,1);
 -    dir = *cstk(opts[0].l);
 -  } 
 -  if ( opts[1].position != -1 ) 
 -  {
 -    CheckScalar(opts[1].position,opts[1].m,opts[1].n);
 -    fontsize= *istk(opts[1].l);
 -  }
 -  if ( opts[2].position != -1 ) 
 -  { 
 -    /* verfier ce que l'on recoit avec "" XXX */
 -    format = cstk(opts[2].l);
 -  }
 -
 -  if ( opts[3].position != -1 ) 
 -  { 
 -    CheckScalar(opts[3].position,opts[3].m,opts[3].n);
 -    seg_flag = *istk(opts[3].l);
 -  }
 -
 -  if ( opts[4].position != -1 ) 
 -  { 
 -    CheckScalar(opts[4].position,opts[4].m,opts[4].n);
 -    sub_int= *istk(opts[4].l);
 -  }
 -
 -  if ( opts[5].position != -1 ) 
 -  { 
 -    CheckScalar(opts[5].position,opts[5].m,opts[5].n);
 -    textcolor= *istk(opts[5].l);
 -  }
 -
 -  if ( opts[6].position != -1 ) 
 -  { 
 -    CheckLength(opts[6].position,opts[6].m,1);
 -    tics = *cstk(opts[6].l);
 -  } 
 -
 -  if ( opts[7].position != -1 ) 
 -  { 
 -    CheckScalar(opts[7].position,opts[7].m,opts[7].n);
 -    ticscolor= *istk(opts[7].l);
 -  }
 -
 -  if ( opts[8].position != -1 ) 
 -  { 
 -    val = (char **) opts[8].l;
 -  } 
 -
 -  if ( opts[9].position != -1 ) 
 -  { 
 -    x = stk(opts[9].l);
 -    nx = opts[9].m * opts[9].n ;  /* F.Leray OK here opts[9].m and opts[9].n are integers.*/
 -  }
 -  else 
 -  {
 -    static double x_def[1];
 -      sciPointObj * currentSubwin = sciGetCurrentSubWin();
 -      double bounds[6];
 -      sciGetDataBounds(currentSubwin, bounds);
 -    nx = 1;
 -    x = x_def ;
 -    if ( dir == 'l' ) 
 -      x_def[0] = bounds[0]; /* xMin */
 -    else if ( dir == 'r' ) 
 -      x_def[0] = bounds[1]; /* xMax */
 -  }
 -
 -  if ( opts[10].position != -1 ) 
 -  { 
 -    y = stk(opts[10].l);
 -    ny = opts[10].m * opts[10].n ;
 -  }
 -  else 
 -  {
 -    static double y_def[1];
 -      sciPointObj * currentSubwin = sciGetCurrentSubWin();
 -      double bounds[6];
 -      sciGetDataBounds(currentSubwin, bounds);
 -    ny = 1;
 -    y = y_def ;
 -    if ( dir == 'd' ) 
 -      y_def[0] = bounds[2]; /* yMin */
 -    else if ( dir == 'u' ) 
 -      y_def[0] = bounds[3]; /* yMax */
 - }
 -
 -  /* compatibility test */
 -  switch (tics ) 
 -  {
 -  case 'r' :
 -    if ( check_xy(fname,dir,3,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
 -      opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
 -      {
 -        PutLhsVar();
 -      return 0;
 -      }
 -    break;
 -  case 'i' :
 -    if ( check_xy(fname,dir,4,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
 -      opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
 -      {
 -        PutLhsVar();
 -      return 0;
 -      }
 -    break;
 -  case 'v' :
 -    if ( check_xy(fname,dir,-1,opts[9].position,opts[9].m,opts[9].n,opts[9].l,
 -      opts[10].position,opts[10].m,opts[10].n,opts[10].l,&ntics)==0) 
 -      {
 -        PutLhsVar();
 -      return 0;
 -      }
 -    break;
 -  default :
 -    Scierror(999,_("%: Wrong value for %s '%c': '%s', '%s' and '%s' expected.\n"), fname,"tics",dir,"r","v","i");
 -    return 0;
 -  }
 +    /** XXXXX : un point en suspens c'est le "S" ou une adresse est
 +     *  stockees ds un unsigned long : est ce sufisant ?
 +     */
 +    static rhs_opts opts[]= {
 +        {-1,"dir","c",0,0,0},
 +        {-1,"fontsize","i",0,0,0},
 +        {-1,"format_n","c",0,0,0},
 +        {-1,"seg","i",0,0,0},
 +        {-1,"sub_int","i",0,0,0},
 +        {-1,"textcolor","i",0,0,0},
 +        {-1,"tics","c",0,0,0},
 +        {-1,"ticscolor","i",0,0,0},
 +        {-1,"val","S",0,0,0},
 +        {-1,"x","d",0,0,0},
 +        {-1,"y","d",0,0,0},
 +        {-1,NULL,NULL,0,0}
 +    };
 +
 +    char* psubwinUID = NULL;
 +    int minrhs = -1,maxrhs = 0,minlhs=0,maxlhs=1,nopt;
 +    char dir = 'l', *format = NULL, tics = 'v', **val = NULL;
 +    int fontsize = 0, sub_int=2, seg_flag = 1,textcolor = -1,ticscolor=-1;
 +    double *x = NULL,*y = NULL;
 +    int nx=0,ny=0,ntics;
 +    int nb_tics_labels = -1;
 +
 +    nopt = NumOpt();
 +
 +    CheckRhs(minrhs,maxrhs+nopt) ;
 +    CheckLhs(minlhs,maxlhs) ;
 +
 +    if ( get_optionals(fname,opts) == 0)
-       {
-               /* error */
-               return 0;
-       }
++    {
++        /* error */
++        return 0;
++    }
 +
 +    psubwinUID = getOrCreateDefaultSubwin();
 +
 +    if ( opts[0].position != -1 )
 +    {
 +        CheckLength(opts[