Change MVC property type : string -> int 48/9048/5
Bruno JOFRET [Tue, 18 Sep 2012 13:06:46 +0000 (15:06 +0200)]
Change-Id: Icdd84520422c89fdb795b0bd705f5780e0c9e537

257 files changed:
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/InterpreterManagement.java
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/InterpreterManagementJNI.java
scilab/modules/commons/src/java/org/scilab/modules/commons/CommonFileUtils.java
scilab/modules/commons/src/java/org/scilab/modules/commons/CommonFileUtilsJNI.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommonsJNI.java
scilab/modules/completion/src/java/org/scilab/modules/completion/Completion.java
scilab/modules/completion/src/java/org/scilab/modules/completion/CompletionJNI.java
scilab/modules/console/src/java/org/scilab/modules/console/DropFiles.java
scilab/modules/console/src/java/org/scilab/modules/console/DropFilesJNI.java
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagement.java
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagementJNI.java
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
scilab/modules/graphic_objects/includes/Data3D.hxx
scilab/modules/graphic_objects/includes/DataController.hxx
scilab/modules/graphic_objects/includes/DataModel.hxx
scilab/modules/graphic_objects/includes/NgonData.hxx
scilab/modules/graphic_objects/includes/NgonGeneralData.hxx
scilab/modules/graphic_objects/includes/NgonGridData.hxx
scilab/modules/graphic_objects/includes/NgonGridMatplotData.hxx
scilab/modules/graphic_objects/includes/NgonPolylineData.hxx
scilab/modules/graphic_objects/includes/ScilabView.hxx
scilab/modules/graphic_objects/includes/TriangleMeshData.hxx
scilab/modules/graphic_objects/includes/TriangleMeshFecData.hxx
scilab/modules/graphic_objects/includes/createGraphicObject.h
scilab/modules/graphic_objects/includes/getGraphicObjectProperty.h
scilab/modules/graphic_objects/includes/graphicObjectProperties.h
scilab/modules/graphic_objects/includes/setGraphicObjectProperty.h
scilab/modules/graphic_objects/src/cpp/Data3D.cpp
scilab/modules/graphic_objects/src/cpp/DataLoader.cpp
scilab/modules/graphic_objects/src/cpp/NgonData.cpp
scilab/modules/graphic_objects/src/cpp/NgonGeneralData.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridData.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridGrayplotDataDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/NgonGridMatplotData.cpp
scilab/modules/graphic_objects/src/cpp/NgonPolylineData.cpp
scilab/modules/graphic_objects/src/cpp/Plot3DDecomposer.cpp
scilab/modules/graphic_objects/src/cpp/ScilabView.cpp
scilab/modules/graphic_objects/src/cpp/TriangleMeshData.cpp
scilab/modules/graphic_objects/src/cpp/TriangleMeshFecData.cpp
scilab/modules/graphic_objects/src/cpp/createGraphicObject.cpp
scilab/modules/graphic_objects/src/cpp/dataModel.cpp
scilab/modules/graphic_objects/src/cpp/getGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/cpp/setGraphicObjectProperty.cpp
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/CallGraphicController.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/JavaObjectLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/MainDataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeViewJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/arc/Arc.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axes/Axes.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/axis/Axis.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/compound/Compound.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/console/Console.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ClippableContouredObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/ContouredObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/contouredObject/Line.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/fec/Fec.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/figure/ColorMap.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/figure/Figure.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicController/GraphicController.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicModel/GraphicModel.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicClippableObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/FlattenTreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GedTreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GraphicView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/GuiLogView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/LogView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/ScilabView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicView/TreeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/imageplot/Grayplot.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/imageplot/Imageplot.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/imageplot/Matplot.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/label/Label.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/legend/Legend.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/polyline/Polyline.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/rectangle/Rectangle.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/surface/Fac3d.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/surface/Plot3d.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/surface/Surface.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/textObject/ClippableTextObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/textObject/Text.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/textObject/TextObject.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uibar/Uibar.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uibar/progressionbar/Progressionbar.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uibar/waitbar/Waitbar.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontextmenu/Uicontextmenu.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/Uicontrol.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/checkbox/CheckBox.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/edit/Edit.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/frame/Frame.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/listbox/ListBox.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/popupmenu/PopupMenu.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/radiobutton/RadioButton.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/slider/Slider.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uicontrol/uitext/UiText.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/uimenu/Uimenu.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/Arrow.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/Champ.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/Segs.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/vectfield/VectField.java
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphic_objects/src/jni/ScilabNativeView.i
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphic_objects/src/jni/graphic_objects.giws.xml
scilab/modules/graphic_objects/src/scripts/genPropertiesName.sh
scilab/modules/graphic_objects/src/scripts/propertiesMap.properties
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_copy.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_rotate_axes.c
scilab/modules/graphics/sci_gateway/c/sci_show_window.c
scilab/modules/graphics/sci_gateway/c/sci_unglue.c
scilab/modules/graphics/sci_gateway/c/sci_unzoom.c
scilab/modules/graphics/sci_gateway/c/sci_zoom_rect.c
scilab/modules/graphics/src/c/BuildObjects.c
scilab/modules/graphics/src/c/Format.c
scilab/modules/graphics/src/c/GetProperty.c
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/graphics/src/c/Interaction.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/axesScale.c
scilab/modules/graphics/src/c/getHandleProperty/get_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_closerequestfcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_resizefcn_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_sub_tics_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_box_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_color_flag_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_current_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_links_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_parent_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_position_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_sub_tics_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_title_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_triangles_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_x_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_y_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_z_label_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_zoom_box_property.c
scilab/modules/gui/sci_gateway/c/sci_exportUI.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.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/cpp/GetConsoleShowHiddenHandles.cpp
scilab/modules/gui/src/cpp/GetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontAngle.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontName.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontSize.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontWeight.cpp
scilab/modules/gui/src/cpp/GetUicontrolHorizontalAlignment.cpp
scilab/modules/gui/src/cpp/GetUicontrolListboxTop.cpp
scilab/modules/gui/src/cpp/GetUicontrolMax.cpp
scilab/modules/gui/src/cpp/GetUicontrolMin.cpp
scilab/modules/gui/src/cpp/GetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/GetUicontrolRelief.cpp
scilab/modules/gui/src/cpp/GetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/GetUicontrolString.cpp
scilab/modules/gui/src/cpp/GetUicontrolStyle.cpp
scilab/modules/gui/src/cpp/GetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/GetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolValue.cpp
scilab/modules/gui/src/cpp/GetUicontrolVerticalAlignment.cpp
scilab/modules/gui/src/cpp/GetUimenuChecked.cpp
scilab/modules/gui/src/cpp/GetUiobjectEnable.cpp
scilab/modules/gui/src/cpp/GetUiobjectForegroundColor.cpp
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/gui/src/cpp/SetConsoleShowHiddenHandles.cpp
scilab/modules/gui/src/cpp/SetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontAngle.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontName.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontSize.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontUnits.cpp
scilab/modules/gui/src/cpp/SetUicontrolFontWeight.cpp
scilab/modules/gui/src/cpp/SetUicontrolHorizontalAlignment.cpp
scilab/modules/gui/src/cpp/SetUicontrolListboxTop.cpp
scilab/modules/gui/src/cpp/SetUicontrolMax.cpp
scilab/modules/gui/src/cpp/SetUicontrolMin.cpp
scilab/modules/gui/src/cpp/SetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/SetUicontrolRelief.cpp
scilab/modules/gui/src/cpp/SetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/SetUicontrolString.cpp
scilab/modules/gui/src/cpp/SetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/SetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/SetUicontrolValue.cpp
scilab/modules/gui/src/cpp/SetUicontrolVerticalAlignment.cpp
scilab/modules/gui/src/cpp/SetUiobjectEnable.cpp
scilab/modules/gui/src/cpp/SetUiobjectForegroundColor.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/ScilabTermination.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ScilabTerminationJNI.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewObject.java
scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewWidget.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/checkbox/SwingScilabCheckBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/checkboxmenuitem/SwingScilabCheckBoxMenuItem.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/colorchooser/SwingScilabColorChooser.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/contextmenu/SwingScilabContextMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/editbox/SwingScilabEditBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/frame/SwingScilabFrame.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/listbox/SwingScilabListBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menu/SwingScilabMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/menuitem/SwingScilabMenuItem.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/popupmenu/SwingScilabPopupMenu.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/pushbutton/SwingScilabPushButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/radiobutton/SwingScilabRadioButton.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/slider/SwingScilabSlider.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabScrollPane.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uiimage/SwingScilabUiImage.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/uitable/SwingScilabUiTable.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/UnitsConverter.java
scilab/modules/history_manager/src/java/org/scilab/modules/history_manager/HistoryManagement.java
scilab/modules/history_manager/src/java/org/scilab/modules/history_manager/HistoryManagementJNI.java
scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCID.java
scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCIDJNI.java
scilab/modules/localization/src/java/org/scilab/modules/localization/Messages.java
scilab/modules/localization/src/java/org/scilab/modules/localization/MessagesJNI.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DataManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/FecDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/ScilabTextureManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/AxesDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/AxesRulerDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/axes/ruler/RulerDrawerManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/editor/FigureFrame.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/editor/SciTreeModel.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/label/LabelManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/legend/LegendDrawer.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/mark/MarkSpriteManager.java
scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/text/TextManager.java
scilab/modules/scicos_blocks/src/cpp/scoUtils.cpp
scilab/modules/scicos_blocks/src/cpp/scoUtils.h
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabKeywords.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabKeywordsJNI.java
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariable.java
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/UI_data.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/UI_dataJNI.java

index 48a3778..16376ab 100644 (file)
@@ -9,52 +9,52 @@
 package org.scilab.modules.action_binding;
 
 
-/**
-  * All Scilab interpreter management used in Java console
-  * @author Vincent COUVERT
-  * @copyright INRIA
-  */
+ /**
+   * All Scilab interpreter management used in Java console
+   * @author Vincent COUVERT
+   * @copyright INRIA
+   */
 public class InterpreterManagement {
 
-    /**
-      * Constructor
-      */
-    protected InterpreterManagement() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-      * Put a command in Scilab command queue so that Scilab executes it
-      * The command is displayed in Scilab Window
-      *
-      * @param command the command to execute
-      * @return execution status
-      */
-    public  static int putCommandInScilabQueue(String command) {
-        return InterpreterManagementJNI.putCommandInScilabQueue(command);
-    }
-
-
-    /**
-      * Put a command in Scilab command queue so that Scilab executes it
-      * The command is executed as soon as possible and may not be interrupted by another one.
-      * WARNING : if the command is taking some time, scilab will not do anything else
-      * before the command returns.
-      *
-      * @param command the command to execute
-      * @return execution status
-      */
-    public  static int requestScilabExec(String command) {
-        return InterpreterManagementJNI.requestScilabExec(command);
-    }
-
-
-    /**
-     * Stop Scilab current work
-     * @return execution status
-     */
-    public  static int interruptScilab() {
-        return InterpreterManagementJNI.interruptScilab();
-    }
+ /**
+   * Constructor
+   */
+ protected InterpreterManagement() {
+    throw new UnsupportedOperationException();
+ }
+  
+ /**
+   * Put a command in Scilab command queue so that Scilab executes it
+   * The command is displayed in Scilab Window
+   *
+   * @param command the command to execute
+   * @return execution status
+   */
+public  static int putCommandInScilabQueue(String command) {
+    return InterpreterManagementJNI.putCommandInScilabQueue(command);
+  }
+
+  
+ /**
+   * Put a command in Scilab command queue so that Scilab executes it
+   * The command is executed as soon as possible and may not be interrupted by another one.
+   * WARNING : if the command is taking some time, scilab will not do anything else
+   * before the command returns.
+   *
+   * @param command the command to execute
+   * @return execution status
+   */
+public  static int requestScilabExec(String command) {
+    return InterpreterManagementJNI.requestScilabExec(command);
+  }
+
+  
+ /**
+  * Stop Scilab current work
+  * @return execution status
+  */
+public  static int interruptScilab() {
+    return InterpreterManagementJNI.interruptScilab();
+  }
 
 }
index da658a4..732c83c 100644 (file)
@@ -11,35 +11,35 @@ package org.scilab.modules.action_binding;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * All Scilab interpreter management used in Java console
-  * @author Vincent COUVERT
-  * @copyright INRIA
-  */
+ /**
+   * All Scilab interpreter management used in Java console
+   * @author Vincent COUVERT
+   * @copyright INRIA
+   */
 class InterpreterManagementJNI {
 
-    /**
-      * Constructor
-      */
-    protected InterpreterManagementJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected InterpreterManagementJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("sciaction_binding");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            e.printStackTrace(System.err);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library sciaction_binding does not exist or cannot be found.");
-            System.err.println(e.getLocalizedMessage());
-            e.printStackTrace(System.err);
-        }
+  static {
+    try {
+        System.loadLibrary("sciaction_binding");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        e.printStackTrace(System.err);
+    } catch (UnsatisfiedLinkError e)    {
+        System.err.println("The native library sciaction_binding does not exist or cannot be found.");
+        System.err.println(e.getLocalizedMessage());
+        e.printStackTrace(System.err);
     }
+  }
 
-    public final static native int putCommandInScilabQueue(String jarg1);
-    public final static native int requestScilabExec(String jarg1);
-    public final static native int interruptScilab();
+  public final static native int putCommandInScilabQueue(String jarg1);
+  public final static native int requestScilabExec(String jarg1);
+  public final static native int interruptScilab();
 }
index 6fd8506..e6fd9b0 100644 (file)
@@ -9,30 +9,30 @@
 package org.scilab.modules.commons;
 
 
-/**
-  * Some file utils
-  * @author Calixte DENIZET
-  * @copyright DIGITEO 2011
-  */
+ /** 
+   * Some file utils
+   * @author Calixte DENIZET
+   * @copyright DIGITEO 2011
+   */
 public class CommonFileUtils {
 
-    /**
-      * Constructor
-      */
-    protected CommonFileUtils() {
-        throw new UnsupportedOperationException();
-    }
-    public static int isEmptyDirectory(String dirName) {
-        return CommonFileUtilsJNI.isEmptyDirectory(dirName);
-    }
+ /**
+   * Constructor
+   */
+ protected CommonFileUtils() {
+    throw new UnsupportedOperationException();
+ }
+  public static int isEmptyDirectory(String dirName) {
+    return CommonFileUtilsJNI.isEmptyDirectory(dirName);
+  }
 
-
-    /**
-      * Get the current working directory
-      * @return the Scilab CWD
-      */
-    public static String getCWD() {
-        return CommonFileUtilsJNI.getCWD();
-    }
+  
+ /**
+   * Get the current working directory
+   * @return the Scilab CWD
+   */
+public static String getCWD() {
+    return CommonFileUtilsJNI.getCWD();
+  }
 
 }
index bebe7c2..5830dcb 100644 (file)
@@ -11,39 +11,39 @@ package org.scilab.modules.commons;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * Some file utils
-  * @author Calixte DENIZET
-  * @copyright DIGITEO 2011
-  */
+ /** 
+   * Some file utils
+   * @author Calixte DENIZET
+   * @copyright DIGITEO 2011
+   */
 public class CommonFileUtilsJNI {
 
-    /**
-      * Constructor
-      */
-    protected CommonFileUtilsJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected CommonFileUtilsJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("scicommons");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            System.exit(-1);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library scicommons does not exist or cannot be found.");
-            if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
-                System.err.println(e.getLocalizedMessage());
-                System.err.println("Current java.library.path is : " + System.getProperty("java.library.path"));
-                System.exit(-1);
-            } else {
-                System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
-            }
+  static {
+    try {
+        System.loadLibrary("scicommons");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        System.exit(-1);
+    } catch (UnsatisfiedLinkError e)    {
+           System.err.println("The native library scicommons does not exist or cannot be found.");
+        if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
+           System.err.println(e.getLocalizedMessage());
+           System.err.println("Current java.library.path is : "+System.getProperty("java.library.path"));
+           System.exit(-1);
+        }else{
+           System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
         }
     }
+  }
 
-    public final static native int isEmptyDirectory(String jarg1);
-    public final static native String getCWD();
+  public final static native int isEmptyDirectory(String jarg1);
+  public final static native String getCWD();
 }
index 53d16fe..721ac03 100644 (file)
@@ -9,72 +9,72 @@
 package org.scilab.modules.commons;
 
 
-/**
-  * Some commons values from Scilab engine to Java
-  * @author Sylvestre LEDRU
-  * @copyright DIGITEO 2010
-  */
+ /** 
+   * Some commons values from Scilab engine to Java
+   * @author Sylvestre LEDRU
+   * @copyright DIGITEO 2010
+   */
 public class ScilabCommons {
 
-    /**
-      * Constructor
-      */
-    protected ScilabCommons() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-      * Get SCIHOME variable from Scilab
-      * @return SCIHOME value
-      */
-    public static String getSCIHOME() {
-        return ScilabCommonsJNI.getSCIHOME();
-    }
-
-    public static String getTMPDIR() {
-        return ScilabCommonsJNI.getTMPDIR();
-    }
-
-    public static String getlanguage() {
-        return ScilabCommonsJNI.getlanguage();
-    }
-
-    public static String createtempfilename(String prefix, int bShortFormat) {
-        return ScilabCommonsJNI.createtempfilename(prefix, bShortFormat);
-    }
-
-    public static int getieee() {
-        return ScilabCommonsJNI.getieee();
-    }
-
-    public static void setieee(int arg0) {
-        ScilabCommonsJNI.setieee(arg0);
-    }
-
-
-    /**
-      * Set the Scilab ieee mode
-      */
-    public static void setformat(String format, int width) {
-        ScilabCommonsJNI.setformat(format, width);
-    }
-
-
-    /**
-      * returns the Scilab format ("v" or "e")
-      * @return format
-      */
-    public static String getformat() {
-        return ScilabCommonsJNI.getformat();
-    }
-
-
-    /**
-      * returns the Scilab format width
-      * @return format
-      */
-    public static int getformatwidth() {
-        return ScilabCommonsJNI.getformatwidth();
-    }
+ /**
+   * Constructor
+   */
+ protected ScilabCommons() {
+    throw new UnsupportedOperationException();
+ }
+  
+ /**
+   * Get SCIHOME variable from Scilab
+   * @return SCIHOME value
+   */
+public static String getSCIHOME() {
+    return ScilabCommonsJNI.getSCIHOME();
+  }
+
+  public static String getTMPDIR() {
+    return ScilabCommonsJNI.getTMPDIR();
+  }
+
+  public static String getlanguage() {
+    return ScilabCommonsJNI.getlanguage();
+  }
+
+  public static String createtempfilename(String prefix, int bShortFormat) {
+    return ScilabCommonsJNI.createtempfilename(prefix, bShortFormat);
+  }
+
+  public static int getieee() {
+    return ScilabCommonsJNI.getieee();
+  }
+
+  public static void setieee(int arg0) {
+    ScilabCommonsJNI.setieee(arg0);
+  }
+
+  
+ /**
+   * Set the Scilab ieee mode 
+   */
+public static void setformat(String format, int width) {
+    ScilabCommonsJNI.setformat(format, width);
+  }
+
+  
+ /**
+   * returns the Scilab format ("v" or "e") 
+   * @return format
+   */
+public static String getformat() {
+    return ScilabCommonsJNI.getformat();
+  }
+
+  
+ /**
+   * returns the Scilab format width 
+   * @return format
+   */
+public static int getformatwidth() {
+    return ScilabCommonsJNI.getformatwidth();
+  }
 
 }
index 00e7047..5dbb452 100644 (file)
@@ -11,46 +11,46 @@ package org.scilab.modules.commons;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * Some commons values from Scilab engine to Java
-  * @author Sylvestre LEDRU
-  * @copyright DIGITEO 2010
-  */
+ /** 
+   * Some commons values from Scilab engine to Java
+   * @author Sylvestre LEDRU
+   * @copyright DIGITEO 2010
+   */
 public class ScilabCommonsJNI {
 
-    /**
-      * Constructor
-      */
-    protected ScilabCommonsJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected ScilabCommonsJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("scicommons");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            System.exit(-1);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library scicommons does not exist or cannot be found.");
-            if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
-                System.err.println(e.getLocalizedMessage());
-                System.err.println("Current java.library.path is : " + System.getProperty("java.library.path"));
-                System.exit(-1);
-            } else {
-                System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
-            }
+  static {
+    try {
+        System.loadLibrary("scicommons");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        System.exit(-1);
+    } catch (UnsatisfiedLinkError e)    {
+           System.err.println("The native library scicommons does not exist or cannot be found.");
+        if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
+           System.err.println(e.getLocalizedMessage());
+           System.err.println("Current java.library.path is : "+System.getProperty("java.library.path"));
+           System.exit(-1);
+        }else{
+           System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
         }
     }
+  }
 
-    public final static native String getSCIHOME();
-    public final static native String getTMPDIR();
-    public final static native String getlanguage();
-    public final static native String createtempfilename(String jarg1, int jarg2);
-    public final static native int getieee();
-    public final static native void setieee(int jarg1);
-    public final static native void setformat(String jarg1, int jarg2);
-    public final static native String getformat();
-    public final static native int getformatwidth();
+  public final static native String getSCIHOME();
+  public final static native String getTMPDIR();
+  public final static native String getlanguage();
+  public final static native String createtempfilename(String jarg1, int jarg2);
+  public final static native int getieee();
+  public final static native void setieee(int jarg1);
+  public final static native void setformat(String jarg1, int jarg2);
+  public final static native String getformat();
+  public final static native int getformatwidth();
 }
index be32fdd..0c9c021 100644 (file)
 package org.scilab.modules.completion;
 
 
-/**
-  * @author Allan CORNET
-  * @copyright INRIA 2007
-  */
+ /** 
+   * @author Allan CORNET
+   * @copyright INRIA 2007
+   */
 public class Completion {
 
-    /**
-      * Constructor
-      */
-    protected Completion() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-    * completion function on all types for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchAllDictionaries(String somechars) {
-        return CompletionJNI.searchAllDictionaries(somechars);
-    }
-
-
-    /**
-    * completion function on Functions for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchFunctionsDictionary(String somechars) {
-        return CompletionJNI.searchFunctionsDictionary(somechars);
-    }
-
-
-    /**
-    * completion function on command words for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchCommandsDictionary(String somechars) {
-        return CompletionJNI.searchCommandsDictionary(somechars);
-    }
-
-
-    /**
-    * completion function on Macros in libraries for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchMacrosDictionary(String somechars) {
-        return CompletionJNI.searchMacrosDictionary(somechars);
-    }
-
-
-    /**
-    * completion function on Variables for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchVariablesDictionary(String somechars) {
-        return CompletionJNI.searchVariablesDictionary(somechars);
-    }
-
-
-    /**
-    * completion function on files for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchFilesDictionary(String somechars) {
-        return CompletionJNI.searchFilesDictionary(somechars);
-    }
-
-
-    /**
-    * completion function on files for scilab
-    * @param[in] the line before the caret
-    * @param[in] the part
-    * @return an array of chars
-    */
-    public static String[] searchFieldsDictionary(String lineBeforeCaret, String pattern) {
-        return CompletionJNI.searchFieldsDictionary(lineBeforeCaret, pattern);
-    }
-
-
-    /**
-    * completion handle graphics properties for scilab
-    * @param[in] somechars first characters of a word
-    * @return an array of chars
-    */
-    public static String[] searchHandleGraphicsPropertiesDictionary(String somechars) {
-        return CompletionJNI.searchHandleGraphicsPropertiesDictionary(somechars);
-    }
-
-
-    /**
-    * pre parsing current line to search with completion
-    * @param[in] current line
-    * @return word to find with completion
-    */
-    public static String getPartLevel(String line) {
-        return CompletionJNI.getPartLevel(line);
-    }
-
-
-    /**
-    * pre parsing current line to search with completion (file)
-    * @param[in] current line
-    * @return word to find with completion
-    */
-    public static String getFilePartLevel(String line) {
-        return CompletionJNI.getFilePartLevel(line);
-    }
-
-
-    /**
-    * Get common part to a array
-    * @param[in] string array
-    * @param[in] size of string array
-    * @return common part
-    */
-    public static String getCommonPart(String[] dictionnary, int sizeDictionnary) {
-        return CompletionJNI.getCommonPart(dictionnary, sizeDictionnary);
-    }
-
-
-    /**
-    * complete line
-    * @param[in] current line (before caret)
-    * @param[in] line to add
-    * @param[in] type of line to add
-    * @param[in] line after caret
-    * @return modified line
-    */
-    public static String completelineforjava(String currentLine, String stringToAdd, boolean isFile, String postCaretLine) {
-        return CompletionJNI.completelineforjava(currentLine, stringToAdd, isFile, postCaretLine);
-    }
+ /**
+   * Constructor
+   */
+ protected Completion() {
+    throw new UnsupportedOperationException();
+ }
+  
+/**
+* completion function on all types for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchAllDictionaries(String somechars) {
+    return CompletionJNI.searchAllDictionaries(somechars);
+  }
+
+  
+/**
+* completion function on Functions for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchFunctionsDictionary(String somechars) {
+    return CompletionJNI.searchFunctionsDictionary(somechars);
+  }
+
+  
+/**
+* completion function on command words for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchCommandsDictionary(String somechars) {
+    return CompletionJNI.searchCommandsDictionary(somechars);
+  }
+
+  
+/**
+* completion function on Macros in libraries for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchMacrosDictionary(String somechars) {
+    return CompletionJNI.searchMacrosDictionary(somechars);
+  }
+
+  
+/**
+* completion function on Variables for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchVariablesDictionary(String somechars) {
+    return CompletionJNI.searchVariablesDictionary(somechars);
+  }
+
+  
+/**
+* completion function on files for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchFilesDictionary(String somechars) {
+    return CompletionJNI.searchFilesDictionary(somechars);
+  }
+
+  
+/**
+* completion function on files for scilab
+* @param[in] the line before the caret
+* @param[in] the part
+* @return an array of chars 
+*/
+public static String[] searchFieldsDictionary(String lineBeforeCaret, String pattern) {
+    return CompletionJNI.searchFieldsDictionary(lineBeforeCaret, pattern);
+  }
+
+  
+/**
+* completion handle graphics properties for scilab
+* @param[in] somechars first characters of a word
+* @return an array of chars 
+*/
+public static String[] searchHandleGraphicsPropertiesDictionary(String somechars) {
+    return CompletionJNI.searchHandleGraphicsPropertiesDictionary(somechars);
+  }
+
+  
+/**
+* pre parsing current line to search with completion
+* @param[in] current line
+* @return word to find with completion
+*/
+public static String getPartLevel(String line) {
+    return CompletionJNI.getPartLevel(line);
+  }
+
+  
+/**
+* pre parsing current line to search with completion (file)
+* @param[in] current line
+* @return word to find with completion
+*/
+public static String getFilePartLevel(String line) {
+    return CompletionJNI.getFilePartLevel(line);
+  }
+
+  
+/**
+* Get common part to a array
+* @param[in] string array
+* @param[in] size of string array
+* @return common part
+*/
+public static String getCommonPart(String[] dictionnary, int sizeDictionnary) {
+    return CompletionJNI.getCommonPart(dictionnary, sizeDictionnary);
+  }
+
+  
+/**
+* complete line
+* @param[in] current line (before caret)
+* @param[in] line to add
+* @param[in] type of line to add
+* @param[in] line after caret
+* @return modified line 
+*/
+public static String completelineforjava(String currentLine, String stringToAdd, boolean isFile, String postCaretLine) {
+    return CompletionJNI.completelineforjava(currentLine, stringToAdd, isFile, postCaretLine);
+  }
 
 }
index 358657f..387a9e7 100644 (file)
@@ -11,43 +11,43 @@ package org.scilab.modules.completion;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * @author Allan CORNET
-  * @copyright INRIA 2007
-  */
+ /** 
+   * @author Allan CORNET
+   * @copyright INRIA 2007
+   */
 public class CompletionJNI {
 
-    /**
-      * Constructor
-      */
-    protected CompletionJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected CompletionJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("scicompletion");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            e.printStackTrace(System.err);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library scicompletion does not exist or cannot be found.");
-            System.err.println(e.getLocalizedMessage());
-            e.printStackTrace(System.err);
-        }
+  static {
+    try {
+        System.loadLibrary("scicompletion");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        e.printStackTrace(System.err);
+    } catch (UnsatisfiedLinkError e)    {
+        System.err.println("The native library scicompletion does not exist or cannot be found.");
+        System.err.println(e.getLocalizedMessage());
+        e.printStackTrace(System.err);
     }
+  }
 
-    public final static native String[] searchAllDictionaries(String jarg1);
-    public final static native String[] searchFunctionsDictionary(String jarg1);
-    public final static native String[] searchCommandsDictionary(String jarg1);
-    public final static native String[] searchMacrosDictionary(String jarg1);
-    public final static native String[] searchVariablesDictionary(String jarg1);
-    public final static native String[] searchFilesDictionary(String jarg1);
-    public final static native String[] searchFieldsDictionary(String jarg1, String jarg2);
-    public final static native String[] searchHandleGraphicsPropertiesDictionary(String jarg1);
-    public final static native String getPartLevel(String jarg1);
-    public final static native String getFilePartLevel(String jarg1);
-    public final static native String getCommonPart(String[] jarg1, int jarg2);
-    public final static native String completelineforjava(String jarg1, String jarg2, boolean jarg3, String jarg4);
+  public final static native String[] searchAllDictionaries(String jarg1);
+  public final static native String[] searchFunctionsDictionary(String jarg1);
+  public final static native String[] searchCommandsDictionary(String jarg1);
+  public final static native String[] searchMacrosDictionary(String jarg1);
+  public final static native String[] searchVariablesDictionary(String jarg1);
+  public final static native String[] searchFilesDictionary(String jarg1);
+  public final static native String[] searchFieldsDictionary(String jarg1, String jarg2);
+  public final static native String[] searchHandleGraphicsPropertiesDictionary(String jarg1);
+  public final static native String getPartLevel(String jarg1);
+  public final static native String getFilePartLevel(String jarg1);
+  public final static native String getCommonPart(String[] jarg1, int jarg2);
+  public final static native String completelineforjava(String jarg1, String jarg2, boolean jarg3, String jarg4);
 }
index 7480ae4..37ea943 100644 (file)
@@ -9,26 +9,26 @@
 package org.scilab.modules.console;
 
 
-/**
-  * @author Allan CORNET
-  * @copyright INRIA 2007
-  */
+ /** 
+   * @author Allan CORNET
+   * @copyright INRIA 2007
+   */
 public class DropFiles {
 
-    /**
-      * Constructor
-      */
-    protected DropFiles() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-    * drop function on all types for scilab
-    * @param files list of files
-    * @return true or false
-    */
-    public static boolean dropFiles(String[] files) {
-        return DropFilesJNI.dropFiles(files);
-    }
+ /**
+   * Constructor
+   */
+ protected DropFiles() {
+    throw new UnsupportedOperationException();
+ }
+  
+/**
+* drop function on all types for scilab
+* @param files list of files
+* @return true or false
+*/
+public static boolean dropFiles(String[] files) {
+    return DropFilesJNI.dropFiles(files);
+  }
 
 }
index 067c2b8..cd51253 100644 (file)
@@ -11,37 +11,37 @@ package org.scilab.modules.console;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * @author Allan CORNET
-  * @copyright INRIA 2007
-  */
+ /** 
+   * @author Allan CORNET
+   * @copyright INRIA 2007
+   */
 public class DropFilesJNI {
 
-    /**
-      * Constructor
-      */
-    protected DropFilesJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected DropFilesJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("sciconsole");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            System.exit(-1);
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("The native library sciconsole does not exist or cannot be found.");
-            if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
-                System.err.println(e.getLocalizedMessage());
-                System.err.println("Current java.library.path is : " + System.getProperty("java.library.path"));
-                System.exit(-1);
-            } else {
-                System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
-            }
+  static {
+    try {
+        System.loadLibrary("sciconsole");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        System.exit(-1);
+    } catch (UnsatisfiedLinkError e) {
+           System.err.println("The native library sciconsole does not exist or cannot be found.");
+        if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
+           System.err.println(e.getLocalizedMessage());
+           System.err.println("Current java.library.path is : "+System.getProperty("java.library.path"));
+           System.exit(-1);
+        }else{
+           System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
         }
     }
+  }
 
-    public final static native boolean dropFiles(String[] jarg1);
+  public final static native boolean dropFiles(String[] jarg1);
 }
index 2c279c7..8ed3491 100644 (file)
@@ -9,31 +9,31 @@
 package org.scilab.modules.console;
 
 
-/**
-  * All Scilab gui management used in Java console
-  * @author Vincent COUVERT
-  * @copyright INRIA 2007
-  */
+ /** 
+   * All Scilab gui management used in Java console 
+   * @author Vincent COUVERT
+   * @copyright INRIA 2007 
+   */
 public class GuiManagement {
 
-    /**
-      * Constructor
-      */
-    protected GuiManagement() {
-        throw new UnsupportedOperationException();
-    }
+ /**
+   * Constructor
+   */
+ protected GuiManagement() {
+    throw new UnsupportedOperationException();
+ }
+  
+ /**
+   * Set Scilab parameters used to display data according the size of the console
+   * @param nbRows number of rows that can be used to display data
+   * @param nbCols number of columns that can be used to display data
+   */
+ static void setScilabLines(int nbRows, int nbCols) {
+    GuiManagementJNI.setScilabLines(nbRows, nbCols);
+  }
 
-    /**
-      * Set Scilab parameters used to display data according the size of the console
-      * @param nbRows number of rows that can be used to display data
-      * @param nbCols number of columns that can be used to display data
-      */
-    static void setScilabLines(int nbRows, int nbCols) {
-        GuiManagementJNI.setScilabLines(nbRows, nbCols);
-    }
-
-    public static void forceScilabLines(int nbRows, int nbCols) {
-        GuiManagementJNI.forceScilabLines(nbRows, nbCols);
-    }
+  public static void forceScilabLines(int nbRows, int nbCols) {
+    GuiManagementJNI.forceScilabLines(nbRows, nbCols);
+  }
 
 }
index 2fecb9b..4eb6d40 100644 (file)
@@ -11,39 +11,39 @@ package org.scilab.modules.console;
 
 /* It is generated code. Disable checkstyle */
 //CHECKSTYLE:OFF
-/**
-  * All Scilab gui management used in Java console
-  * @author Vincent COUVERT
-  * @copyright INRIA 2007
-  */
+ /** 
+   * All Scilab gui management used in Java console 
+   * @author Vincent COUVERT
+   * @copyright INRIA 2007
+   */
 public class GuiManagementJNI {
 
-    /**
-      * Constructor
-      */
-    protected GuiManagementJNI() {
-        throw new UnsupportedOperationException();
-    }
+  /**
+    * Constructor
+    */
+  protected GuiManagementJNI() {
+    throw new UnsupportedOperationException();
+  }
 
-    static {
-        try {
-            System.loadLibrary("sciconsole");
-        } catch (SecurityException e) {
-            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
-            System.err.println(e.getLocalizedMessage());
-            System.exit(-1);
-        } catch (UnsatisfiedLinkError e)    {
-            System.err.println("The native library sciconsole does not exist or cannot be found.");
-            if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
-                System.err.println(e.getLocalizedMessage());
-                System.err.println("Current java.library.path is : " + System.getProperty("java.library.path"));
-                System.exit(-1);
-            } else {
-                System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
-            }
+  static {
+    try {
+        System.loadLibrary("sciconsole");
+    } catch (SecurityException e) {
+        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
+        System.err.println(e.getLocalizedMessage());
+        System.exit(-1);
+    } catch (UnsatisfiedLinkError e)    {
+           System.err.println("The native library sciconsole does not exist or cannot be found.");
+        if (System.getenv("CONTINUE_ON_JNI_ERROR") == null) {
+           System.err.println(e.getLocalizedMessage());
+           System.err.println("Current java.library.path is : "+System.getProperty("java.library.path"));
+           System.exit(-1);
+        }else{
+           System.err.println("Continuing anyway because of CONTINUE_ON_JNI_ERROR");
         }
     }
+  }
 
-    public final static native void setScilabLines(int jarg1, int jarg2);
-    public final static native void forceScilabLines(int jarg1, int jarg2);
+  public final static native void setScilabLines(int jarg1, int jarg2);
+  public final static native void forceScilabLines(int jarg1, int jarg2);
 }
index d95a868..c7892ab 100644 (file)
@@ -90,7 +90,8 @@ int xs2file(char * fname, ExportFileType fileType )
         /* check given handle */
         if (GetType(1) == sci_handles)
         {
-            char* pstHandleType = NULL;
+            int iHandleType = -1;
+            int* piHandleType = &iHandleType;
             GetRhsVar(1, GRAPHICAL_HANDLE_DATATYPE, &m1, &n1, &l1);
             if (m1*n1 != 1)
             {
@@ -105,9 +106,9 @@ int xs2file(char * fname, ExportFileType fileType )
                 return 0;
             }
 
-            getGraphicObjectProperty(figureUID, __GO_TYPE__, jni_string, (void**)&pstHandleType);
+            getGraphicObjectProperty(figureUID, __GO_TYPE__, jni_int, (void**)&piHandleType);
 
-            if (strcmp(pstHandleType, __GO_FIGURE__))
+            if (iHandleType != __GO_FIGURE__)
             {
                 Scierror(999, _("%s: Wrong type for input argument #%d: A ''%s'' handle expected.\n"), fname, 1, "Figure");
                 return 0;
index 910c108..7ba2362 100644 (file)
@@ -199,7 +199,7 @@ public class Export {
             DrawerVisitor oldVisitor = DrawerVisitor.getVisitor(uid);
             DrawerVisitor visitor = new DrawerVisitor(null, canvas, figure) {
                     @Override
-                    public void updateObject(String id, String property) {
+                    public void updateObject(String id, int property) {
                         // Don't update during the export
                     }
                 };
@@ -298,7 +298,7 @@ public class Export {
                 joglCanvas = (JoGLCanvas) JoGLCanvasFactory.createCanvas(dims[0], dims[1]);
                 DrawerVisitor visitor = new DrawerVisitor(null, joglCanvas, figure) {
                         @Override
-                        public void updateObject(String id, String property) {
+                        public void updateObject(String id, int property) {
                             // Don't update during the export
                         }
 
index 07c2f3c..afc5b95 100644 (file)
@@ -49,7 +49,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    virtual int getPropertyFromName(char const* propertyName);
+    virtual int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 5441156..23c2714 100644 (file)
@@ -20,24 +20,24 @@ class DataController
 {
 
 public :
-    static BOOL setGraphicObjectProperty(char const* _pstID, char const* _pstName, void const* _dblValue, int numElements)
+    static BOOL setGraphicObjectProperty(char const* _pstID, int _iName, void const* _dblValue, int numElements)
     {
-        return DataModel::get()->setGraphicObjectProperty(_pstID, _pstName, _dblValue, numElements);
+        return DataModel::get()->setGraphicObjectProperty(_pstID, _iName, _dblValue, numElements);
     }
 
-    static void getGraphicObjectProperty(char const* _pstID, char const* _pstName, void **_pvData)
+    static void getGraphicObjectProperty(char const* _pstID, int _iName, void **_pvData)
     {
-        return DataModel::get()->getGraphicObjectProperty(_pstID, _pstName, _pvData);
+        return DataModel::get()->getGraphicObjectProperty(_pstID, _iName, _pvData);
     }
 
-    static void getGraphicObjectIntProperty(char const* _pstID, char const* _pstName, void **_pvData)
+    static void getGraphicObjectIntProperty(char const* _pstID, int _iName, void **_pvData)
     {
-        return DataModel::get()->getGraphicObjectIntProperty(_pstID, _pstName, _pvData);
+        return DataModel::get()->getGraphicObjectIntProperty(_pstID, _iName, _pvData);
     }
 
-    static char const* createDataObject(char const* _pstID, char const* _sType)
+    static char const* createDataObject(char const* _pstID, int _iType)
     {
-        return DataModel::get()->createDataObject(_pstID, _sType);
+        return DataModel::get()->createDataObject(_pstID, _iType);
     }
 
     static void deleteDataObject(char const* _pstID)
index 2bfb822..6bb9874 100644 (file)
@@ -60,10 +60,10 @@ public :
      * property return value (also FALSE); returning an int, with -1 for a failed
      * allocation would possibly solve this problem.
      */
-    BOOL setGraphicObjectProperty(char const* _pstID, char const* _pstName, void const* _dblValue, int numElements);
+    BOOL setGraphicObjectProperty(char const* _pstID, int _iName, void const* _dblValue, int numElements);
 
     /** Returns a graphic object vector property */
-    void getGraphicObjectProperty(char const* _pstID, char const* _pstName, void **_pvData);
+    void getGraphicObjectProperty(char const* _pstID, int _iName, void **_pvData);
 
     /**
      * Returns a graphic object integer property
@@ -72,10 +72,10 @@ public :
      * methods of the different Data classes when integer values are returned)
      * Probably redundant with getGraphicObjectProperty
      */
-    void getGraphicObjectIntProperty(char const* _pstID, char const* _pstName, void **_pvData);
+    void getGraphicObjectIntProperty(char const* _pstID, int _iName, void **_pvData);
 
     /** Creates a data object */
-    char const* createDataObject(char const* _pstID, char const* _sType);
+    char const* createDataObject(char const* _pstID, int _iType);
 
     /**
      * Deletes a data object
index 0513c0b..4e3d2b7 100644 (file)
@@ -53,7 +53,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 5ffc7d1..f9c080d 100644 (file)
@@ -56,7 +56,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 1288a2f..4829bad 100644 (file)
@@ -81,7 +81,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 04e24a4..1542c4a 100644 (file)
@@ -71,7 +71,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 72080e7..4249724 100644 (file)
@@ -71,7 +71,7 @@ public :
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 4de1b96..e6f1447 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 {
     void ScilabNativeView__createObject(char const* pstId);
     void ScilabNativeView__deleteObject(char const* pstId);
-    void ScilabNativeView__updateObject(char const* pstId, char const* pstProperty);
+    void ScilabNativeView__updateObject(char const* pstId, int iProperty);
 }
 
 class GRAPHIC_OBJECTS_IMPEXP ScilabView
@@ -52,7 +52,7 @@ private :
 public :
     static void   createObject(char const* pstId);
     static void   deleteObject(char const* pstId);
-    static void   updateObject(char const* pstId, char const* pstProperty);
+    static void   updateObject(char const* pstId, int iProperty);
 
     static int    getNbFigure(void);
     static void   getFiguresId(int ids[]);
index c48b194..f963c95 100644 (file)
@@ -74,7 +74,7 @@ public:
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index 4e61592..df7e733 100644 (file)
@@ -60,7 +60,7 @@ public:
      * @param[in] propertyName the property name
      * @return the property identifier
      */
-    int getPropertyFromName(char const* propertyName);
+    int getPropertyFromName(int propertyName);
 
     /**
      * Sets a data property
index afeeee6..07bc618 100644 (file)
@@ -19,7 +19,7 @@
 ** Ask Controller to create a graphic object
 ** of the given _sType.
 */
-GRAPHIC_OBJECTS_IMPEXP char *createGraphicObject(char const* _sType);
+GRAPHIC_OBJECTS_IMPEXP char *createGraphicObject(int _iType);
 
 /*
 ** Ask Controller to clone a graphic object
@@ -31,7 +31,7 @@ GRAPHIC_OBJECTS_IMPEXP char *cloneGraphicObject(char const* _sId);
 ** Ask Controller to create a data object
 ** referenced by the given _sId and of the given _sType
 */
-GRAPHIC_OBJECTS_IMPEXP char const* createDataObject(char const* _sId, char const* _sType);
+GRAPHIC_OBJECTS_IMPEXP char const* createDataObject(char const* _sId, int _iType);
 
 /*
 ** Ask Controller to create a figure menubar
index 8a15f58..329deaa 100644 (file)
@@ -22,7 +22,7 @@
 ** Retrieve Graphic object property from Model.
 ** Specify type expected as parameter for JNI.
 */
-GRAPHIC_OBJECTS_IMPEXP void getGraphicObjectProperty(char const* _pstID, char const* _pstName, enum _ReturnType_ _returnType, void **_pvData);
+GRAPHIC_OBJECTS_IMPEXP void getGraphicObjectProperty(char const* _pstID, const int _iName, enum _ReturnType_ _returnType, void **_pvData);
 
 /**
  * @brief release a Graphic object property from the Model.
@@ -36,6 +36,6 @@ GRAPHIC_OBJECTS_IMPEXP void getGraphicObjectProperty(char const* _pstID, char co
  * @param _returnType the property type descriptor
  * @param numElements size of the _pvData argument
  */
-GRAPHIC_OBJECTS_IMPEXP void releaseGraphicObjectProperty(char const* _pstName, void * _pvData, enum _ReturnType_ _returnType, int numElements);
+GRAPHIC_OBJECTS_IMPEXP void releaseGraphicObjectProperty(const int _iName, void * _pvData, enum _ReturnType_ _returnType, int numElements);
 
 #endif /* !__GETGRAPHICOBJECTPROPERTY_H__ */
index 298ff06..9d51860 100644 (file)
 #ifndef  __GRAPHIC_OBJECT_PROPERTIES_H__
 #define __GRAPHIC_OBJECT_PROPERTIES_H__
 
-#define __GO_ARC__                         "Arc"
-#define __GO_AXES__                        "Axes"
-#define __GO_AXESMODEL__                   "AxesModel"
-#define __GO_AXIS__                        "Axis"
-#define __GO_CHAMP__                       "Champ"
-#define __GO_COMPOUND__                    "Compound"
-#define __GO_FAC3D__                       "Fac3d"
-#define __GO_FEC__                         "Fec"
-#define __GO_FIGURE__                      "Figure"
-#define __GO_FIGUREMODEL__                 "FigureModel"
-#define __GO_GRAYPLOT__                    "Grayplot"
-#define __GO_LABEL__                       "Label"
-#define __GO_LEGEND__                      "Legend"
-#define __GO_MATPLOT__                     "Matplot"
-#define __GO_PLOT3D__                      "Plot3d"
-#define __GO_POLYLINE__                    "Polyline"
-#define __GO_RECTANGLE__                   "Rectangle"
-#define __GO_SEGS__                        "Segs"
-#define __GO_TEXT__                        "Text"
-#define __GO_UICONTROL__                   "uicontrol"
-#define __GO_UIMENU__                      "uimenu"
-#define __GO_UICONTEXTMENU__               "uicontextmenu"
-
-#define __GO_CHILDREN__                    "Children"
-#define __GO_CHILDREN_COUNT__              "ChildrenCount"
-#define __GO_PARENT__                      "Parent"
-#define __GO_USER_DATA__                   "UserData"
-#define __GO_USER_DATA_SIZE__              "UserDataSize"
-#define __GO_VISIBLE__                     "Visible"
-#define __GO_HIDDEN__                      "Hidden"
-#define __GO_TYPE__                        "Type"
-#define __GO_DATA_MODEL__                  "DataModel"
-#define __GO_PARENT_FIGURE__               "ParentFigure"
-#define __GO_PARENT_AXES__                 "ParentAxes"
-#define __GO_HAS_LEGEND_CHILD__            "HasLegendChild"
-#define __GO_LEGEND_CHILD__                "LegendChild"
-#define __GO_SELECTED_CHILD__              "SelectedChild"
-#define __GO_CALLBACK__                    "Callback"
-#define __GO_CALLBACKTYPE__                "CallbackType"
-
-#define __GO_DATA_MODEL_COORDINATES__      "DataModelCoordinates"
-#define __GO_DATA_MODEL_X__                "DataModelX"
-#define __GO_DATA_MODEL_Y__                "DataModelY"
-#define __GO_DATA_MODEL_Z__                "DataModelZ"
-
-#define __GO_DATA_MODEL_X_COORDINATES_SHIFT__          "DataModelXCoordinatesShift"
-#define __GO_DATA_MODEL_Y_COORDINATES_SHIFT__          "DataModelYCoordinatesShift"
-#define __GO_DATA_MODEL_Z_COORDINATES_SHIFT__          "DataModelZCoordinatesShift"
-
-#define __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__      "DataModelXCoordinatesShiftSet"
-#define __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__      "DataModelYCoordinatesShiftSet"
-#define __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__      "DataModelZCoordinatesShiftSet"
-
-#define __GO_DATA_MODEL_NUM_ELEMENTS__                 "DataModelNumElements"
-#define __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__           "DataModelNumElementsArray"
-#define __GO_DATA_MODEL_NUM_VERTICES_PER_GON__         "DataModelNumVerticesPerGon"
-#define __GO_DATA_MODEL_NUM_GONS__                     "DataModelNumGons"
-
-#define __GO_DATA_MODEL_Z_COORDINATES_SET__            "DataModelZCoordinatesSet"
-
-#define __GO_DATA_MODEL_COLORS__                       "DataModelColors"
-#define __GO_DATA_MODEL_NUM_COLORS__                   "DataModelNumColors"
-
-#define __GO_DATA_MODEL_NUM_VERTICES__                 "DataModelVertices"
-#define __GO_DATA_MODEL_NUM_INDICES__                  "DataModelNumIndices"
-#define __GO_DATA_MODEL_INDICES__                      "DataModelIndices"
-#define __GO_DATA_MODEL_VALUES__                       "DataModelValues"
-
-#define __GO_DATA_MODEL_FEC_TRIANGLES__                "DataModelFecTriangles"
-
-#define __GO_DATA_MODEL_NUM_X__                        "DataModelNumX"
-#define __GO_DATA_MODEL_NUM_Y__                        "DataModelNumY"
-#define __GO_DATA_MODEL_NUM_Z__                        "DataModelNumZ"
-#define __GO_DATA_MODEL_GRID_SIZE__                    "DataModelGridSize"
-#define __GO_DATA_MODEL_X_DIMENSIONS__                 "DataModelXDimensions"
-#define __GO_DATA_MODEL_Y_DIMENSIONS__                 "DataModelYDimensions"
-
-#define __GO_MATPLOT_TRANSLATE__                       "MatplotTranslate"
-#define __GO_MATPLOT_SCALE__                           "MatplotScale"
-#define __GO_DATA_MODEL_MATPLOT_BOUNDS__               "DataModelMatplotBounds"
-#define __GO_DATA_MODEL_MATPLOT_TYPE__                 "DataModelMatplotType"
-
-#define __GO_REFERENCED__                  "Referenced"
-#define __GO_VALID__                       "Valid"
-
-#define __GO_POSITION__                    "Position"
-#define __GO_SIZE__                        "Size"
-#define __GO_CANVAS__                      "Canvas"
-#define __GO_AUTORESIZE__                  "AutoResize"
-#define __GO_VIEWPORT__                    "Viewport"
-#define __GO_AXES_SIZE__                   "AxesSize"
-#define __GO_FIGURE_NAME__                 "FigureName"
-#define __GO_NAME__                        "Name"
-#define __GO_ID__                          "Id"
-#define __GO_INFO_MESSAGE__                "InfoMessage"
-#define __GO_COLORMAP__                    "ColorMap"
-#define __GO_COLORMAP_SIZE__               "ColorMapSize"
-#define __GO_RENDERING_MODE__              "RenderingMode"
-#define __GO_PIXMAP__                      "Pixmap"
-#define __GO_PIXEL_DRAWING_MODE__          "PixelDrawingMode"
-#define __GO_ANTIALIASING__                "Antialiasing"
-#define __GO_IMMEDIATE_DRAWING__           "ImmediateDrawing"
-#define __GO_BACKGROUND__                  "Background"
-#define __GO_EVENTHANDLER__                "EventHandler"
-#define __GO_EVENTHANDLER_NAME__           "EventHandlerName"
-#define __GO_EVENTHANDLER_ENABLE__         "EventHandlerEnable"
-#define __GO_TAG__                         "Tag"
-#define __GO_ROTATION_TYPE__               "RotationType"
-#define __GO_RESIZEFCN__                   "ResizeFcn"
-#define __GO_CLOSEREQUESTFCN__             "CloseRequestFcn"
-
-#define __GO_UPPER_LEFT_POINT__            "UpperLeftPoint"
-#define __GO_WIDTH__                       "Width"
-#define __GO_HEIGHT__                      "Height"
-#define __GO_START_ANGLE__                 "StartAngle"
-#define __GO_END_ANGLE__                   "EndAngle"
-#define __GO_ARC_DRAWING_METHOD__          "ArcDrawingMethod"
-
-#define __GO_X_AXIS_VISIBLE__              "XAxisVisible"
-#define __GO_X_AXIS_REVERSE__              "XAxisReverse"
-#define __GO_X_AXIS_GRID_COLOR__           "XAxisGridColor"
-#define __GO_X_AXIS_LABEL__                "XAxisLabel"
-#define __GO_X_AXIS_LOCATION__                 "XAxisLocation"
-#define __GO_X_AXIS_LOG_FLAG__             "XAxisLogFlag"
-#define __GO_X_AXIS_TICKS__                            "XAxisTicks"
-#define __GO_X_AXIS_AUTO_TICKS__               "XAxisAutoTicks"
-#define __GO_X_AXIS_NUMBER_TICKS__                     "XAxisNumberTicks"
-#define __GO_X_AXIS_TICKS_LOCATIONS__      "XAxisTicksLocations"
-#define __GO_X_AXIS_TICKS_LABELS__         "XAxisTicksLabels"
-#define __GO_X_AXIS_SUBTICKS__             "XAxisSubticks"
-
-#define __GO_Y_AXIS_VISIBLE__              "YAxisVisible"
-#define __GO_Y_AXIS_REVERSE__              "YAxisReverse"
-#define __GO_Y_AXIS_GRID_COLOR__           "YAxisGridColor"
-#define __GO_Y_AXIS_LABEL__                "YAxisLabel"
-#define __GO_Y_AXIS_LOCATION__                 "YAxisLocation"
-#define __GO_Y_AXIS_LOG_FLAG__             "YAxisLogFlag"
-#define __GO_Y_AXIS_TICKS__                            "YAxisTicks"
-#define __GO_Y_AXIS_AUTO_TICKS__               "YAxisAutoTicks"
-#define __GO_Y_AXIS_NUMBER_TICKS__                     "YAxisNumberTicks"
-#define __GO_Y_AXIS_TICKS_LOCATIONS__      "YAxisTicksLocations"
-#define __GO_Y_AXIS_TICKS_LABELS__         "YAxisTicksLabels"
-#define __GO_Y_AXIS_SUBTICKS__             "YAxisSubticks"
-
-#define __GO_Z_AXIS_VISIBLE__              "ZAxisVisible"
-#define __GO_Z_AXIS_REVERSE__              "ZAxisReverse"
-#define __GO_Z_AXIS_GRID_COLOR__           "ZAxisGridColor"
-#define __GO_Z_AXIS_LABEL__                "ZAxisLabel"
-#define __GO_Z_AXIS_LOCATION__                 "ZAxisLocation"
-#define __GO_Z_AXIS_LOG_FLAG__             "ZAxisLogFlag"
-#define __GO_Z_AXIS_TICKS__                            "ZAxisTicks"
-#define __GO_Z_AXIS_AUTO_TICKS__               "ZAxisAutoTicks"
-#define __GO_Z_AXIS_NUMBER_TICKS__                     "ZAxisNumberTicks"
-#define __GO_Z_AXIS_TICKS_LOCATIONS__      "ZAxisTicksLocations"
-#define __GO_Z_AXIS_TICKS_LABELS__         "ZAxisTicksLabels"
-#define __GO_Z_AXIS_SUBTICKS__             "ZAxisSubticks"
-
-#define __GO_AUTO_SUBTICKS__               "AutoSubticks"
-
-#define __GO_GRID_POSITION__               "GridPosition"
-#define __GO_TITLE__                       "Title"
-#define __GO_AUTO_CLEAR__                  "AutoClear"
-#define __GO_FILLED__                      "Filled"
-#define __GO_CAMERA__                      "Camera"
-#define __GO_VIEW__                        "View"
-#define __GO_ISOVIEW__                     "Isoview"
-#define __GO_CUBE_SCALING__                "CubeScaling"
-#define __GO_ROTATION_ANGLES__             "RotationAngles"
-#define __GO_ROTATION_ANGLES_3D__          "RotationAngles3d"
-#define __GO_BOX_TYPE__                    "BoxType"
-#define __GO_HIDDEN_AXIS_COLOR__           "HiddenAxisColor"
-#define __GO_TIGHT_LIMITS__                "TightLimits"
-#define __GO_DATA_BOUNDS__                 "DataBounds"
-#define __GO_REAL_DATA_BOUNDS__            "RealDataBounds"
-#define __GO_ZOOM_ENABLED__                "ZoomEnabled"
-#define __GO_ZOOM_BOX__                    "ZoomBox"
-#define __GO_AUTO_SCALE__                  "AutoScale"
-#define __GO_FIRST_PLOT__                  "FirstPlot"
-#define __GO_MARGINS__                     "Margins"
-#define __GO_AXES_BOUNDS__                 "AxesBounds"
-
-#define __GO_CLIP_PROPERTY__               "ClipProperty"
-#define __GO_CLIP_STATE__                  "ClipState"
-#define __GO_CLIP_BOX__                    "ClipBox"
-#define __GO_CLIP_BOX_SET__                "ClipBoxSet"
-
-#define __GO_LINE__                        "Line"
-#define __GO_LINE_MODE__                   "LineMode"
-#define __GO_LINE_STYLE__                  "LineStyle"
-#define __GO_LINE_THICKNESS__              "LineThickness"
-#define __GO_LINE_COLOR__                  "LineColor"
-#define __GO_FILL_MODE__                   "FillMode"
-#define __GO_MARK__                        "Mark"
-#define __GO_MARK_MODE__                   "MarkMode"
-#define __GO_MARK_STYLE__                  "MarkStyle"
-#define __GO_MARK_SIZE_UNIT__              "MarkSizeUnit"
-#define __GO_MARK_SIZE__                   "MarkSize"
-#define __GO_MARK_FOREGROUND__             "MarkForeground"
-#define __GO_MARK_BACKGROUND__             "MarkBackground"
-
-#define __GO_TICKS_DIRECTION__             "TicksDirection"
-#define __GO_X_NUMBER_TICKS__              "XNumberTicks"
-#define __GO_Y_NUMBER_TICKS__              "YNumberTicks"
-#define __GO_X_TICKS_COORDS__              "XTicksCoords"
-#define __GO_Y_TICKS_COORDS__              "YTicksCoords"
-#define __GO_TICKS_COLOR__                 "TicksColor"
-#define __GO_TICKS_SEGMENT__               "TicksSegment"
-#define __GO_TICKS_STYLE__                 "TicksStyle"
-#define __GO_SUBTICKS__                    "Subticks"
-#define __GO_NUMBER_TICKS_LABELS__         "NumberTicksLabels"
-#define __GO_TICKS_LABELS__                "TicksLabels"
-#define __GO_FORMATN__                     "Formatn"
-#define __GO_FONT__                        "Font"
-#define __GO_FONT_STYLE__                  "FontStyle"
-#define __GO_FONT_SIZE__                   "FontSize"
-#define __GO_FONT_COLOR__                  "FontColor"
-#define __GO_FONT_FRACTIONAL__             "FontFractional"
-
-#define __GO_Z_BOUNDS__                    "ZBounds"
-#define __GO_OUTSIDE_COLOR__               "OutsideColor"
-#define __GO_COLOR_RANGE__                 "ColorRange"
-
-#define __GO_DATA_MAPPING__                "DataMapping"
-
-#define __GO_FONT_ANGLE__                  "FontAngle"
-#define __GO_AUTO_POSITION__               "AutoPosition"
-#define __GO_CORNERS__                     "Corners"
-#define __GO_AUTO_ROTATION__               "AutoRotation"
-
-#define __GO_LINKS__                       "Links"
-#define __GO_LINKS_COUNT__                 "LinksCount"
-#define __GO_LEGEND_LOCATION__             "LegendLocation"
-
-#define __GO_CLOSED__                      "Closed"
-#define __GO_ARROW_SIZE_FACTOR__           "ArrowSizeFactor"
-#define __GO_POLYLINE_STYLE__              "PolylineStyle"
-#define __GO_INTERP_COLOR_VECTOR__         "InterpColorVector"
-#define __GO_INTERP_COLOR_VECTOR_SET__         "InterpColorVectorSet"
-#define __GO_INTERP_COLOR_MODE__           "InterpColorMode"
-#define __GO_X_SHIFT__                     "XShift"
-#define __GO_Y_SHIFT__                     "YShift"
-#define __GO_Z_SHIFT__                     "ZShift"
-#define __GO_BAR_WIDTH__                   "BarWidth"
-
-#define __GO_SURFACE_MODE__                "SurfaceMode"
-#define __GO_COLOR_MODE__                  "ColorMode"
-#define __GO_COLOR_FLAG__                  "ColorFlag"
-
-#define __GO_ALIGNMENT__                   "Alignment"
-#define __GO_BOX__                         "Box"
-#define __GO_TEXT_BOX__                    "TextBox"
-#define __GO_TEXT_BOX_MODE__               "TextBoxMode"
-#define __GO_AUTO_DIMENSIONING__           "AutoDimensioning"
-
-#define __GO_FORMATTED_TEXT__              "FormattedText"
-#define __GO_TEXT_ARRAY_DIMENSIONS__       "TextArrayDimensions"
-#define __GO_TEXT_STRINGS__                "TextStrings"
-
-#define __GO_BASE__                        "Base"
-#define __GO_BASE_X__                      "BaseX"
-#define __GO_BASE_Y__                      "BaseY"
-#define __GO_BASE_Z__                      "BaseZ"
-#define __GO_DIRECTION__                   "Direction"
-#define __GO_DIRECTION_X__                 "DirectionX"
-#define __GO_DIRECTION_Y__                 "DirectionY"
-#define __GO_DIRECTION_Z__                 "DirectionZ"
-#define __GO_ARROW_SIZE__                  "ArrowSize"
-#define __GO_SEGS_COLORS__                 "SegsColors"
-
-#define __GO_COLORED__                     "Colored"
-
-#define __GO_ARROWS__                      "Arrows"
-#define __GO_NUMBER_ARROWS__               "NumberArrows"
-#define __GO_CHAMP_DIMENSIONS__            "ChampDimensions"
-#define __GO_BOUNDING_BOX__                "BoundingBox"
-#define __GO_MAX_LENGTH__                  "MaxLength"
-#define __GO_MAX_USABLE_LENGTH__           "MaxUsableLength"
-
-#define __GO_HIDDEN_COLOR__                "HiddenColor"
-
-#define __GO_STYLE__                       "Style"
-#define __GO_UI_CHECKBOX__                 "checkbox"
-#define __GO_UI_EDIT__                     "edit"
-#define __GO_UI_FRAME__                    "frame"
-#define __GO_UI_IMAGE__                    "image"
-#define __GO_UI_LISTBOX__                  "listbox"
-#define __GO_UI_POPUPMENU__                "popupmenu"
-#define __GO_UI_PUSHBUTTON__               "pushbutton"
-#define __GO_UI_RADIOBUTTON__              "radiobutton"
-#define __GO_UI_SLIDER__                   "slider"
-#define __GO_UI_TABLE__                    "table"
-#define __GO_UI_TEXT__                     "text"
-
-#define __GO_UI_BACKGROUNDCOLOR__          "UIBackgroundColor"
-#define __GO_UI_ENABLE__                   "UIEnable"
-#define __GO_UI_FONTANGLE__                "UIFontAngle"
-#define __GO_UI_FONTNAME__                 "UIFontName"
-#define __GO_UI_FONTSIZE__                 "UIFontSize"
-#define __GO_UI_FONTUNITS__                "UIFontUnits"
-#define __GO_UI_FONTWEIGHT__               "UIFontWeight"
-#define __GO_UI_FOREGROUNDCOLOR__          "UIForegroundColor"
-#define __GO_UI_HORIZONTALALIGNMENT__      "UIHorizontalAlignment"
-#define __GO_UI_LISTBOXTOP__               "UIListboxTop"
-#define __GO_UI_LISTBOXTOP_SIZE__          "UIListboxTopSize"
-#define __GO_UI_MAX__                      "UIMax"
-#define __GO_UI_MIN__                      "UIMin"
-#define __GO_UI_RELIEF__                   "UIRelief"
-#define __GO_UI_STRING__                   "UIString"
-#define __GO_UI_STRING_SIZE__              "UIStringSize"
-#define __GO_UI_STRING_COLNB__             "UIStringColNb"
-#define __GO_UI_TOOLTIPSTRING__            "UITooltipString"
-#define __GO_UI_TOOLTIPSTRING_SIZE__       "UITooltipStringSize"
-#define __GO_UI_SLIDERSTEP__               "UISliderStep"
-#define __GO_UI_UNITS__                    "UIUnits"
-#define __GO_UI_VALUE__                    "UIValue"
-#define __GO_UI_VALUE_SIZE__               "UIValueSize"
-#define __GO_UI_VERTICALALIGNMENT__        "UIVerticalAlignment"
-
-#define __GO_UI_POINTS_UNITS__             "points"
-#define __GO_UI_NORMALIZED_UNITS__         "normalized"
-#define __GO_UI_INCHES_UNITS__             "inches"
-#define __GO_UI_CENTIMETERS_UNITS__        "centimeters"
-#define __GO_UI_PIXELS_UNITS__             "pixels"
-
-#define __GO_UI_FLAT_RELIEF__              "flat"
-#define __GO_UI_RAISED_RELIEF__            "raised"
-#define __GO_UI_SUNKEN_RELIEF__            "sunken"
-#define __GO_UI_GROOVE_RELIEF__            "groove"
-#define __GO_UI_RIDGE_RELIEF__             "ridge"
-#define __GO_UI_SOLID_RELIEF__             "solid"
-
-#define __GO_UIPARENTMENU__                "UIParentMenu";
-#define __GO_UICHILDMENU__                 "UIChildMenu";
-#define __GO_UICHECKEDMENU__               "UICheckedMenu";
-#define __GO_UI_CHECKED__                  "UIChecked"
-#define __GO_UI_LABEL__                    "UILabel"
-#define __GO_UI_MNEMONIC__                 "UIMnemonic"
-#define __GO_UI_ACCELERATOR__              "UIAccelerator"
-#define __GO_UI_SEPARATOR__                "UISeparator"
-#define __GO_UI_ICON__                     "UIIcon"
-
-#define __GO_CONSOLE__                     "Console"
-#define __GO_SHOWHIDDENHANDLES__           "ShowHiddenHandles"
-
-#define __GO_WAITBAR__                     "Waitbar"
-#define __GO_PROGRESSIONBAR__              "Progressionbar"
-#define __GO_UI_MESSAGE__                  "UIMessage"
-#define __GO_UI_MESSAGE_SIZE__             "UIMessageSize"
+#define __GO_ARC__                         1
+#define __GO_AXES__                        2
+#define __GO_AXESMODEL__                   3
+#define __GO_AXIS__                        4
+#define __GO_CHAMP__                       5
+#define __GO_COMPOUND__                    6
+#define __GO_FAC3D__                       7
+#define __GO_FEC__                         8
+#define __GO_FIGURE__                      9
+#define __GO_FIGUREMODEL__                 10
+#define __GO_GRAYPLOT__                    11
+#define __GO_LABEL__                       12
+#define __GO_LEGEND__                      13
+#define __GO_MATPLOT__                     14
+#define __GO_PLOT3D__                      15
+#define __GO_POLYLINE__                    16
+#define __GO_RECTANGLE__                   17
+#define __GO_SEGS__                        18
+#define __GO_TEXT__                        19
+#define __GO_UICONTROL__                   20
+#define __GO_UIMENU__                      21
+#define __GO_UICONTEXTMENU__               22
+
+#define __GO_CHILDREN__                    23
+#define __GO_CHILDREN_COUNT__              24
+#define __GO_PARENT__                      25
+#define __GO_USER_DATA__                   26
+#define __GO_USER_DATA_SIZE__              27
+#define __GO_VISIBLE__                     28
+#define __GO_HIDDEN__                      29
+#define __GO_TYPE__                        30
+#define __GO_DATA_MODEL__                  31
+#define __GO_PARENT_FIGURE__               32
+#define __GO_PARENT_AXES__                 33
+#define __GO_HAS_LEGEND_CHILD__            34
+#define __GO_LEGEND_CHILD__                35
+#define __GO_SELECTED_CHILD__              36
+#define __GO_CALLBACK__                    37
+#define __GO_CALLBACKTYPE__                38
+
+#define __GO_DATA_MODEL_COORDINATES__      39
+#define __GO_DATA_MODEL_X__                40
+#define __GO_DATA_MODEL_Y__                41
+#define __GO_DATA_MODEL_Z__                42
+
+#define __GO_DATA_MODEL_X_COORDINATES_SHIFT__          43
+#define __GO_DATA_MODEL_Y_COORDINATES_SHIFT__          44
+#define __GO_DATA_MODEL_Z_COORDINATES_SHIFT__          45
+
+#define __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__      46
+#define __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__      47
+#define __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__      48
+
+#define __GO_DATA_MODEL_NUM_ELEMENTS__                 49
+#define __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__           50
+#define __GO_DATA_MODEL_NUM_VERTICES_PER_GON__         51
+#define __GO_DATA_MODEL_NUM_GONS__                     52
+
+#define __GO_DATA_MODEL_Z_COORDINATES_SET__            53
+
+#define __GO_DATA_MODEL_COLORS__                       54
+#define __GO_DATA_MODEL_NUM_COLORS__                   55
+
+#define __GO_DATA_MODEL_NUM_VERTICES__                 56
+#define __GO_DATA_MODEL_NUM_INDICES__                  57
+#define __GO_DATA_MODEL_INDICES__                      58
+#define __GO_DATA_MODEL_VALUES__                       59
+
+#define __GO_DATA_MODEL_FEC_TRIANGLES__                60
+
+#define __GO_DATA_MODEL_NUM_X__                        61
+#define __GO_DATA_MODEL_NUM_Y__                        62
+#define __GO_DATA_MODEL_NUM_Z__                        63
+#define __GO_DATA_MODEL_GRID_SIZE__                    64
+#define __GO_DATA_MODEL_X_DIMENSIONS__                 65
+#define __GO_DATA_MODEL_Y_DIMENSIONS__                 66
+
+#define __GO_MATPLOT_TRANSLATE__                       67
+#define __GO_MATPLOT_SCALE__                           68
+#define __GO_DATA_MODEL_MATPLOT_BOUNDS__               69
+#define __GO_DATA_MODEL_MATPLOT_TYPE__                 70
+
+#define __GO_REFERENCED__                  71
+#define __GO_VALID__                       72
+
+#define __GO_POSITION__                    73
+#define __GO_SIZE__                        74
+#define __GO_CANVAS__                      75
+#define __GO_AUTORESIZE__                  76
+#define __GO_VIEWPORT__                    77
+#define __GO_AXES_SIZE__                   78
+#define __GO_FIGURE_NAME__                 79
+#define __GO_NAME__                        80
+#define __GO_ID__                          81
+#define __GO_INFO_MESSAGE__                82
+#define __GO_COLORMAP__                    83
+#define __GO_COLORMAP_SIZE__               84
+#define __GO_RENDERING_MODE__              85
+#define __GO_PIXMAP__                      86
+#define __GO_PIXEL_DRAWING_MODE__          87
+#define __GO_ANTIALIASING__                88
+#define __GO_IMMEDIATE_DRAWING__           89
+#define __GO_BACKGROUND__                  90
+#define __GO_EVENTHANDLER__                91
+#define __GO_EVENTHANDLER_NAME__           92
+#define __GO_EVENTHANDLER_ENABLE__         93
+#define __GO_TAG__                         94
+#define __GO_ROTATION_TYPE__               95
+#define __GO_RESIZEFCN__                   96
+#define __GO_CLOSEREQUESTFCN__             97
+
+#define __GO_UPPER_LEFT_POINT__            98
+#define __GO_WIDTH__                       99
+#define __GO_HEIGHT__                      100
+#define __GO_START_ANGLE__                 101
+#define __GO_END_ANGLE__                   102
+#define __GO_ARC_DRAWING_METHOD__          103
+
+#define __GO_X_AXIS_VISIBLE__              104
+#define __GO_X_AXIS_REVERSE__              105
+#define __GO_X_AXIS_GRID_COLOR__           106
+#define __GO_X_AXIS_LABEL__                107
+#define __GO_X_AXIS_LOCATION__                 108
+#define __GO_X_AXIS_LOG_FLAG__             109
+#define __GO_X_AXIS_TICKS__                            110
+#define __GO_X_AXIS_AUTO_TICKS__               111
+#define __GO_X_AXIS_NUMBER_TICKS__             112
+#define __GO_X_AXIS_TICKS_LOCATIONS__      113
+#define __GO_X_AXIS_TICKS_LABELS__         114
+#define __GO_X_AXIS_SUBTICKS__             115
+
+#define __GO_Y_AXIS_VISIBLE__              116
+#define __GO_Y_AXIS_REVERSE__              117
+#define __GO_Y_AXIS_GRID_COLOR__           118
+#define __GO_Y_AXIS_LABEL__                119
+#define __GO_Y_AXIS_LOCATION__                 120
+#define __GO_Y_AXIS_LOG_FLAG__             121
+#define __GO_Y_AXIS_TICKS__                            122
+#define __GO_Y_AXIS_AUTO_TICKS__               123
+#define __GO_Y_AXIS_NUMBER_TICKS__             124
+#define __GO_Y_AXIS_TICKS_LOCATIONS__      125
+#define __GO_Y_AXIS_TICKS_LABELS__         126
+#define __GO_Y_AXIS_SUBTICKS__             127
+
+#define __GO_Z_AXIS_VISIBLE__              128
+#define __GO_Z_AXIS_REVERSE__              129
+#define __GO_Z_AXIS_GRID_COLOR__           130
+#define __GO_Z_AXIS_LABEL__                131
+#define __GO_Z_AXIS_LOCATION__                 132
+#define __GO_Z_AXIS_LOG_FLAG__             133
+#define __GO_Z_AXIS_TICKS__                            134
+#define __GO_Z_AXIS_AUTO_TICKS__               135
+#define __GO_Z_AXIS_NUMBER_TICKS__             136
+#define __GO_Z_AXIS_TICKS_LOCATIONS__      137
+#define __GO_Z_AXIS_TICKS_LABELS__         138
+#define __GO_Z_AXIS_SUBTICKS__             139
+
+#define __GO_AUTO_SUBTICKS__               140
+
+#define __GO_GRID_POSITION__               141
+#define __GO_TITLE__                       142
+#define __GO_AUTO_CLEAR__                  143
+#define __GO_FILLED__                      144
+#define __GO_CAMERA__                      145
+#define __GO_VIEW__                        146
+#define __GO_ISOVIEW__                     147
+#define __GO_CUBE_SCALING__                148
+#define __GO_ROTATION_ANGLES__             149
+#define __GO_ROTATION_ANGLES_3D__          150
+#define __GO_BOX_TYPE__                    151
+#define __GO_HIDDEN_AXIS_COLOR__           152
+#define __GO_TIGHT_LIMITS__                153
+#define __GO_DATA_BOUNDS__                 154
+#define __GO_REAL_DATA_BOUNDS__            155
+#define __GO_ZOOM_ENABLED__                156
+#define __GO_ZOOM_BOX__                    157
+#define __GO_AUTO_SCALE__                  158
+#define __GO_FIRST_PLOT__                  159
+#define __GO_MARGINS__                     160
+#define __GO_AXES_BOUNDS__                 161
+
+#define __GO_CLIP_PROPERTY__               162
+#define __GO_CLIP_STATE__                  163
+#define __GO_CLIP_BOX__                    164
+#define __GO_CLIP_BOX_SET__                165
+
+#define __GO_LINE__                        166
+#define __GO_LINE_MODE__                   167
+#define __GO_LINE_STYLE__                  168
+#define __GO_LINE_THICKNESS__              169
+#define __GO_LINE_COLOR__                  170
+#define __GO_FILL_MODE__                   171
+#define __GO_MARK__                        172
+#define __GO_MARK_MODE__                   173
+#define __GO_MARK_STYLE__                  174
+#define __GO_MARK_SIZE_UNIT__              175
+#define __GO_MARK_SIZE__                   176
+#define __GO_MARK_FOREGROUND__             177
+#define __GO_MARK_BACKGROUND__             178
+
+#define __GO_TICKS_DIRECTION__             179
+#define __GO_X_NUMBER_TICKS__              180
+#define __GO_Y_NUMBER_TICKS__              181
+#define __GO_X_TICKS_COORDS__              182
+#define __GO_Y_TICKS_COORDS__              183
+#define __GO_TICKS_COLOR__                 184
+#define __GO_TICKS_SEGMENT__               185
+#define __GO_TICKS_STYLE__                 186
+#define __GO_SUBTICKS__                    187
+#define __GO_NUMBER_TICKS_LABELS__         188
+#define __GO_TICKS_LABELS__                189
+#define __GO_FORMATN__                     190
+#define __GO_FONT__                        191
+#define __GO_FONT_STYLE__                  192
+#define __GO_FONT_SIZE__                   193
+#define __GO_FONT_COLOR__                  194
+#define __GO_FONT_FRACTIONAL__             195
+
+#define __GO_Z_BOUNDS__                    196
+#define __GO_OUTSIDE_COLOR__               197
+#define __GO_COLOR_RANGE__                 198
+
+#define __GO_DATA_MAPPING__                199
+
+#define __GO_FONT_ANGLE__                  200
+#define __GO_AUTO_POSITION__               201
+#define __GO_CORNERS__                     202
+#define __GO_AUTO_ROTATION__               203
+
+#define __GO_LINKS__                       204
+#define __GO_LINKS_COUNT__                 205
+#define __GO_LEGEND_LOCATION__             206
+
+#define __GO_CLOSED__                      207
+#define __GO_ARROW_SIZE_FACTOR__           208
+#define __GO_POLYLINE_STYLE__              209
+#define __GO_INTERP_COLOR_VECTOR__         210
+#define __GO_INTERP_COLOR_VECTOR_SET__         211
+#define __GO_INTERP_COLOR_MODE__           212
+#define __GO_X_SHIFT__                     213
+#define __GO_Y_SHIFT__                     214
+#define __GO_Z_SHIFT__                     215
+#define __GO_BAR_WIDTH__                   216
+
+#define __GO_SURFACE_MODE__                217
+#define __GO_COLOR_MODE__                  218
+#define __GO_COLOR_FLAG__                  219
+
+#define __GO_ALIGNMENT__                   220
+#define __GO_BOX__                         221
+#define __GO_TEXT_BOX__                    222
+#define __GO_TEXT_BOX_MODE__               223
+#define __GO_AUTO_DIMENSIONING__           224
+
+#define __GO_FORMATTED_TEXT__              225
+#define __GO_TEXT_ARRAY_DIMENSIONS__       226
+#define __GO_TEXT_STRINGS__                227
+
+#define __GO_BASE__                        228
+#define __GO_BASE_X__                      229
+#define __GO_BASE_Y__                      230
+#define __GO_BASE_Z__                      231
+#define __GO_DIRECTION__                   232
+#define __GO_DIRECTION_X__                 233
+#define __GO_DIRECTION_Y__                 234
+#define __GO_DIRECTION_Z__                 235
+#define __GO_ARROW_SIZE__                  236
+#define __GO_SEGS_COLORS__                 237
+
+#define __GO_COLORED__                     238
+
+#define __GO_ARROWS__                      239
+#define __GO_NUMBER_ARROWS__               240
+#define __GO_CHAMP_DIMENSIONS__            241
+#define __GO_BOUNDING_BOX__                242
+#define __GO_MAX_LENGTH__                  243
+#define __GO_MAX_USABLE_LENGTH__           244
+
+#define __GO_HIDDEN_COLOR__                245
+
+#define __GO_STYLE__                       246
+#define __GO_UI_CHECKBOX__                 247
+#define __GO_UI_EDIT__                     248
+#define __GO_UI_FRAME__                    249
+#define __GO_UI_IMAGE__                    250
+#define __GO_UI_LISTBOX__                  251
+#define __GO_UI_POPUPMENU__                252
+#define __GO_UI_PUSHBUTTON__               253
+#define __GO_UI_RADIOBUTTON__              254
+#define __GO_UI_SLIDER__                   255
+#define __GO_UI_TABLE__                    256
+#define __GO_UI_TEXT__                     257
+
+#define __GO_UI_BACKGROUNDCOLOR__          258
+#define __GO_UI_ENABLE__                   259
+#define __GO_UI_FONTANGLE__                260
+#define __GO_UI_FONTNAME__                 261
+#define __GO_UI_FONTSIZE__                 262
+#define __GO_UI_FONTUNITS__                263
+#define __GO_UI_FONTWEIGHT__               264
+#define __GO_UI_FOREGROUNDCOLOR__          265
+#define __GO_UI_HORIZONTALALIGNMENT__      266
+#define __GO_UI_LISTBOXTOP__               267
+#define __GO_UI_LISTBOXTOP_SIZE__          268
+#define __GO_UI_MAX__                      269
+#define __GO_UI_MIN__                      270
+#define __GO_UI_RELIEF__                   271
+#define __GO_UI_STRING__                   272
+#define __GO_UI_STRING_SIZE__              273
+#define __GO_UI_STRING_COLNB__             274
+#define __GO_UI_TOOLTIPSTRING__            275
+#define __GO_UI_TOOLTIPSTRING_SIZE__       276
+#define __GO_UI_SLIDERSTEP__               277
+#define __GO_UI_UNITS__                    278
+#define __GO_UI_VALUE__                    279
+#define __GO_UI_VALUE_SIZE__               280
+#define __GO_UI_VERTICALALIGNMENT__        281
+
+#define __GO_UIPARENTMENU__                282
+#define __GO_UICHILDMENU__                 283
+#define __GO_UICHECKEDMENU__               284
+#define __GO_UI_CHECKED__                  285
+#define __GO_UI_LABEL__                    286
+#define __GO_UI_MNEMONIC__                 287
+#define __GO_UI_ACCELERATOR__              288
+#define __GO_UI_SEPARATOR__                289
+#define __GO_UI_ICON__                     290
+
+#define __GO_CONSOLE__                     291
+#define __GO_SHOWHIDDENHANDLES__           292
+
+#define __GO_WAITBAR__                     293
+#define __GO_PROGRESSIONBAR__              294
+#define __GO_UI_MESSAGE__                  295
+#define __GO_UI_MESSAGE_SIZE__             296
 
 #endif /* !__GRAPHIC_OBJECT_PROPERTIES_H__ */
index 93e3660..b501724 100644 (file)
@@ -21,6 +21,6 @@
 #include "dynlib_graphic_objects.h"
 
 GRAPHIC_OBJECTS_IMPEXP void setGraphicObjectRelationship(char const* _parentId, char const* _childId);
-GRAPHIC_OBJECTS_IMPEXP BOOL setGraphicObjectProperty(char const* _psUID, char const* _psPropertyName, void const* _pvValue, enum _ReturnType_ _valueTtype, int numElements);
+GRAPHIC_OBJECTS_IMPEXP BOOL setGraphicObjectProperty(char const* _psUID, const int _iPropertyName, void const* _pvValue, enum _ReturnType_ _valueTtype, int numElements);
 
 #endif /* !__SETGRAPHICOBJECTPROPERTY_H__ */
index 0ca8a13..a1ea434 100644 (file)
@@ -28,7 +28,7 @@ Data3D::~Data3D(void)
 
 }
 
-int Data3D::getPropertyFromName(char const* propertyName)
+int Data3D::getPropertyFromName(int propertyName)
 {
     return UNKNOWN_DATA_PROPERTY;
 }
index 51bbe3f..6df6ebc 100644 (file)
@@ -29,97 +29,88 @@ extern "C"
 #include "graphicObjectProperties.h"
 }
 
-// TODO: switch using the Type
-
-
 int getTextureWidth(char* id)
 {
-  char* type = NULL;
-  getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
-  if (strcmp(type, __GO_MATPLOT__) == 0)
-  {
-    return MatPlotDecomposer::getTextureWidth(id);
-  }
-  else
-  {
-    return 0;
-  }
+    int iType = 0;
+    int *piType = &iType;
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
+    if (iType == __GO_MATPLOT__)
+    {
+        return MatPlotDecomposer::getTextureWidth(id);
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 int getTextureHeight(char* id)
 {
-  char* type = NULL;
-  getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
-  if (strcmp(type, __GO_MATPLOT__) == 0)
-  {
-    return MatPlotDecomposer::getTextureHeight(id);
-  }
-  else
-  {
-    return 0;
-  }
+    int iType = 0;
+    int *piType = &iType;
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
+    if (iType == __GO_MATPLOT__)
+    {
+        return MatPlotDecomposer::getTextureHeight(id);
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 int fillTextureData(char* id, unsigned char* buffer, int bufferLength)
 {
-  char* type = NULL;
-  getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
-  if (strcmp(type, __GO_MATPLOT__) == 0)
-  {
-    return MatPlotDecomposer::fillTextureData(id, buffer, bufferLength);
-  }
-  else
-  {
-    return 0;
-  }
+    int iType = 0;
+    int *piType = &iType;
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
+    if (iType == __GO_MATPLOT__)
+    {
+        return MatPlotDecomposer::fillTextureData(id, buffer, bufferLength);
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 int fillSubTextureData(char* id, unsigned char* buffer, int bufferLength, int x, int y, int width, int height)
 {
-  char* type = NULL;
-  getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
-  if (strcmp(type, __GO_MATPLOT__) == 0)
-  {
-    return MatPlotDecomposer::fillTextureData(id, buffer, bufferLength, x, y, width, height);
-  }
-  else
-  {
-    return 0;
-  }
+    int iType = 0;
+    int *piType = &iType;
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
+    if (iType == __GO_MATPLOT__)
+    {
+        return MatPlotDecomposer::fillTextureData(id, buffer, bufferLength, x, y, width, height);
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 int getDataSize(char* id)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         return Fac3DDecomposer::getDataSize(id);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+    case __GO_FEC__ :
         return TriangleMeshFecDataDecomposer::getDataSize(id);
-    }
-    else if (strcmp(type, __GO_GRAYPLOT__) == 0)
-    {
+    case __GO_GRAYPLOT__ :
         return NgonGridGrayplotDataDecomposer::getDataSize(id);
-    }
-    else if (strcmp(type, __GO_MATPLOT__) == 0)
-    {
+    case __GO_MATPLOT__ :
         return NgonGridMatplotDataDecomposer::getDataSize(id);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+    case __GO_PLOT3D__ :
         return Plot3DDecomposer::getDataSize(id);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+    case __GO_POLYLINE__ :
         return PolylineDecomposer::getDataSize(id);
-    }
-    else
-    {
+    default :
         return 0;
     }
 
@@ -127,203 +118,178 @@ int getDataSize(char* id)
 
 void fillVertices(char* id, float* buffer, int bufferLength, int elementsSize, int coordinateMask, double* scale, double* translation, int logMask)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         Fac3DDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+        break;
+    case __GO_FEC__ :
         TriangleMeshFecDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-    }
-    else if (strcmp(type, __GO_GRAYPLOT__) == 0)
-    {
+        break;
+    case __GO_GRAYPLOT__ :
         NgonGridGrayplotDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-    }
-    else if (strcmp(type, __GO_MATPLOT__) == 0)
-    {
+        break;
+    case __GO_MATPLOT__ :
         NgonGridMatplotDataDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+        break;
+    case __GO_PLOT3D__ :
         Plot3DDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+        break;
+    case __GO_POLYLINE__ :
         PolylineDecomposer::fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
+        break;
     }
 }
 
 void fillTextureCoordinates(char* id, float* BUFF, int bufferLength)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         Fac3DDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+        break;
+    case __GO_FEC__ :
         TriangleMeshFecDataDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+        break;
+    case __GO_POLYLINE__ :
         PolylineDecomposer::fillTextureCoordinates(id, BUFF, bufferLength);
+        break;
     }
 }
 
 void fillColors(char* id, float* BUFF, int bufferLength, int elementsSize)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FEC__) == 0)
+    switch (iType)
     {
+    case __GO_FEC__ :
         TriangleMeshFecDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
-    }
-    else if (strcmp(type, __GO_GRAYPLOT__) == 0)
-    {
+        break;
+    case __GO_GRAYPLOT__ :
         NgonGridGrayplotDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
-    }
-    else if (strcmp(type, __GO_MATPLOT__) == 0)
-    {
+        break;
+    case __GO_MATPLOT__ :
         NgonGridMatplotDataDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+        break;
+    case __GO_PLOT3D__ :
         Plot3DDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+        break;
+    case __GO_POLYLINE__ :
         PolylineDecomposer::fillColors(id, BUFF, bufferLength, elementsSize);
+        break;
     }
 }
 
 
 int getIndicesSize(char* id)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         return Fac3DDecomposer::getIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+    case __GO_FEC__ :
         return TriangleMeshFecDataDecomposer::getIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_GRAYPLOT__) == 0)
-    {
+    case __GO_GRAYPLOT__ :
         return NgonGridGrayplotDataDecomposer::getIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_MATPLOT__) == 0)
-    {
+    case __GO_MATPLOT__ :
         return NgonGridMatplotDataDecomposer::getIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+    case __GO_PLOT3D__ :
         return Plot3DDecomposer::getIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+    case __GO_POLYLINE__ :
         return PolylineDecomposer::getIndicesSize(id);
+    default :
+        return 0;
     }
-
-    return 0;
 }
 
 
 int fillIndices(char* id, int* buffer, int bufferLength, int logMask)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         return Fac3DDecomposer::fillIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+    case __GO_FEC__ :
         return TriangleMeshFecDataDecomposer::fillIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_GRAYPLOT__) == 0)
-    {
+    case __GO_GRAYPLOT__ :
         return NgonGridGrayplotDataDecomposer::fillIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_MATPLOT__) == 0)
-    {
+    case __GO_MATPLOT__ :
         return NgonGridMatplotDataDecomposer::fillIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+    case __GO_PLOT3D__ :
         return Plot3DDecomposer::fillIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+    case __GO_POLYLINE__ :
         return PolylineDecomposer::fillIndices(id, buffer, bufferLength, logMask);
+    default :
+        return 0;
     }
-
-    return 0;
 }
 
 int getWireIndicesSize(char* id)
 {
-    char* type = NULL;
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    int iType = 0;
+    int *piType = &iType;
+
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         return Fac3DDecomposer::getWireIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+    case __GO_FEC__ :
         return TriangleMeshFecDataDecomposer::getWireIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+    case __GO_PLOT3D__ :
         return Plot3DDecomposer::getWireIndicesSize(id);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+    case __GO_POLYLINE__ :
         return PolylineDecomposer::getWireIndicesSize(id);
+    default :
+        return 0;
     }
-
-    return 0;
 }
 
 int fillWireIndices(char* id, int* buffer, int bufferLength, int logMask)
 {
-    char* type = NULL;
+    int iType = 0;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &type);
+    getGraphicObjectProperty(id, __GO_TYPE__, jni_int, (void**) &piType);
 
-    if (strcmp(type, __GO_FAC3D__) == 0)
+    switch (iType)
     {
+    case __GO_FAC3D__ :
         return Fac3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_FEC__) == 0)
-    {
+    case __GO_FEC__ :
         return TriangleMeshFecDataDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_PLOT3D__) == 0)
-    {
+    case __GO_PLOT3D__ :
         return Plot3DDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
-    }
-    else if (strcmp(type, __GO_POLYLINE__) == 0)
-    {
+    case __GO_POLYLINE__ :
         return PolylineDecomposer::fillWireIndices(id, buffer, bufferLength, logMask);
+    default :
+        return 0;
     }
-
-    return 0;
 }
 
 int getMarkIndicesSize(char* id)
index 21e24f0..2940b22 100644 (file)
@@ -34,19 +34,15 @@ NgonData::~NgonData(void)
 
 }
 
-int NgonData::getPropertyFromName(char const* propertyName)
+int NgonData::getPropertyFromName(int propertyName)
 {
-
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_GONS__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_GONS__ :
         return NUM_GONS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_VERTICES_PER_GON__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_VERTICES_PER_GON__ :
         return NUM_VERTICES_PER_GON;
-    }
-    else
-    {
+    default :
         return Data3D::getPropertyFromName(propertyName);
     }
 
index 2811b2a..5aa3ad2 100644 (file)
@@ -47,41 +47,27 @@ NgonGeneralData::~NgonGeneralData(void)
     }
 }
 
-int NgonGeneralData::getPropertyFromName(char const* propertyName)
+int NgonGeneralData::getPropertyFromName(int propertyName)
 {
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__ :
         return NUM_ELEMENTS_ARRAY;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_COORDINATES__) == 0)
-    {
+    case __GO_DATA_MODEL_COORDINATES__ :
         return COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X__) == 0)
-    {
+    case __GO_DATA_MODEL_X__ :
         return X_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y__) == 0)
-    {
+    case __GO_DATA_MODEL_Y__ :
         return Y_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z__) == 0)
-    {
+    case __GO_DATA_MODEL_Z__ :
         return Z_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_COLORS__) == 0)
-    {
+    case __GO_DATA_MODEL_COLORS__ :
         return COLORS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_COLORS__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_COLORS__ :
         return NUM_COLORS;
-    }
-    else
-    {
+    default :
         return NgonData::getPropertyFromName(propertyName);
     }
-
 }
 
 int NgonGeneralData::setDataProperty(int property, void const* value, int numElements)
index 5a80a6c..fff18a7 100644 (file)
@@ -61,50 +61,31 @@ NgonGridData::~NgonGridData(void)
     }
 }
 
-int NgonGridData::getPropertyFromName(char const* propertyName)
+int NgonGridData::getPropertyFromName(int propertyName)
 {
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_X__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_X__ :
         return NUM_X;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_Y__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_Y__ :
         return NUM_Y;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_Z__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_Z__ :
         return NUM_Z;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X_DIMENSIONS__) == 0)
-    {
+    case __GO_DATA_MODEL_X_DIMENSIONS__ :
         return X_DIMENSIONS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y_DIMENSIONS__) == 0)
-    {
+    case __GO_DATA_MODEL_Y_DIMENSIONS__ :
         return Y_DIMENSIONS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_GRID_SIZE__) == 0)
-    {
+    case __GO_DATA_MODEL_GRID_SIZE__ :
         return GRID_SIZE;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X__) == 0)
-    {
+    case __GO_DATA_MODEL_X__ :
         return X_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y__) == 0)
-    {
+    case __GO_DATA_MODEL_Y__ :
         return Y_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z__) == 0)
-    {
+    case __GO_DATA_MODEL_Z__ :
         return Z_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z_COORDINATES_SHIFT__) == 0)
-    {
+    case __GO_DATA_MODEL_Z_COORDINATES_SHIFT__ :
         return Z_COORDINATES_SHIFT;
-    }
-    else
-    {
+    default :
         return NgonData::getPropertyFromName(propertyName);
     }
 
index 38127e7..53d732b 100644 (file)
@@ -52,7 +52,6 @@ void NgonGridGrayplotDataDecomposer::fillColors(char* id, float* buffer, int buf
 
     getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &z);
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &parent);
     getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
index 9f50371..cf22dbf 100644 (file)
@@ -29,26 +29,19 @@ NgonGridMatplotData::~NgonGridMatplotData(void)
 
 }
 
-int NgonGridMatplotData::getPropertyFromName(char const* propertyName)
+int NgonGridMatplotData::getPropertyFromName(int propertyName)
 {
-    if (strcmp(propertyName, __GO_DATA_MODEL_GRID_SIZE__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_GRID_SIZE__ :
         return GRID_SIZE;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_MATPLOT_BOUNDS__) == 0)
-    {
+    case __GO_DATA_MODEL_MATPLOT_BOUNDS__ :
         return MATPLOT_BOUNDS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_MATPLOT_TYPE__) == 0)
-    {
+    case __GO_DATA_MODEL_MATPLOT_TYPE__ :
         return MATPLOT_TYPE;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z__) == 0)
-    {
+    case __GO_DATA_MODEL_Z__ :
         return Z_COORDINATES;
-    }
-    else
-    {
+    default :
         return NgonGridData::getPropertyFromName(propertyName);
     }
 
index 6524075..3fdc9df 100644 (file)
@@ -56,47 +56,29 @@ NgonPolylineData::~NgonPolylineData(void)
     }
 }
 
-int NgonPolylineData::getPropertyFromName(char const* propertyName)
+int NgonPolylineData::getPropertyFromName(int propertyName)
 {
-
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__ :
         return NUM_ELEMENTS_ARRAY;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X_COORDINATES_SHIFT__) == 0)
-    {
+    case __GO_DATA_MODEL_X_COORDINATES_SHIFT__ :
         return X_COORDINATES_SHIFT;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y_COORDINATES_SHIFT__) == 0)
-    {
+    case __GO_DATA_MODEL_Y_COORDINATES_SHIFT__ :
         return Y_COORDINATES_SHIFT;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z_COORDINATES_SHIFT__) == 0)
-    {
+    case __GO_DATA_MODEL_Z_COORDINATES_SHIFT__ :
         return Z_COORDINATES_SHIFT;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_ELEMENTS__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_ELEMENTS__ :
         return NUM_ELEMENTS;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__) == 0)
-    {
+    case __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__ :
         return X_COORDINATES_SHIFT_SET;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__) == 0)
-    {
+    case __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__ :
         return Y_COORDINATES_SHIFT_SET;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__) == 0)
-    {
+    case __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__ :
         return Z_COORDINATES_SHIFT_SET;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z_COORDINATES_SET__) == 0)
-    {
+    case __GO_DATA_MODEL_Z_COORDINATES_SET__ :
         return Z_COORDINATES_SET;
-    }
-    else
-    {
+    default :
         return NgonGeneralData::getPropertyFromName(propertyName);
     }
 
index 1a4355b..50a9577 100644 (file)
@@ -109,7 +109,6 @@ void Plot3DDecomposer::fillColors(char* id, float* buffer, int bufferLength, int
 
     getGraphicObjectProperty(id, __GO_DATA_MODEL_Z__, jni_double_vector, (void**) &z);
 
-    getGraphicObjectProperty(id, __GO_TYPE__, jni_string, (void**) &parent);
     getGraphicObjectProperty(id, __GO_PARENT__, jni_string, (void**) &parent);
 
     /* Temporary: to avoid getting a null parent_figure property when the object is built */
index a98094b..2ff9c3f 100644 (file)
@@ -41,9 +41,9 @@ void ScilabNativeView__deleteObject(char const*pstId)
     ScilabView::deleteObject(pstId);
 }
 
-void ScilabNativeView__updateObject(char const* pstId, char const* pstProperty)
+void ScilabNativeView__updateObject(char const* pstId, int iProperty)
 {
-    ScilabView::updateObject(pstId, pstProperty);
+    ScilabView::updateObject(pstId, iProperty);
 }
 
 /**
@@ -104,10 +104,11 @@ int ScilabView::getNbFigure(void)
 void ScilabView::createObject(char const* pstId)
 {
     //std::cerr << "[ScilabView] ++ createObject UID=" << pstId << std::endl;
-    char *pstType = NULL;
+    int iType = -1;
+    int *piType = &iType;
 
-    getGraphicObjectProperty(pstId, __GO_TYPE__, jni_string, (void **)&pstType);
-    if (pstType != NULL && strcmp(pstType, __GO_FIGURE__) == 0)
+    getGraphicObjectProperty(pstId, __GO_TYPE__, jni_int, (void **)&piType);
+    if (iType != -1 && iType == __GO_FIGURE__)
     {
         m_figureList[pstId] = -1;
         setCurrentFigure(pstId);
@@ -120,15 +121,16 @@ void ScilabView::createObject(char const* pstId)
 void ScilabView::deleteObject(char const* pstId)
 {
     //std::cerr << "[ScilabView] -- deleteObject UID=" << pstId << std::endl;
-    char *pstType = NULL;
+    int iType = -1;
+    int *piType = &iType;
     char *pstParentUID = NULL;
 
-    getGraphicObjectProperty(pstId, __GO_TYPE__, jni_string, (void **)&pstType);
+    getGraphicObjectProperty(pstId, __GO_TYPE__, jni_int, (void **)&piType);
 
     /*
     ** If deleting a figure, remove from figure list.
     */
-    if (pstType != NULL && strcmp(pstType, __GO_FIGURE__) == 0)
+    if (iType != -1 && iType == __GO_FIGURE__)
     {
         m_figureList.erase(pstId);
     }
@@ -170,14 +172,14 @@ void ScilabView::deleteObject(char const* pstId)
     deleteDataObject(pstId);
 }
 
-void ScilabView::updateObject(char const* pstId, char const* pstProperty)
+void ScilabView::updateObject(char const* pstId, int iProperty)
 {
     //std::cerr << "[ScilabView] == updateObject UID=" << pstId << " PROPERTY=" << pstProperty << std::endl;
 
     /*
      ** Take care of update if the value update is ID and object type is a Figure I manage.
      */
-    if (strcmp(pstProperty, __GO_ID__) == 0 && m_figureList.find(pstId) != m_figureList.end())
+    if (iProperty == __GO_ID__ && m_figureList.find(pstId) != m_figureList.end())
     {
         int iNewId = 0;
         int *piNewId = &iNewId;
index ba5da5c..5b11cd8 100644 (file)
@@ -57,42 +57,27 @@ TriangleMeshData::~TriangleMeshData(void)
 
 }
 
-int TriangleMeshData::getPropertyFromName(char const* propertyName)
+int TriangleMeshData::getPropertyFromName(int propertyName)
 {
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_VERTICES__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_VERTICES__ :
         return NUM_VERTICES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_NUM_INDICES__) == 0)
-    {
+    case __GO_DATA_MODEL_NUM_INDICES__ :
         return NUM_INDICES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_X__) == 0)
-    {
+    case __GO_DATA_MODEL_X__ :
         return X_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Y__) == 0)
-    {
+    case __GO_DATA_MODEL_Y__ :
         return Y_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_Z__) == 0)
-    {
+    case __GO_DATA_MODEL_Z__ :
         return Z_COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_COORDINATES__) == 0)
-    {
+    case __GO_DATA_MODEL_COORDINATES__ :
         return COORDINATES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_INDICES__) == 0)
-    {
+    case __GO_DATA_MODEL_INDICES__ :
         return INDICES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_VALUES__) == 0)
-    {
+    case __GO_DATA_MODEL_VALUES__ :
         return VALUES;
-    }
-    else
-    {
+    default :
         return Data3D::getPropertyFromName(propertyName);
     }
 
index 800fba0..1cdec08 100644 (file)
@@ -64,18 +64,15 @@ TriangleMeshFecData::~TriangleMeshFecData(void)
     numberTriangles = 0;
 }
 
-int TriangleMeshFecData::getPropertyFromName(char const* propertyName)
+int TriangleMeshFecData::getPropertyFromName(int propertyName)
 {
-    if (strcmp(propertyName, __GO_DATA_MODEL_NUM_INDICES__) == 0)
+    switch (propertyName)
     {
+    case __GO_DATA_MODEL_NUM_INDICES__ :
         return NUM_INDICES;
-    }
-    else if (strcmp(propertyName, __GO_DATA_MODEL_FEC_TRIANGLES__) == 0)
-    {
+    case __GO_DATA_MODEL_FEC_TRIANGLES__ :
         return FEC_TRIANGLES;
-    }
-    else
-    {
+    default :
         return TriangleMeshData::getPropertyFromName(propertyName);
     }
 }
index 7cc2f26..4c0af1e 100644 (file)
@@ -22,9 +22,9 @@ extern "C"
 
 using namespace org_scilab_modules_graphic_objects;
 
-char *createGraphicObject(char const* _sType)
+char *createGraphicObject(int _iType)
 {
-    return CallGraphicController::askGraphicObject(getScilabJavaVM(), _sType);
+    return CallGraphicController::askGraphicObject(getScilabJavaVM(), _iType);
 }
 
 char *cloneGraphicObject(char const* _sId)
@@ -32,9 +32,9 @@ char *cloneGraphicObject(char const* _sId)
     return CallGraphicController::cloneGraphicObject(getScilabJavaVM(), _sId);
 }
 
-char const* createDataObject(char const* _sId, char const* _sType)
+char const* createDataObject(char const* _sId, int _iType)
 {
-    return DataController::createDataObject(_sId, _sType);
+    return DataController::createDataObject(_sId, _iType);
 }
 
 void buildFigureMenuBar(char const* _sFigureId)
index ff7b879..7169be1 100644 (file)
@@ -20,7 +20,7 @@ extern "C" {
 
 DataModel *DataModel::m_me = NULL;
 
-BOOL DataModel::setGraphicObjectProperty(char const* _pstID, char const* _pstName, void const* _dblValue, int numElements)
+BOOL DataModel::setGraphicObjectProperty(char const* _pstID, int _iName, void const* _dblValue, int numElements)
 {
     Data3D* dataObject = NULL;
     int property = 0;
@@ -28,40 +28,36 @@ BOOL DataModel::setGraphicObjectProperty(char const* _pstID, char const* _pstNam
 
     dataObject = (*m_dataMap)[std::string(_pstID)];
 
-    property = dataObject->getPropertyFromName(_pstName);
+    property = dataObject->getPropertyFromName(_iName);
 
     returnValue = dataObject->setDataProperty(property, _dblValue, numElements);
 
     return (BOOL) returnValue;
 }
 
-void DataModel::getGraphicObjectProperty(char const* _pstID, char const* _pstName, void **_pvData)
+void DataModel::getGraphicObjectProperty(char const* _pstID, int _iName, void **_pvData)
 {
     Data3D* dataObject = NULL;
     int property = 0;
 
     dataObject = (*m_dataMap)[std::string(_pstID)];
 
-    property = dataObject->getPropertyFromName(_pstName);
+    property = dataObject->getPropertyFromName(_iName);
 
     dataObject->getDataProperty(property, _pvData);
 }
 
-void DataModel::getGraphicObjectIntProperty(char const* _pstID, char const* _pstName, void **_pvData)
+void DataModel::getGraphicObjectIntProperty(char const* _pstID, int _iName, void **_pvData)
 {
     Data3D* dataObject = NULL;
     int property = 0;
 
-    property = (*m_dataMap)[std::string(_pstID)]->getPropertyFromName(_pstName);
-
-    dataObject = (*m_dataMap)[std::string(_pstID)];
-
-    property = dataObject->getPropertyFromName(_pstName);
+    property = (*m_dataMap)[std::string(_pstID)]->getPropertyFromName(_iName);
 
     dataObject->getDataProperty(property, _pvData);
 }
 
-char const* DataModel::createDataObject(char const* _pstID, char const* _sType)
+char const* DataModel::createDataObject(char const* _pstID, int _iType)
 {
     Data3D* newObject = NULL;
 
@@ -69,32 +65,27 @@ char const* DataModel::createDataObject(char const* _pstID, char const* _sType)
      * To be implemented as the Java graphicObject class' similar function
      * (getTypeFromName) in order to avoid strcmp calls.
      */
-    if (strcmp(_sType, __GO_GRAYPLOT__) == 0)
-    {
+
+    switch (_iType) {
+    case __GO_GRAYPLOT__ :
         newObject = new NgonGridData();
-    }
-    else if (strcmp(_sType, __GO_MATPLOT__) == 0)
-    {
+        break;
+    case __GO_MATPLOT__ :
         newObject = new NgonGridMatplotData();
-    }
-    else if (strcmp(_sType, __GO_FAC3D__) == 0)
-    {
+        break;
+    case __GO_FAC3D__ :
         newObject = new NgonGeneralData();
-    }
-    else if (strcmp(_sType, __GO_PLOT3D__) == 0)
-    {
+        break;
+    case __GO_PLOT3D__ :
         newObject = new NgonGridData();
-    }
-    else if (strcmp(_sType, __GO_POLYLINE__) == 0)
-    {
+        break;
+    case __GO_POLYLINE__ :
         newObject = new NgonPolylineData();
-    }
-    else if (strcmp(_sType, __GO_FEC__) == 0)
-    {
+        break;
+    case __GO_FEC__ :
         newObject = new TriangleMeshFecData();
-    }
-    else
-    {
+        break;
+    default :
         return NULL;
     }
 
index 0347795..6de1587 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 
 using namespace org_scilab_modules_graphic_objects;
 
-void getGraphicObjectProperty(char const* _pstID, char const* _pstName, _ReturnType_ _returnType, void **_pvData)
+void getGraphicObjectProperty(char const* _pstID, int _iName, _ReturnType_ _returnType, void **_pvData)
 {
     // do not perform anything if the id is undefined
     if (_pstID == NULL)
@@ -33,9 +33,40 @@ void getGraphicObjectProperty(char const* _pstID, char const* _pstName, _ReturnT
     }
 
     /* All the Data model properties have the DATA_MODEL prefix */
-    if (strncmp(_pstName, __GO_DATA_MODEL__, strlen(__GO_DATA_MODEL__)) == 0)
+    if (_iName == __GO_DATA_MODEL__
+        || _iName == __GO_DATA_MODEL_COORDINATES__
+        || _iName == __GO_DATA_MODEL_X__
+        || _iName == __GO_DATA_MODEL_Y__
+        || _iName == __GO_DATA_MODEL_Z__
+        || _iName == __GO_DATA_MODEL_X_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_Y_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_NUM_ELEMENTS__
+        || _iName == __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__
+        || _iName == __GO_DATA_MODEL_NUM_VERTICES_PER_GON__
+        || _iName == __GO_DATA_MODEL_NUM_GONS__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SET__
+        || _iName == __GO_DATA_MODEL_COLORS__
+        || _iName == __GO_DATA_MODEL_NUM_COLORS__
+        || _iName == __GO_DATA_MODEL_NUM_VERTICES__
+        || _iName == __GO_DATA_MODEL_NUM_INDICES__
+        || _iName == __GO_DATA_MODEL_INDICES__
+        || _iName == __GO_DATA_MODEL_VALUES__
+        || _iName == __GO_DATA_MODEL_FEC_TRIANGLES__
+        || _iName == __GO_DATA_MODEL_NUM_X__
+        || _iName == __GO_DATA_MODEL_NUM_Y__
+        || _iName == __GO_DATA_MODEL_NUM_Z__
+        || _iName == __GO_DATA_MODEL_GRID_SIZE__
+        || _iName == __GO_DATA_MODEL_X_DIMENSIONS__
+        || _iName == __GO_DATA_MODEL_Y_DIMENSIONS__
+        || _iName == __GO_DATA_MODEL_MATPLOT_BOUNDS__
+        || _iName == __GO_DATA_MODEL_MATPLOT_TYPE__
+               )
     {
-        DataController::getGraphicObjectProperty(_pstID, _pstName, _pvData);
+        DataController::getGraphicObjectProperty(_pstID, _iName, _pvData);
         return;
     }
 
@@ -45,42 +76,42 @@ void getGraphicObjectProperty(char const* _pstID, char const* _pstName, _ReturnT
         {
             case jni_string:
             {
-                *(_pvData) = CallGraphicController::getGraphicObjectPropertyAsString(getScilabJavaVM(), _pstID, _pstName);
+                *(_pvData) = CallGraphicController::getGraphicObjectPropertyAsString(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_string_vector:
             {
-                *_pvData = CallGraphicController::getGraphicObjectPropertyAsStringVector(getScilabJavaVM(), _pstID, _pstName);
+                *_pvData = CallGraphicController::getGraphicObjectPropertyAsStringVector(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_double:
             {
-                ((double *)*_pvData)[0] = (double)CallGraphicController::getGraphicObjectPropertyAsDouble(getScilabJavaVM(), _pstID, _pstName);
+                ((double *)*_pvData)[0] = (double)CallGraphicController::getGraphicObjectPropertyAsDouble(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_double_vector:
             {
-                *_pvData = CallGraphicController::getGraphicObjectPropertyAsDoubleVector(getScilabJavaVM(), _pstID, _pstName);
+                *_pvData = CallGraphicController::getGraphicObjectPropertyAsDoubleVector(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_bool:
             {
-                ((int *)*_pvData)[0] = (int)CallGraphicController::getGraphicObjectPropertyAsBoolean(getScilabJavaVM(), _pstID, _pstName);
+                ((int *)*_pvData)[0] = (int)CallGraphicController::getGraphicObjectPropertyAsBoolean(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_bool_vector:
             {
-                *_pvData = CallGraphicController::getGraphicObjectPropertyAsBooleanVector(getScilabJavaVM(), _pstID, _pstName);
+                *_pvData = CallGraphicController::getGraphicObjectPropertyAsBooleanVector(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_int:
             {
-                ((int *)*_pvData)[0] = CallGraphicController::getGraphicObjectPropertyAsInteger(getScilabJavaVM(), _pstID, _pstName);
+                ((int *)*_pvData)[0] = CallGraphicController::getGraphicObjectPropertyAsInteger(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             case jni_int_vector:
             {
-                *_pvData = CallGraphicController::getGraphicObjectPropertyAsIntegerVector(getScilabJavaVM(), _pstID, _pstName);
+                *_pvData = CallGraphicController::getGraphicObjectPropertyAsIntegerVector(getScilabJavaVM(), _pstID, _iName);
                 return;
             }
             default:
@@ -99,11 +130,11 @@ void getGraphicObjectProperty(char const* _pstID, char const* _pstName, _ReturnT
 }
 
 
-void releaseGraphicObjectProperty(char const* _pstName, void * _pvData, enum _ReturnType_ _returnType, int numElements)
+void releaseGraphicObjectProperty(int _iName, void * _pvData, enum _ReturnType_ _returnType, int numElements)
 {
 
     /* All the Data model properties have the DATA_MODEL prefix */
-    if (strncmp(_pstName, __GO_DATA_MODEL__, strlen(__GO_DATA_MODEL__)) == 0)
+    if (_iName == __GO_DATA_MODEL__)
     {
         // passed by reference, do not free them
         return;
index 9b5e816..bf087bf 100644 (file)
@@ -36,7 +36,7 @@ void setGraphicObjectRelationship(char const* _parentId, char const* _childId)
     CallGraphicController::setGraphicObjectRelationship(getScilabJavaVM(), _parentId, _childId);
 }
 
-BOOL setGraphicObjectProperty(char const* _pstID, char const* _pstName, void const* _pvValue, _ReturnType_ _valueType, int numElements)
+BOOL setGraphicObjectProperty(char const* _pstID, int _iName, void const* _pvValue, _ReturnType_ _valueType, int numElements)
 {
     bool result = false;
 
@@ -52,9 +52,40 @@ BOOL setGraphicObjectProperty(char const* _pstID, char const* _pstName, void con
 
 
     // Special Case for data, no need to go through Java.
-    if (strncmp(_pstName, __GO_DATA_MODEL__, strlen(__GO_DATA_MODEL__)) == 0)
+    if (_iName == __GO_DATA_MODEL__
+        || _iName == __GO_DATA_MODEL_COORDINATES__
+        || _iName == __GO_DATA_MODEL_X__
+        || _iName == __GO_DATA_MODEL_Y__
+        || _iName == __GO_DATA_MODEL_Z__
+        || _iName == __GO_DATA_MODEL_X_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_Y_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SHIFT__
+        || _iName == __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__
+        || _iName == __GO_DATA_MODEL_NUM_ELEMENTS__
+        || _iName == __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__
+        || _iName == __GO_DATA_MODEL_NUM_VERTICES_PER_GON__
+        || _iName == __GO_DATA_MODEL_NUM_GONS__
+        || _iName == __GO_DATA_MODEL_Z_COORDINATES_SET__
+        || _iName == __GO_DATA_MODEL_COLORS__
+        || _iName == __GO_DATA_MODEL_NUM_COLORS__
+        || _iName == __GO_DATA_MODEL_NUM_VERTICES__
+        || _iName == __GO_DATA_MODEL_NUM_INDICES__
+        || _iName == __GO_DATA_MODEL_INDICES__
+        || _iName == __GO_DATA_MODEL_VALUES__
+        || _iName == __GO_DATA_MODEL_FEC_TRIANGLES__
+        || _iName == __GO_DATA_MODEL_NUM_X__
+        || _iName == __GO_DATA_MODEL_NUM_Y__
+        || _iName == __GO_DATA_MODEL_NUM_Z__
+        || _iName == __GO_DATA_MODEL_GRID_SIZE__
+        || _iName == __GO_DATA_MODEL_X_DIMENSIONS__
+        || _iName == __GO_DATA_MODEL_Y_DIMENSIONS__
+        || _iName == __GO_DATA_MODEL_MATPLOT_BOUNDS__
+        || _iName == __GO_DATA_MODEL_MATPLOT_TYPE__
+        )
     {
-        result = BOOLtobool(DataController::setGraphicObjectProperty(_pstID, _pstName, _pvValue, numElements));
+        result = BOOLtobool(DataController::setGraphicObjectProperty(_pstID, _iName, _pvValue, numElements));
         CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, __GO_DATA_MODEL__, _pstID);
         return booltoBOOL(result);
     }
@@ -62,43 +93,43 @@ BOOL setGraphicObjectProperty(char const* _pstID, char const* _pstName, void con
     switch (_valueType)
     {
         case jni_string :
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (char *)_pvValue);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (char *)_pvValue);
             break;
 
         case jni_string_vector :
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (char**)_pvValue, numElements);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (char**)_pvValue, numElements);
             break;
 
         case jni_double :
             doubleValue = *(double*)_pvValue;
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (double)doubleValue);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (double)doubleValue);
             break;
 
         case jni_double_vector :
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (double*)_pvValue, numElements);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (double*)_pvValue, numElements);
             break;
 
         case jni_int :
 
             intValue = *(int*)_pvValue;
 
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (int)intValue);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (int)intValue);
             break;
 
         case jni_int_vector :
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (int*)_pvValue, numElements);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (int*)_pvValue, numElements);
             break;
 
         case jni_bool :
 
             boolValue = *(BOOL*)_pvValue;
 
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, BOOLtobool(boolValue));
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, BOOLtobool(boolValue));
             break;
 
         case jni_bool_vector :
 
-            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _pstName, (bool*)_pvValue, numElements);
+            result = CallGraphicController::setGraphicObjectProperty(getScilabJavaVM(), _pstID, _iName, (bool*)_pvValue, numElements);
 
             break;
 
index 289b923..736d27a 100644 (file)
@@ -37,7 +37,7 @@ public final class CallGraphicController {
         return GraphicController.getController().cloneObject(id);
     }
 
-    public static String askGraphicObject(String typeName) {
+    public static String askGraphicObject(int typeName) {
         return GraphicController.getController().askObject(GraphicObject.getTypeFromName(typeName));
     }
 
@@ -45,27 +45,27 @@ public final class CallGraphicController {
         GraphicController.getController().deleteObject(id);
     }
 
-    private static boolean setGraphicObjectProperty(String id, String propertyName, Object value) {
+    private static boolean setGraphicObjectProperty(String id, int propertyName, Object value) {
         return GraphicController.getController().setProperty(id, propertyName, value);
     }
 
-    private static Object getGraphicObjectProperty(String id, String propertyName) {
+    private static Object getGraphicObjectProperty(String id, int propertyName) {
         return GraphicController.getController().getProperty(id, propertyName);
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, String value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, String value) {
         return setGraphicObjectProperty(id, propertyName, (Object) value);
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, String[] value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, String[] value) {
         return setGraphicObjectProperty(id, propertyName, (Object) value);
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, double value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, double value) {
         return setGraphicObjectProperty(id, propertyName, (Object) new Double(value));
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, double[] value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, double[] value) {
         Double[] array = new Double[value.length];
 
         for (int i = 0; i < value.length; i++) {
@@ -76,11 +76,11 @@ public final class CallGraphicController {
     }
 
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, int value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, int value) {
         return setGraphicObjectProperty(id, propertyName, (Object) new Integer(value));
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, int[] value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, int[] value) {
         Integer[] array = new Integer[value.length];
 
         for (int i = 0; i < value.length; i++) {
@@ -90,11 +90,11 @@ public final class CallGraphicController {
         return setGraphicObjectProperty(id, propertyName, (Object) array);
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, boolean value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, boolean value) {
         return setGraphicObjectProperty(id, propertyName, (Object) new Boolean(value));
     }
 
-    public static boolean setGraphicObjectProperty(String id, String propertyName, boolean[] value) {
+    public static boolean setGraphicObjectProperty(String id, int propertyName, boolean[] value) {
         Boolean[] array = new Boolean[value.length];
 
         for (int i = 0; i < value.length; i++) {
@@ -104,19 +104,19 @@ public final class CallGraphicController {
         return setGraphicObjectProperty(id, propertyName, (Object) array);
     }
 
-    public static String getGraphicObjectPropertyAsString(String id, String propertyName) {
+    public static String getGraphicObjectPropertyAsString(String id, int propertyName) {
         return (String) getGraphicObjectProperty(id, propertyName);
     }
 
-    public static String[] getGraphicObjectPropertyAsStringVector(String id, String propertyName) {
+    public static String[] getGraphicObjectPropertyAsStringVector(String id, int propertyName) {
         return (String[]) getGraphicObjectProperty(id, propertyName);
     }
 
-    public static double getGraphicObjectPropertyAsDouble(String id, String propertyName) {
+    public static double getGraphicObjectPropertyAsDouble(String id, int propertyName) {
         return (Double) getGraphicObjectProperty(id, propertyName);
     }
 
-    public static double[] getGraphicObjectPropertyAsDoubleVector(String id, String propertyName) {
+    public static double[] getGraphicObjectPropertyAsDoubleVector(String id, int propertyName) {
         Double[] tmp = (Double[]) getGraphicObjectProperty(id, propertyName);
 
         if (tmp == null) {
@@ -132,11 +132,11 @@ public final class CallGraphicController {
         return result;
     }
 
-    public static int getGraphicObjectPropertyAsInteger(String id, String propertyName) {
+    public static int getGraphicObjectPropertyAsInteger(String id, int propertyName) {
         return (Integer) getGraphicObjectProperty(id, propertyName);
     }
 
-    public static int[] getGraphicObjectPropertyAsIntegerVector(String id, String propertyName) {
+    public static int[] getGraphicObjectPropertyAsIntegerVector(String id, int propertyName) {
         Integer[] tmp = (Integer[]) getGraphicObjectProperty(id, propertyName);
 
         if (tmp == null) {
@@ -152,7 +152,7 @@ public final class CallGraphicController {
         return result;
     }
 
-    public static int getGraphicObjectPropertyAsBoolean(String id, String propertyName) {
+    public static int getGraphicObjectPropertyAsBoolean(String id, int propertyName) {
         int result;
 
         Boolean tmpValue = (Boolean) getGraphicObjectProperty(id, propertyName);
@@ -162,7 +162,7 @@ public final class CallGraphicController {
         return result;
     }
 
-    public static int[] getGraphicObjectPropertyAsBooleanVector(String id, String propertyName) {
+    public static int[] getGraphicObjectPropertyAsBooleanVector(String id, int propertyName) {
         Boolean[] tmp = (Boolean[]) getGraphicObjectProperty(id, propertyName);
 
         if (tmp == null) {
index 1bed69a..d46cc83 100644 (file)
@@ -9,84 +9,84 @@
 package org.scilab.modules.graphic_objects;
 
 public class DataLoader {
-    public static int getTextureWidth(String id) {
-        return DataLoaderJNI.getTextureWidth(id);
+  public static int getTextureWidth(String id) {
+    return DataLoaderJNI.getTextureWidth(id);
+  }
+
+  public static int getTextureHeight(String id) {
+    return DataLoaderJNI.getTextureHeight(id);
+  }
+
+  public static int fillTextureData(String id, java.nio.ByteBuffer buffer, int bufferLength) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      return DataLoaderJNI.fillTextureData(id, buffer, bufferLength);
     }
+  }
 
-    public static int getTextureHeight(String id) {
-        return DataLoaderJNI.getTextureHeight(id);
+  public static int fillSubTextureData(String id, java.nio.ByteBuffer buffer, int bufferLength, int x, int y, int width, int height) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      return DataLoaderJNI.fillSubTextureData(id, buffer, bufferLength, x, y, width, height);
     }
+  }
 
-    public static int fillTextureData(String id, java.nio.ByteBuffer buffer, int bufferLength) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            return DataLoaderJNI.fillTextureData(id, buffer, bufferLength);
-        }
-    }
-
-    public static int fillSubTextureData(String id, java.nio.ByteBuffer buffer, int bufferLength, int x, int y, int width, int height) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            return DataLoaderJNI.fillSubTextureData(id, buffer, bufferLength, x, y, width, height);
-        }
-    }
-
-    public static int getDataSize(String id) {
-        return DataLoaderJNI.getDataSize(id);
-    }
+  public static int getDataSize(String id) {
+    return DataLoaderJNI.getDataSize(id);
+  }
 
-    public static void fillVertices(String id, java.nio.FloatBuffer buffer, int bufferLength, int elementsSize, int coordinateMask, double[] scale, double[] translation, int logMask) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            DataLoaderJNI.fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
-        }
+  public static void fillVertices(String id, java.nio.FloatBuffer buffer, int bufferLength, int elementsSize, int coordinateMask, double[] scale, double[] translation, int logMask) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      DataLoaderJNI.fillVertices(id, buffer, bufferLength, elementsSize, coordinateMask, scale, translation, logMask);
     }
+  }
 
-    public static void fillColors(String id, java.nio.FloatBuffer buffer, int bufferLength, int elementsSize) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            DataLoaderJNI.fillColors(id, buffer, bufferLength, elementsSize);
-        }
+  public static void fillColors(String id, java.nio.FloatBuffer buffer, int bufferLength, int elementsSize) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      DataLoaderJNI.fillColors(id, buffer, bufferLength, elementsSize);
     }
+  }
 
-    public static void fillTextureCoordinates(String id, java.nio.FloatBuffer buffer, int bufferLength) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            DataLoaderJNI.fillTextureCoordinates(id, buffer, bufferLength);
-        }
+  public static void fillTextureCoordinates(String id, java.nio.FloatBuffer buffer, int bufferLength) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      DataLoaderJNI.fillTextureCoordinates(id, buffer, bufferLength);
     }
+  }
 
-    public static int getIndicesSize(String id) {
-        return DataLoaderJNI.getIndicesSize(id);
-    }
+  public static int getIndicesSize(String id) {
+    return DataLoaderJNI.getIndicesSize(id);
+  }
 
-    public static int fillIndices(String id, java.nio.IntBuffer buffer, int bufferLength, int logMask) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            return DataLoaderJNI.fillIndices(id, buffer, bufferLength, logMask);
-        }
+  public static int fillIndices(String id, java.nio.IntBuffer buffer, int bufferLength, int logMask) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      return DataLoaderJNI.fillIndices(id, buffer, bufferLength, logMask);
     }
+  }
 
-    public static int getWireIndicesSize(String id) {
-        return DataLoaderJNI.getWireIndicesSize(id);
-    }
+  public static int getWireIndicesSize(String id) {
+    return DataLoaderJNI.getWireIndicesSize(id);
+  }
 
-    public static int fillWireIndices(String id, java.nio.IntBuffer buffer, int bufferLength, int logMask) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            return DataLoaderJNI.fillWireIndices(id, buffer, bufferLength, logMask);
-        }
+  public static int fillWireIndices(String id, java.nio.IntBuffer buffer, int bufferLength, int logMask) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      return DataLoaderJNI.fillWireIndices(id, buffer, bufferLength, logMask);
     }
+  }
 
-    public static int getMarkIndicesSize(String id) {
-        return DataLoaderJNI.getMarkIndicesSize(id);
-    }
+  public static int getMarkIndicesSize(String id) {
+    return DataLoaderJNI.getMarkIndicesSize(id);
+  }
 
-    public static int fillMarkIndices(String id, java.nio.IntBuffer buffer, int bufferLength) {
-        assert buffer.isDirect() : "Buffer must be allocated direct.";
-        {
-            return DataLoaderJNI.fillMarkIndices(id, buffer, bufferLength);
-        }
+  public static int fillMarkIndices(String id, java.nio.IntBuffer buffer, int bufferLength) {
+    assert buffer.isDirect() : "Buffer must be allocated direct.";
+    {
+      return DataLoaderJNI.fillMarkIndices(id, buffer, bufferLength);
     }
+  }
 
 }
index 7d937fe..843d9dd 100644 (file)
@@ -10,27 +10,27 @@ package org.scilab.modules.graphic_objects;
 
 public class DataLoaderJNI {
 
-    static {
-        try {
-            System.loadLibrary("scigraphic_objects");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native library failed to load. \n" + e);
-            System.exit(1);
-        }
+  static {
+    try {
+        System.loadLibrary("scigraphic_objects");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native library failed to load. \n" + e);
+      System.exit(1);
     }
+  }
 
-    public final static native int getTextureWidth(String jarg1);
-    public final static native int getTextureHeight(String jarg1);
-    public final static native int fillTextureData(String jarg1, java.nio.ByteBuffer jarg2, int jarg3);
-    public final static native int fillSubTextureData(String jarg1, java.nio.ByteBuffer jarg2, int jarg3, int jarg4, int jarg5, int jarg6, int jarg7);
-    public final static native int getDataSize(String jarg1);
-    public final static native void fillVertices(String jarg1, java.nio.FloatBuffer jarg2, int jarg3, int jarg4, int jarg5, double[] jarg6, double[] jarg7, int jarg8);
-    public final static native void fillColors(String jarg1, java.nio.FloatBuffer jarg2, int jarg3, int jarg4);
-    public final static native void fillTextureCoordinates(String jarg1, java.nio.FloatBuffer jarg2, int jarg3);
-    public final static native int getIndicesSize(String jarg1);
-    public final static native int fillIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3, int jarg4);
-    public final static native int getWireIndicesSize(String jarg1);
-    public final static native int fillWireIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3, int jarg4);
-    public final static native int getMarkIndicesSize(String jarg1);
-    public final static native int fillMarkIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3);
+  public final static native int getTextureWidth(String jarg1);
+  public final static native int getTextureHeight(String jarg1);
+  public final static native int fillTextureData(String jarg1, java.nio.ByteBuffer jarg2, int jarg3);
+  public final static native int fillSubTextureData(String jarg1, java.nio.ByteBuffer jarg2, int jarg3, int jarg4, int jarg5, int jarg6, int jarg7);
+  public final static native int getDataSize(String jarg1);
+  public final static native void fillVertices(String jarg1, java.nio.FloatBuffer jarg2, int jarg3, int jarg4, int jarg5, double[] jarg6, double[] jarg7, int jarg8);
+  public final static native void fillColors(String jarg1, java.nio.FloatBuffer jarg2, int jarg3, int jarg4);
+  public final static native void fillTextureCoordinates(String jarg1, java.nio.FloatBuffer jarg2, int jarg3);
+  public final static native int getIndicesSize(String jarg1);
+  public final static native int fillIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3, int jarg4);
+  public final static native int getWireIndicesSize(String jarg1);
+  public final static native int fillWireIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3, int jarg4);
+  public final static native int getMarkIndicesSize(String jarg1);
+  public final static native int fillMarkIndices(String jarg1, java.nio.IntBuffer jarg2, int jarg3);
 }
index 2411fcf..3760a75 100644 (file)
@@ -34,21 +34,21 @@ public class JavaObjectLoader {
          * @param the id of the given object.
          * @return the number of data elements.
          */
-        public static int getDataSize(String id) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
-
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
-                        return ArcDecomposer.getDataSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
-                        return ChampDecomposer.getDataSize(id);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
-                        return RectangleDecomposer.getDataSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
-                        return SegsDecomposer.getDataSize(id);
-                }
-
-                return 0;
+    public static int getDataSize(String id) {
+        int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+        switch (type) {
+        case GraphicObjectProperties.__GO_ARC__ :
+            return ArcDecomposer.getDataSize();
+        case GraphicObjectProperties.__GO_CHAMP__ :
+            return ChampDecomposer.getDataSize(id);
+        case GraphicObjectProperties.__GO_RECTANGLE__ :
+            return RectangleDecomposer.getDataSize();
+        case GraphicObjectProperties.__GO_SEGS__ :
+            return SegsDecomposer.getDataSize(id);
+        default :
+            return 0;
         }
+    }
 
         /**
          * Fills the given buffer with vertex data from the given object.
@@ -62,16 +62,21 @@ public class JavaObjectLoader {
          */
         public static void fillVertices(String id, FloatBuffer buffer, int elementsSize,
                 int coordinateMask, double[] scale, double[] translation, int logMask) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
+                switch (type) {
+                case GraphicObjectProperties.__GO_ARC__ :
                         ArcDecomposer.fillVertices(buffer, id, elementsSize, coordinateMask, scale, translation, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
+                        break;
+                case GraphicObjectProperties.__GO_CHAMP__ :
                         ChampDecomposer.fillVertices(buffer, id, elementsSize, coordinateMask, scale, translation, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
+                        break;
+                case GraphicObjectProperties.__GO_RECTANGLE__ :
                         RectangleDecomposer.fillVertices(buffer, id, elementsSize, coordinateMask, scale, translation, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
+                        break;
+                case GraphicObjectProperties.__GO_SEGS__ :
                         SegsDecomposer.fillVertices(buffer, id, elementsSize, coordinateMask, scale, translation, logMask);
+                        break;
                 }
         }
 
@@ -83,11 +88,11 @@ public class JavaObjectLoader {
          * @param the number of components taken by one element in the buffer (3 or 4).
          */
         public static void fillColors(String id, FloatBuffer buffer, int elementsSize) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
-                if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
+                if (type == GraphicObjectProperties.__GO_CHAMP__) {
                         ChampDecomposer.fillColors(buffer, id, elementsSize);
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
+                } else if (type == GraphicObjectProperties.__GO_SEGS__) {
                         SegsDecomposer.fillColors(buffer, id, elementsSize);
                 }
         }
@@ -98,19 +103,20 @@ public class JavaObjectLoader {
          * @return the object's number of indices.
          */
         public static int getIndicesSize(String id) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
-
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
-                        return ArcDecomposer.getIndicesSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
-                        return ChampDecomposer.getIndicesSize(id);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
-                        return RectangleDecomposer.getIndicesSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
-                        return SegsDecomposer.getIndicesSize(id);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+
+                switch (type) {
+                case GraphicObjectProperties.__GO_ARC__ :
+                    return ArcDecomposer.getIndicesSize();
+                case GraphicObjectProperties.__GO_CHAMP__ :
+                    return ChampDecomposer.getIndicesSize(id);
+                case GraphicObjectProperties.__GO_RECTANGLE__ :
+                    return RectangleDecomposer.getIndicesSize();
+                case GraphicObjectProperties.__GO_SEGS__ :  
+                    return SegsDecomposer.getIndicesSize(id);
+                default :
+                    return 0;
                 }
-
-                return 0;
         }
 
         /**
@@ -121,19 +127,20 @@ public class JavaObjectLoader {
          * @return the number of indices actually written.
          */
         public static int fillIndices(String id, IntBuffer buffer, int logMask) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
-
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
-                        return ArcDecomposer.fillIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
-                        return ChampDecomposer.fillIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
-                        return RectangleDecomposer.fillIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
-                        return SegsDecomposer.fillIndices(buffer, id, logMask);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+
+                switch(type) {
+                case GraphicObjectProperties.__GO_ARC__ :
+                    return ArcDecomposer.fillIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_CHAMP__ :
+                    return ChampDecomposer.fillIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_RECTANGLE__ :
+                    return RectangleDecomposer.fillIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_SEGS__ :
+                    return SegsDecomposer.fillIndices(buffer, id, logMask);
+                default :
+                    return 0;
                 }
-
-                return 0;
         }
 
         /**
@@ -142,19 +149,20 @@ public class JavaObjectLoader {
          * @return the object's number of indices.
          */
         public static int getWireIndicesSize(String id) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
-
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
-                        return ArcDecomposer.getWireIndicesSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
-                        return ChampDecomposer.getWireIndicesSize(id);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
-                        return RectangleDecomposer.getWireIndicesSize();
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
-                        return SegsDecomposer.getWireIndicesSize(id);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+
+                switch (type) {
+                case GraphicObjectProperties.__GO_ARC__ :
+                    return ArcDecomposer.getWireIndicesSize();
+                case GraphicObjectProperties.__GO_CHAMP__ :
+                    return ChampDecomposer.getWireIndicesSize(id);
+                case GraphicObjectProperties.__GO_RECTANGLE__ :
+                    return RectangleDecomposer.getWireIndicesSize();
+                case GraphicObjectProperties.__GO_SEGS__ :
+                    return SegsDecomposer.getWireIndicesSize(id);
+                default :
+                    return 0;
                 }
-
-                return 0;
         }
 
         /**
@@ -165,18 +173,19 @@ public class JavaObjectLoader {
          * @return the number of indices actually written.
          */
         public static int fillWireIndices(String id, IntBuffer buffer, int logMask) {
-                String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
-
-                if (type.equals(GraphicObjectProperties.__GO_ARC__)) {
-                        return ArcDecomposer.fillWireIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_CHAMP__)) {
-                        return ChampDecomposer.fillWireIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_RECTANGLE__)) {
-                        return RectangleDecomposer.fillWireIndices(buffer, id, logMask);
-                } else if (type.equals(GraphicObjectProperties.__GO_SEGS__)) {
-                        return SegsDecomposer.fillWireIndices(buffer, id, logMask);
+                int type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+
+                switch (type) {
+                case GraphicObjectProperties.__GO_ARC__ :
+                    return ArcDecomposer.fillWireIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_CHAMP__ :
+                    return ChampDecomposer.fillWireIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_RECTANGLE__ :
+                    return RectangleDecomposer.fillWireIndices(buffer, id, logMask);
+                case GraphicObjectProperties.__GO_SEGS__ :
+                    return SegsDecomposer.fillWireIndices(buffer, id, logMask);
+                default :
+                    return 0;
                 }
-
-                return 0;
         }
 }
index ff7764c..02e118e 100644 (file)
@@ -37,7 +37,7 @@ public class MainDataLoader {
     /**
      * The names of Java-based objects.
      */
-    private static final Set<String> JAVA_OBJECTS = new HashSet<String>(Arrays.asList(
+    private static final Set<Integer> JAVA_OBJECTS = new HashSet<Integer>(Arrays.asList(
             GraphicObjectProperties.__GO_ARC__,
             GraphicObjectProperties.__GO_CHAMP__,
             GraphicObjectProperties.__GO_RECTANGLE__,
@@ -81,7 +81,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static int getDataSize(String id) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+            Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
             if (type == null) {
                 throw (new ObjectRemovedException(id));
@@ -107,7 +107,7 @@ public class MainDataLoader {
      */
     public static void fillVertices(String id, FloatBuffer buffer, int elementsSize,
             int coordinateMask, double[] scale, double[] translation, int logMask) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+            Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
             
             if (type == null) {
                 throw (new ObjectRemovedException(id));
@@ -128,7 +128,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static void fillColors(String id, FloatBuffer buffer, int elementsSize) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+            Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
             
             if (type == null) {
                 throw (new ObjectRemovedException(id));
@@ -148,7 +148,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static int getIndicesSize(String id) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+        Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
             
             if (type == null) {
                 throw (new ObjectRemovedException(id));
@@ -170,7 +170,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static int fillIndices(String id, IntBuffer buffer, int logMask) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+        Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
             if (type == null) {
                 throw (new ObjectRemovedException(id));
@@ -190,7 +190,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static int getWireIndicesSize(String id) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+        Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
             
             if (type == null) {
@@ -213,7 +213,7 @@ public class MainDataLoader {
      * @throws ObjectRemovedException if the object no longer exist.
      */
     public static int fillWireIndices(String id, IntBuffer buffer, int logMask) throws ObjectRemovedException {
-            String type = (String) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
+        Integer type = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
 
             if (type == null) {
                 throw (new ObjectRemovedException(id));
index c13557e..57e687c 100644 (file)
@@ -9,16 +9,16 @@
 package org.scilab.modules.graphic_objects;
 
 public class ScilabNativeView {
-    public static void ScilabNativeView__createObject(String pstId) {
-        ScilabNativeViewJNI.ScilabNativeView__createObject(pstId);
-    }
+  public static void ScilabNativeView__createObject(String pstId) {
+    ScilabNativeViewJNI.ScilabNativeView__createObject(pstId);
+  }
 
-    public static void ScilabNativeView__deleteObject(String pstId) {
-        ScilabNativeViewJNI.ScilabNativeView__deleteObject(pstId);
-    }
+  public static void ScilabNativeView__deleteObject(String pstId) {
+    ScilabNativeViewJNI.ScilabNativeView__deleteObject(pstId);
+  }
 
-    public static void ScilabNativeView__updateObject(String pstId, String pstProperty) {
-        ScilabNativeViewJNI.ScilabNativeView__updateObject(pstId, pstProperty);
-    }
+  public static void ScilabNativeView__updateObject(String pstId, int iProperty) {
+    ScilabNativeViewJNI.ScilabNativeView__updateObject(pstId, iProperty);
+  }
 
 }
index 73a5dc8..f4a434c 100644 (file)
@@ -10,16 +10,16 @@ package org.scilab.modules.graphic_objects;
 
 public class ScilabNativeViewJNI {
 
-    static {
-        try {
-            System.loadLibrary("scigraphic_objects");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native library failed to load. \n" + e);
-            System.exit(1);
-        }
+  static {
+    try {
+        System.loadLibrary("scigraphic_objects");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native library failed to load. \n" + e);
+      System.exit(1);
     }
+  }
 
-    public final static native void ScilabNativeView__createObject(String jarg1);
-    public final static native void ScilabNativeView__deleteObject(String jarg1);
-    public final static native void ScilabNativeView__updateObject(String jarg1, String jarg2);
+  public final static native void ScilabNativeView__createObject(String jarg1);
+  public final static native void ScilabNativeView__deleteObject(String jarg1);
+  public final static native void ScilabNativeView__updateObject(String jarg1, int jarg2);
 }
index 9afb124..3927f2e 100644 (file)
@@ -13,6 +13,7 @@
 package org.scilab.modules.graphic_objects.arc;
 
 import org.scilab.modules.graphic_objects.contouredObject.ClippableContouredObject;
+import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
 import org.scilab.modules.graphic_objects.graphicObject.Visitor;
 
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.*;
@@ -92,22 +93,23 @@ public class Arc extends ClippableContouredObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_UPPER_LEFT_POINT__)) {
-                       return ArcProperty.UPPERLEFTPOINT;
-               } else if (propertyName.equals(__GO_WIDTH__)) {
-                       return ArcProperty.WIDTH;
-               } else if (propertyName.equals(__GO_HEIGHT__)) {
-                       return ArcProperty.HEIGHT;
-               } else if (propertyName.equals(__GO_START_ANGLE__)) {
-                       return ArcProperty.STARTANGLE;
-               } else if (propertyName.equals(__GO_END_ANGLE__)) {
-                       return ArcProperty.ENDANGLE;
-               } else if (propertyName.equals(__GO_ARC_DRAWING_METHOD__)) {
-                       return ArcProperty.ARCDRAWINGMETHOD;
-               } else {
-                       return super.getPropertyFromName(propertyName);
-               }
+       public Object getPropertyFromName(int propertyName) {
+           switch (propertyName) {
+           case __GO_UPPER_LEFT_POINT__ :
+               return ArcProperty.UPPERLEFTPOINT;
+           case __GO_WIDTH__ :
+               return ArcProperty.WIDTH;
+           case __GO_HEIGHT__ :
+               return ArcProperty.HEIGHT;
+           case __GO_START_ANGLE__ :
+               return ArcProperty.STARTANGLE;
+           case __GO_END_ANGLE__ :
+               return ArcProperty.ENDANGLE;
+           case __GO_ARC_DRAWING_METHOD__ :
+               return ArcProperty.ARCDRAWINGMETHOD;
+           default :
+               return super.getPropertyFromName(propertyName);
+           }
        }
 
        /**
@@ -275,7 +277,7 @@ public class Arc extends ClippableContouredObject {
                this.width = width;
        }
 
-       public String getType() {
-           return "Arc";
+       public Integer getType() {
+           return GraphicObjectProperties.__GO_ARC__;
        }
 }
index c5ea23f..0ab8af2 100644 (file)
@@ -214,162 +214,163 @@ public class Axes extends GraphicObject {
      * @param propertyName the property name
      * @return the property enum
      */
-    public Object getPropertyFromName(String propertyName) {
-        if (propertyName.equals(__GO_X_AXIS_VISIBLE__)) {
+    public Object getPropertyFromName(int propertyName) {
+        switch (propertyName) {
+        case __GO_X_AXIS_VISIBLE__ :
             return AxesProperty.XAXISVISIBLE;
-        } else if (propertyName.equals(__GO_X_AXIS_REVERSE__)) {
+        case __GO_X_AXIS_REVERSE__ :
             return AxesProperty.XAXISREVERSE;
-        } else if (propertyName.equals(__GO_X_AXIS_GRID_COLOR__)) {
+        case __GO_X_AXIS_GRID_COLOR__ :
             return AxesProperty.XAXISGRIDCOLOR;
-        } else if (propertyName.equals(__GO_X_AXIS_LABEL__)) {
+        case __GO_X_AXIS_LABEL__ :
             return AxesProperty.XAXISLABEL;
-        } else if (propertyName.equals(__GO_X_AXIS_LOCATION__)) {
+        case __GO_X_AXIS_LOCATION__ :
             return AxesProperty.XAXISLOCATION;
-        } else if (propertyName.equals(__GO_X_AXIS_LOG_FLAG__)) {
+        case __GO_X_AXIS_LOG_FLAG__ :
             return AxesProperty.XAXISLOGFLAG;
-        } else if (propertyName.equals(__GO_X_AXIS_TICKS__)) {
+        case __GO_X_AXIS_TICKS__ :
             return AxesProperty.XAXISTICKS;
-        } else if (propertyName.equals(__GO_X_AXIS_AUTO_TICKS__)) {
+        case __GO_X_AXIS_AUTO_TICKS__ :
             return AxesProperty.XAXISAUTOTICKS;
-        } else if (propertyName.equals(__GO_X_AXIS_NUMBER_TICKS__)) {
+        case __GO_X_AXIS_NUMBER_TICKS__ :
             return AxesProperty.XAXISNUMBERTICKS;
-        } else if (propertyName.equals(__GO_X_AXIS_TICKS_LOCATIONS__)) {
+        case __GO_X_AXIS_TICKS_LOCATIONS__:
             return AxesProperty.XAXISTICKSLOCATIONS;
-        } else if (propertyName.equals(__GO_X_AXIS_TICKS_LABELS__)) {
+        case __GO_X_AXIS_TICKS_LABELS__ :
             return AxesProperty.XAXISTICKSLABELS;
-        } else if (propertyName.equals(__GO_X_AXIS_SUBTICKS__)) {
+        case __GO_X_AXIS_SUBTICKS__ :
             return AxesProperty.XAXISSUBTICKS;
-        } else if (propertyName.equals(__GO_Y_AXIS_VISIBLE__)) {
+        case __GO_Y_AXIS_VISIBLE__ :
             return AxesProperty.YAXISVISIBLE;
-        } else if (propertyName.equals(__GO_Y_AXIS_REVERSE__)) {
+        case __GO_Y_AXIS_REVERSE__ :
             return AxesProperty.YAXISREVERSE;
-        } else if (propertyName.equals(__GO_Y_AXIS_GRID_COLOR__)) {
+        case __GO_Y_AXIS_GRID_COLOR__ :
             return AxesProperty.YAXISGRIDCOLOR;
-        } else if (propertyName.equals(__GO_Y_AXIS_LABEL__)) {
+        case __GO_Y_AXIS_LABEL__ :
             return AxesProperty.YAXISLABEL;
-        } else if (propertyName.equals(__GO_Y_AXIS_LOCATION__)) {
+        case __GO_Y_AXIS_LOCATION__ :
             return AxesProperty.YAXISLOCATION;
-        } else if (propertyName.equals(__GO_Y_AXIS_LOG_FLAG__)) {
+        case __GO_Y_AXIS_LOG_FLAG__ :
             return AxesProperty.YAXISLOGFLAG;
-        } else if (propertyName.equals(__GO_Y_AXIS_TICKS__)) {
+        case __GO_Y_AXIS_TICKS__ :
             return AxesProperty.YAXISTICKS;
-        } else if (propertyName.equals(__GO_Y_AXIS_AUTO_TICKS__)) {
+        case __GO_Y_AXIS_AUTO_TICKS__ :
             return AxesProperty.YAXISAUTOTICKS;
-        } else if (propertyName.equals(__GO_Y_AXIS_NUMBER_TICKS__)) {
+        case __GO_Y_AXIS_NUMBER_TICKS__ :
             return AxesProperty.YAXISNUMBERTICKS;
-        } else if (propertyName.equals(__GO_Y_AXIS_TICKS_LOCATIONS__)) {
+        case __GO_Y_AXIS_TICKS_LOCATIONS__ :
             return AxesProperty.YAXISTICKSLOCATIONS;
-        } else if (propertyName.equals(__GO_Y_AXIS_TICKS_LABELS__)) {
+        case __GO_Y_AXIS_TICKS_LABELS__ :
             return AxesProperty.YAXISTICKSLABELS;
-        } else if (propertyName.equals(__GO_Y_AXIS_SUBTICKS__)) {
+        case __GO_Y_AXIS_SUBTICKS__ :
             return AxesProperty.YAXISSUBTICKS;
-        } else if (propertyName.equals(__GO_Z_AXIS_VISIBLE__)) {
+        case __GO_Z_AXIS_VISIBLE__ :
             return AxesProperty.ZAXISVISIBLE;
-        } else if (propertyName.equals(__GO_Z_AXIS_REVERSE__)) {
+        case __GO_Z_AXIS_REVERSE__ :
             return AxesProperty.ZAXISREVERSE;
-        } else if (propertyName.equals(__GO_Z_AXIS_GRID_COLOR__)) {
+        case __GO_Z_AXIS_GRID_COLOR__ :
             return AxesProperty.ZAXISGRIDCOLOR;
-        } else if (propertyName.equals(__GO_Z_AXIS_LABEL__)) {
+        case __GO_Z_AXIS_LABEL__ :
             return AxesProperty.ZAXISLABEL;
-        } else if (propertyName.equals(__GO_Z_AXIS_LOCATION__)) {
+        case __GO_Z_AXIS_LOCATION__ :
             return AxesProperty.ZAXISLOCATION;
-        } else if (propertyName.equals(__GO_Z_AXIS_LOG_FLAG__)) {
+        case __GO_Z_AXIS_LOG_FLAG__ :
             return AxesProperty.ZAXISLOGFLAG;
-        } else if (propertyName.equals(__GO_Z_AXIS_TICKS__)) {
+        case __GO_Z_AXIS_TICKS__ :
             return AxesProperty.ZAXISTICKS;
-        } else if (propertyName.equals(__GO_Z_AXIS_AUTO_TICKS__)) {
+        case __GO_Z_AXIS_AUTO_TICKS__ :
             return AxesProperty.ZAXISAUTOTICKS;
-        } else if (propertyName.equals(__GO_Z_AXIS_NUMBER_TICKS__)) {
+        case __GO_Z_AXIS_NUMBER_TICKS__ :
             return AxesProperty.ZAXISNUMBERTICKS;
-        } else if (propertyName.equals(__GO_Z_AXIS_TICKS_LOCATIONS__)) {
+        case __GO_Z_AXIS_TICKS_LOCATIONS__ :
             return AxesProperty.ZAXISTICKSLOCATIONS;
-        } else if (propertyName.equals(__GO_Z_AXIS_TICKS_LABELS__)) {
+        case __GO_Z_AXIS_TICKS_LABELS__ :
             return AxesProperty.ZAXISTICKSLABELS;
-        } else if (propertyName.equals(__GO_Z_AXIS_SUBTICKS__)) {
+        case __GO_Z_AXIS_SUBTICKS__ :
             return AxesProperty.ZAXISSUBTICKS;
-        } else if (propertyName.equals(__GO_AUTO_SUBTICKS__)) {
+        case __GO_AUTO_SUBTICKS__ :
             return AxesProperty.AUTOSUBTICKS;
-        } else if (propertyName.equals(__GO_FONT_STYLE__)) {
+        case __GO_FONT_STYLE__ :
             return AxesProperty.FONT_STYLE;
-        } else if (propertyName.equals(__GO_FONT_SIZE__)) {
+        case __GO_FONT_SIZE__ :
             return AxesProperty.FONT_SIZE;
-        } else if (propertyName.equals(__GO_FONT_COLOR__)) {
+        case __GO_FONT_COLOR__ :
             return AxesProperty.FONT_COLOR;
-        } else if (propertyName.equals(__GO_FONT_FRACTIONAL__)) {
+        case __GO_FONT_FRACTIONAL__ :
             return AxesProperty.FONT_FRACTIONAL;
-        } else if (propertyName.equals(__GO_GRID_POSITION__)) {
+        case __GO_GRID_POSITION__ :
             return AxesProperty.GRIDPOSITION;
-        } else if (propertyName.equals(__GO_TITLE__)) {
+        case __GO_TITLE__ :
             return AxesProperty.TITLE;
-        } else if (propertyName.equals(__GO_AUTO_CLEAR__)) {
+        case __GO_AUTO_CLEAR__ :
             return AxesProperty.AUTOCLEAR;
-        } else if (propertyName.equals(__GO_FILLED__)) {
+        case __GO_FILLED__ :
             return AxesProperty.FILLED;
-        } else if (propertyName.equals(__GO_BACKGROUND__)) {
+        case __GO_BACKGROUND__ :
             return AxesProperty.BACKGROUND;
-        } else if (propertyName.equals(__GO_VIEW__)) {
+        case __GO_VIEW__ :
             return Camera.CameraProperty.VIEW;
-        } else if (propertyName.equals(__GO_ISOVIEW__)) {
+        case __GO_ISOVIEW__ :
             return Camera.CameraProperty.ISOVIEW;
-        } else if (propertyName.equals(__GO_CUBE_SCALING__)) {
+        case __GO_CUBE_SCALING__ :
             return Camera.CameraProperty.CUBESCALING;
-        } else if (propertyName.equals(__GO_ROTATION_ANGLES__)) {
+        case __GO_ROTATION_ANGLES__ :
             return Camera.CameraProperty.ROTATIONANGLES;
-        } else if (propertyName.equals(__GO_ROTATION_ANGLES_3D__)) {
+        case __GO_ROTATION_ANGLES_3D__ :
             return Camera.CameraProperty.ROTATIONANGLES3D;
-        } else if (propertyName.equals(__GO_BOX_TYPE__)) {
+        case __GO_BOX_TYPE__ :
             return Box.BoxProperty.BOX;
-        } else if (propertyName.equals(__GO_HIDDEN_AXIS_COLOR__)) {
+        case __GO_HIDDEN_AXIS_COLOR__ :
             return Box.BoxProperty.HIDDENAXISCOLOR;
-        } else if (propertyName.equals(__GO_TIGHT_LIMITS__)) {
+        case __GO_TIGHT_LIMITS__ :
             return Box.BoxProperty.TIGHTLIMITS;
-        } else if (propertyName.equals(__GO_DATA_BOUNDS__)) {
+        case __GO_DATA_BOUNDS__ :
             return Box.BoxProperty.DATABOUNDS;
-        } else if (propertyName.equals(__GO_REAL_DATA_BOUNDS__)) {
+        case __GO_REAL_DATA_BOUNDS__ :
             return Box.BoxProperty.REALDATABOUNDS;
-        } else if (propertyName.equals(__GO_ZOOM_ENABLED__)) {
+        case __GO_ZOOM_ENABLED__ :
             return Box.BoxProperty.ZOOMENABLED;
-        } else if (propertyName.equals(__GO_ZOOM_BOX__)) {
+        case __GO_ZOOM_BOX__ :
             return Box.BoxProperty.ZOOMBOX;
-        } else if (propertyName.equals(__GO_AUTO_SCALE__)) {
+        case __GO_AUTO_SCALE__ :
             return Box.BoxProperty.AUTOSCALE;
-        } else if (propertyName.equals(__GO_FIRST_PLOT__)) {
+        case __GO_FIRST_PLOT__ :
             return Box.BoxProperty.FIRSTPLOT;
-        } else if (propertyName.equals(__GO_MARGINS__)) {
+        case __GO_MARGINS__ :
             return AxesProperty.MARGINS;
-        } else if (propertyName.equals(__GO_AXES_BOUNDS__)) {
+        case __GO_AXES_BOUNDS__ :
             return AxesProperty.AXESBOUNDS;
-        } else if (propertyName.equals(__GO_HIDDEN_COLOR__)) {
+        case __GO_HIDDEN_COLOR__ :
             return AxesProperty.HIDDENCOLOR;
-        } else if (propertyName.equals(__GO_LINE_MODE__)) {
+        case __GO_LINE_MODE__ :
             return LinePropertyType.MODE;
-        } else if (propertyName.equals(__GO_LINE_STYLE__)) {
+        case __GO_LINE_STYLE__ :
             return LinePropertyType.LINESTYLE;
-        } else if (propertyName.equals(__GO_LINE_THICKNESS__)) {
+        case __GO_LINE_THICKNESS__ :
             return LinePropertyType.THICKNESS;
-        } else if (propertyName.equals(__GO_LINE_COLOR__)) {
+        case __GO_LINE_COLOR__ :
             return LinePropertyType.COLOR;
-        } else if (propertyName.equals(__GO_MARK_MODE__)) {
+        case __GO_MARK_MODE__ :
             return MarkPropertyType.MODE;
-        } else if (propertyName.equals(__GO_MARK_STYLE__)) {
+        case __GO_MARK_STYLE__ :
             return MarkPropertyType.STYLE;
-        } else if (propertyName.equals(__GO_MARK_SIZE_UNIT__)) {
+        case __GO_MARK_SIZE_UNIT__ :
             return MarkPropertyType.SIZEUNIT;
-        } else if (propertyName.equals(__GO_MARK_SIZE__)) {
+        case __GO_MARK_SIZE__ :
             return MarkPropertyType.SIZE;
-        } else if (propertyName.equals(__GO_MARK_FOREGROUND__)) {
+        case __GO_MARK_FOREGROUND__ :
             return MarkPropertyType.FOREGROUND;
-        } else if (propertyName.equals(__GO_MARK_BACKGROUND__)) {
+        case __GO_MARK_BACKGROUND__ :
             return MarkPropertyType.BACKGROUND;
-        } else if (propertyName.equals(__GO_CLIP_STATE__)) {
+        case __GO_CLIP_STATE__ :
             return ClippablePropertyType.CLIPSTATE;
-        } else if (propertyName.equals(__GO_CLIP_BOX__)) {
+        case __GO_CLIP_BOX__ :
             return ClippablePropertyType.CLIPBOX;
-        } else if (propertyName.equals(__GO_CLIP_BOX_SET__)) {
+        case __GO_CLIP_BOX_SET__ :
             return ClippablePropertyType.CLIPBOXSET;
-        } else if (propertyName.equals(__GO_ARC_DRAWING_METHOD__)) {
+        case __GO_ARC_DRAWING_METHOD__ :
             return ArcProperty.ARCDRAWINGMETHOD;
-        } else {
+        default :
             return super.getPropertyFromName(propertyName);
         }
     }
@@ -2013,7 +2014,7 @@ public class Axes extends GraphicObject {
                 if (figure.getRotationAsEnum().equals(Figure.RotationType.MULTIPLE)) {
                     for (String child : figure.getChildren()) {
                         if (child != null) {
-                            if (GraphicObjectProperties.__GO_AXES__.equals(controller.getProperty(child, GraphicObjectProperties.__GO_TYPE__))) {
+                            if (GraphicObjectProperties.__GO_AXES__ == ((Integer) controller.getProperty(child, GraphicObjectProperties.__GO_TYPE__))) {
                                 controller.setProperty(
                                     child,
                                     GraphicObjectProperties.__GO_ROTATION_ANGLES__,
@@ -2142,8 +2143,8 @@ public class Axes extends GraphicObject {
     /**
      * @return Type as String
      */
-    public String getType() {
-        return "Axes";
+    public Integer getType() {
+        return GraphicObjectProperties.__GO_AXES__;
     }
 
 }
index ad3a93b..6361656 100644 (file)
@@ -13,6 +13,7 @@
 package org.scilab.modules.graphic_objects.axis;
 
 import org.scilab.modules.graphic_objects.contouredObject.ClippableContouredObject;
+import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
 import org.scilab.modules.graphic_objects.graphicObject.Visitor;
 import org.scilab.modules.graphic_objects.textObject.Font;
 
@@ -104,42 +105,43 @@ public class Axis extends ClippableContouredObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_TICKS_DIRECTION__)) {
+       public Object getPropertyFromName(int propertyName) {
+               switch (propertyName) {
+               case __GO_TICKS_DIRECTION__ :
                        return AxisProperty.TICKSDIRECTION;
-               } else if (propertyName.equals(__GO_X_NUMBER_TICKS__)) {
+               case __GO_X_NUMBER_TICKS__ :
                        return AxisProperty.XNUMBERTICKS;
-               } else if (propertyName.equals(__GO_Y_NUMBER_TICKS__)) {
+               case __GO_Y_NUMBER_TICKS__ :
                        return AxisProperty.YNUMBERTICKS;
-               } else if (propertyName.equals(__GO_X_TICKS_COORDS__)) {
+               case __GO_X_TICKS_COORDS__ :
                        return AxisProperty.XTICKSCOORDS;
-               } else if (propertyName.equals(__GO_Y_TICKS_COORDS__)) {
+               case __GO_Y_TICKS_COORDS__ :
                        return AxisProperty.YTICKSCOORDS;
-               } else if (propertyName.equals(__GO_TICKS_COLOR__)) {
+               case __GO_TICKS_COLOR__ :
                        return AxisProperty.TICKSCOLOR;
-               } else if (propertyName.equals(__GO_TICKS_SEGMENT__)) {
+               case __GO_TICKS_SEGMENT__ :
                        return AxisProperty.TICKSSEGMENT;
-               } else if (propertyName.equals(__GO_TICKS_STYLE__)) {
+               case __GO_TICKS_STYLE__ :
                        return AxisProperty.TICKSSTYLE;
-               } else if (propertyName.equals(__GO_SUBTICKS__)) {
+               case __GO_SUBTICKS__ :
                        return AxisProperty.SUBTICKS;
-               } else if (propertyName.equals(__GO_NUMBER_TICKS_LABELS__)) {
+               case __GO_NUMBER_TICKS_LABELS__ :
                        return AxisProperty.NUMBERTICKSLABELS;
-               } else if (propertyName.equals(__GO_TICKS_LABELS__)) {
+               case __GO_TICKS_LABELS__ :
                        return AxisProperty.TICKSLABELS;
-               } else if (propertyName.equals(__GO_FORMATN__)) {
+               case __GO_FORMATN__ :
                        return AxisProperty.FORMATN;
-               } else if (propertyName.equals(__GO_FONT__)) {
+               case __GO_FONT__ :
                        return AxisProperty.FONT;
-               } else if (propertyName.equals(__GO_FONT_STYLE__)) {
+               case __GO_FONT_STYLE__ :
                        return Font.FontProperty.STYLE;
-               } else if (propertyName.equals(__GO_FONT_SIZE__)) {
+               case __GO_FONT_SIZE__ :
                        return Font.FontProperty.SIZE;
-               } else if (propertyName.equals(__GO_FONT_COLOR__)) {
+               case __GO_FONT_COLOR__ :
                        return Font.FontProperty.COLOR;
-               } else if (propertyName.equals(__GO_FONT_FRACTIONAL__)) {
+               case __GO_FONT_FRACTIONAL__ :
                        return Font.FontProperty.FRACTIONAL;
-               } else {
+               default :
                        return super.getPropertyFromName(propertyName);
                }
        }
@@ -529,8 +531,8 @@ public class Axis extends ClippableContouredObject {
        /**
         * @return Type as String
         */
-       public String getType() {
-               return "Axis";
+       public Integer getType() {
+               return GraphicObjectProperties.__GO_AXIS__;
        }
 
 }
index 80b51a1..84123da 100644 (file)
@@ -13,6 +13,7 @@
 package org.scilab.modules.graphic_objects.compound;
 
 import org.scilab.modules.graphic_objects.graphicObject.GraphicObject;
+import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
 import org.scilab.modules.graphic_objects.graphicObject.Visitor;
 
 /**
@@ -34,8 +35,8 @@ public class Compound extends GraphicObject {
     /**
         * @return Type as String
         */
-       public String getType() {
-               return "Compound";
+       public Integer getType() {
+               return GraphicObjectProperties.__GO_COMPOUND__;
        }
 
 }
index df29208..e7b5c2a 100644 (file)
@@ -64,7 +64,7 @@ public final class Console extends GraphicObject {
      * @return "Console"
      * @see org.scilab.modules.graphic_objects.graphicObject.GraphicObject#getType()
      */
-    public String getType() {
+    public Integer getType() {
         return __GO_CONSOLE__;
     }
 
@@ -114,8 +114,8 @@ public final class Console extends GraphicObject {
      * @param propertyName the property name
      * @return the property enum
      */
-    public Object getPropertyFromName(String propertyName) {
-        if (propertyName.equals(__GO_SHOWHIDDENHANDLES__)) {
+    public Object getPropertyFromName(int propertyName) {
+        if (propertyName == __GO_SHOWHIDDENHANDLES__) {
             return ConsoleProperty.SHOWHIDDENHANDLES;
         } else {
             return super.getPropertyFromName(propertyName);
index faef45e..81f430d 100644 (file)
@@ -45,16 +45,17 @@ public abstract class ClippableContouredObject extends ContouredObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_CLIP_PROPERTY__)) {
+       public Object getPropertyFromName(int propertyName) {
+               switch (propertyName) {
+               case __GO_CLIP_PROPERTY__ :
                        return ClippableContouredObjectPropertyType.CLIPPROPERTY;
-               } else if (propertyName.equals(__GO_CLIP_STATE__)) {
+               case __GO_CLIP_STATE__ :
                        return ClippablePropertyType.CLIPSTATE;
-               } else if (propertyName.equals(__GO_CLIP_BOX__)) {
+               case __GO_CLIP_BOX__ :
                        return ClippablePropertyType.CLIPBOX;
-               } else if (propertyName.equals(__GO_CLIP_BOX_SET__)) {
+               case __GO_CLIP_BOX_SET__ :
                        return ClippablePropertyType.CLIPBOXSET;
-               } else {
+               default :
                        return super.getPropertyFromName(propertyName);
                }
        }
index d29c1d2..38c8eb5 100644 (file)
@@ -61,36 +61,37 @@ public abstract class ContouredObject extends GraphicObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_LINE__)) {
+       public Object getPropertyFromName(int propertyName) {
+               switch (propertyName) {
+               case __GO_LINE__ :
                        return ContouredObjectPropertyType.LINE;
-               } else if (propertyName.equals(__GO_LINE_MODE__)) {
+               case __GO_LINE_MODE__ :
                        return LinePropertyType.MODE;
-               } else if (propertyName.equals(__GO_LINE_STYLE__)) {
+               case __GO_LINE_STYLE__ :
                        return LinePropertyType.LINESTYLE;
-               } else if (propertyName.equals(__GO_LINE_THICKNESS__)) {
+               case __GO_LINE_THICKNESS__ :
                        return LinePropertyType.THICKNESS;
-               } else if (propertyName.equals(__GO_LINE_COLOR__)) {
+               case __GO_LINE_COLOR__ :
                        return LinePropertyType.COLOR;
-               } else if (propertyName.equals(__GO_FILL_MODE__)) {
+               case __GO_FILL_MODE__ :
                        return ContouredObjectPropertyType.FILLMODE;
-               } else if (propertyName.equals(__GO_BACKGROUND__)) {
+               case __GO_BACKGROUND__ :
                        return ContouredObjectPropertyType.BACKGROUND;
-               } else if (propertyName.equals(__GO_MARK__)) {
+               case __GO_MARK__ :
                        return ContouredObjectPropertyType.MARK;
-               } else if (propertyName.equals(__GO_MARK_MODE__)) {
+               case __GO_MARK_MODE__ :
                        return MarkPropertyType.MODE;
-               } else if (propertyName.equals(__GO_MARK_STYLE__)) {
+               case __GO_MARK_STYLE__ :
                        return MarkPropertyType.STYLE;
-               } else if (propertyName.equals(__GO_MARK_SIZE_UNIT__)) {
+               case __GO_MARK_SIZE_UNIT__ :
                        return MarkPropertyType.SIZEUNIT;
-               } else if (propertyName.equals(__GO_MARK_SIZE__)) {
+               case __GO_MARK_SIZE__ :
                        return MarkPropertyType.SIZE;
-               } else if (propertyName.equals(__GO_MARK_FOREGROUND__)) {
+               case __GO_MARK_FOREGROUND__ :
                        return MarkPropertyType.FOREGROUND;
-               } else if (propertyName.equals(__GO_MARK_BACKGROUND__)) {
+               case __GO_MARK_BACKGROUND__ :
                        return MarkPropertyType.BACKGROUND;
-               } else {
+               default :
                        return super.getPropertyFromName(propertyName);
                }
        }
index 0d59e46..27a2fbd 100644 (file)
@@ -130,12 +130,11 @@ public class Line {
         * @param color the color to set
         */
        public UpdateStatus setColor(Integer color) {
-               if (this.color == color) {
-                   return UpdateStatus.NoChange;
-               }
-               this.color = color;
-               return UpdateStatus.Success;
-                   
+           if (this.color == color) {
+               return UpdateStatus.NoChange;
+           }
+           this.color = color;
+           return UpdateStatus.Success;
        }
 
        /**
index 9696950..bb673a3 100644 (file)
@@ -14,6 +14,7 @@ package org.scilab.modules.graphic_objects.fec;
 
 import org.scilab.modules.graphic_objects.ObjectRemovedException;
 import org.scilab.modules.graphic_objects.contouredObject.ClippableContouredObject;
+import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
 import org.scilab.modules.graphic_objects.graphicObject.Visitor;
 
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.*;
@@ -56,14 +57,15 @@ public class Fec extends ClippableContouredObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_Z_BOUNDS__)) {
+       public Object getPropertyFromName(int propertyName) {
+               switch (propertyName) {
+               case __GO_Z_BOUNDS__ :
                        return FecProperty.ZBOUNDS;
-               } else if (propertyName.equals(__GO_OUTSIDE_COLOR__)) {
+               case __GO_OUTSIDE_COLOR__ :
                        return FecProperty.OUTSIDECOLOR;
-               } else if (propertyName.equals(__GO_COLOR_RANGE__)) {
+               case __GO_COLOR_RANGE__ :
                        return FecProperty.COLORRANGE;
-               } else {
+               default :
                        return super.getPropertyFromName(propertyName);
                }
        }
@@ -165,8 +167,8 @@ public class Fec extends ClippableContouredObject {
        /**
         * @return Type as String
         */
-       public String getType() {
-               return "Fec";
+       public Integer getType() {
+               return GraphicObjectProperties.__GO_FEC__;
        }
 
 }
index 92bc8ae..197a8fe 100644 (file)
@@ -13,6 +13,7 @@
 package org.scilab.modules.graphic_objects.figure;
 
 import org.scilab.modules.graphic_objects.graphicObject.GraphicObject;
+import org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties;
 import org.scilab.modules.graphic_objects.graphicObject.Visitor;
 
 import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProperties.__GO_ANTIALIASING__;
@@ -398,50 +399,51 @@ public class Figure extends GraphicObject {
      * @param propertyName the property name
      * @return the property enum
      */
-    public Object getPropertyFromName(String propertyName) {
-        if (propertyName.equals(__GO_POSITION__)) {
+    public Object getPropertyFromName(int propertyName) {
+        switch (propertyName) {
+        case __GO_POSITION__ :
             return FigureDimensionsProperty.POSITION;
-        } else if (propertyName.equals(__GO_SIZE__)) {
+        case __GO_SIZE__ :
             return FigureDimensionsProperty.SIZE;
-        } else if (propertyName.equals(__GO_AUTORESIZE__)) {
+        case __GO_AUTORESIZE__ :
             return CanvasProperty.AUTORESIZE;
-        } else if (propertyName.equals(__GO_VIEWPORT__)) {
+        case __GO_VIEWPORT__ :
             return CanvasProperty.VIEWPORT;
-        } else if (propertyName.equals(__GO_AXES_SIZE__)) {
+        case __GO_AXES_SIZE__ :
             return CanvasProperty.AXESSIZE;
-        } else if (propertyName.equals(__GO_NAME__)) {
+        case __GO_NAME__ :
             return FigureNameProperty.NAME;
-        } else if (propertyName.equals(__GO_ID__)) {
+        case __GO_ID__ :
             return FigureNameProperty.ID;
-        } else if (propertyName.equals(__GO_INFO_MESSAGE__)) {
+        case __GO_INFO_MESSAGE__ :
             return FigureProperty.INFOMESSAGE;
-        } else if (propertyName.equals(__GO_COLORMAP__)) {
+        case __GO_COLORMAP__ :
             return FigureProperty.COLORMAP;
-        } else if (propertyName.equals(__GO_COLORMAP_SIZE__)) {
+        case __GO_COLORMAP_SIZE__ :
             return FigureProperty.COLORMAPSIZE;
-        } else if (propertyName.equals(__GO_PIXMAP__)) {
+        case __GO_PIXMAP__ :
             return RenderingModeProperty.PIXMAP;
-        } else if (propertyName.equals(__GO_PIXEL_DRAWING_MODE__)) {
+        case __GO_PIXEL_DRAWING_MODE__ :
             return RenderingModeProperty.PIXELDRAWINGMODE;
-        } else if (propertyName.equals(__GO_ANTIALIASING__)) {
+        case __GO_ANTIALIASING__ :
             return RenderingModeProperty.ANTIALIASING;
-        } else if (propertyName.equals(__GO_IMMEDIATE_DRAWING__)) {
+        case __GO_IMMEDIATE_DRAWING__ :
             return RenderingModeProperty.IMMEDIATEDRAWING;
-        } else if (propertyName.equals(__GO_BACKGROUND__)) {
+        case __GO_BACKGROUND__ :
             return FigureProperty.BACKGROUND;
-        } else if (propertyName.equals(__GO_EVENTHANDLER_NAME__)) {
+        case __GO_EVENTHANDLER_NAME__ :
             return EventHandlerProperty.EVENTHANDLER;
-        } else if (propertyName.equals(__GO_EVENTHANDLER_ENABLE__)) {
+        case __GO_EVENTHANDLER_ENABLE__ :
             return EventHandlerProperty.EVENTHANDLERENABLE;
-        } else if (propertyName.equals(__GO_TAG__)) {
+        case __GO_TAG__ :
             return FigureProperty.TAG;
-        } else if (propertyName.equals(__GO_ROTATION_TYPE__)) {
+        case __GO_ROTATION_TYPE__ :
             return FigureProperty.ROTATIONTYPE;
-        } else if (propertyName.equals(__GO_RESIZEFCN__)) {
+        case __GO_RESIZEFCN__ :
             return FigureProperty.RESIZEFCN;
-        } else if (propertyName.equals(__GO_CLOSEREQUESTFCN__)) {
+        case __GO_CLOSEREQUESTFCN__ :
             return FigureProperty.CLOSEREQUESTFCN;
-        } else {
+        default :
             return super.getPropertyFromName(propertyName);
         }
     }
@@ -954,8 +956,8 @@ public class Figure extends GraphicObject {
     /**
      * @return Type as String
      */
-    public String getType() {
-        return "Figure";
+    public Integer getType() {
+        return GraphicObjectProperties.__GO_FIGURE__;
     }
 
 }
index 93f5779..9915aa7 100644 (file)
@@ -134,7 +134,7 @@ public class GraphicController {
      * @param value the property value
      * @return true if the property has been set, false otherwise
      */
-    public boolean setProperty(String id, String prop, Object value) {
+    public boolean setProperty(String id, int prop, Object value) {
         try {
             switch (GraphicModel.getModel().setProperty(id, prop, value)) {
             case Success : // BroadCast Message + return true
@@ -162,7 +162,7 @@ public class GraphicController {
      * @param prop the property name
      * @return the property value
      */
-    public Object getProperty(String id, String prop) {
+    public Object getProperty(String id, int prop) {
         try {
             return GraphicModel.getModel().getProperty(id, prop);
         }
@@ -191,6 +191,7 @@ public class GraphicController {
      * @return the created object's id
      */
     public String askObject(Type type) {
+        
         try {
             UID id = createUID();
             GraphicModel.getModel().createObject(id.toString(), type);
@@ -253,7 +254,7 @@ public class GraphicController {
      */
     public void objectCreated(final String id) {
         INFO("### Create object : "+id);
-        INFO("### type is : " + getProperty(id, "Type"));
+        INFO("### type is : " + getProperty(id, GraphicObjectProperties.__GO_TYPE__));
         Vector<Runnable> broadCastVector= new Vector<Runnable>();
 
         try {
@@ -277,9 +278,9 @@ public class GraphicController {
      * @param id the updated object's id
      * @param prop the property that has been updated
      */
-    public void objectUpdate(final String id, final String prop) {
+    public void objectUpdate(final String id, final int prop) {
         INFO("### Update object : "+id);
-        INFO("### type is : " + getProperty(id, "Type"));
+        INFO("### type is : " + getProperty(id, GraphicObjectProperties.__GO_TYPE__));
         INFO("### prop is : " + prop);
 
         Vector<Runnable> broadCastVector= new Vector<Runnable>();
@@ -305,7 +306,7 @@ public class GraphicController {
      */
     public void objectDeleted(final String id) {
         INFO("### Delete object : "+id);
-        INFO("### type is : " + getProperty(id, "Type"));
+        INFO("### type is : " + getProperty(id, GraphicObjectProperties.__GO_TYPE__));
         Vector<Runnable> broadCastVector= new Vector<Runnable>();
 
         try {
index 681b731..dacde59 100644 (file)
@@ -104,7 +104,7 @@ public final class GraphicModel {
      * @param property property name
      * @return property value
      */
-    public Object getProperty(String id, String property) {
+    public Object getProperty(String id, int property) {
         GraphicObject object = allObjects.get(id);
 
         if (object != null) {
@@ -121,7 +121,7 @@ public final class GraphicModel {
      * @param value property value
      * @return true if the property has been set, false otherwise
      */
-    public UpdateStatus setProperty(String id, String property, Object value) {
+    public UpdateStatus setProperty(String id, int property, Object value) {
         GraphicObject object = allObjects.get(id);
         if (object != null) {
             synchronized (object) {
index 5030972..4554a5c 100644 (file)
@@ -38,16 +38,17 @@ public abstract class GraphicClippableObject extends GraphicObject {
         * @param propertyName the property name
         * @return the property enum
         */
-       public Object getPropertyFromName(String propertyName) {
-               if (propertyName.equals(__GO_CLIP_PROPERTY__)) {
+       public Object getPropertyFromName(int propertyName) {
+               switch (propertyName) {
+               case __GO_CLIP_PROPERTY__ :
                        return GraphicClippableObjectProperty.CLIPPROPERTY;
-               } else if (propertyName.equals(__GO_CLIP_STATE__)) {
+               case __GO_CLIP_STATE__ :
                        return ClippablePropertyType.CLIPSTATE;
-               } else if (propertyName.equals(__GO_CLIP_BOX__)) {
+               case __GO_CLIP_BOX__ :
                        return ClippablePropertyType.CLIPBOX;
-               } else if (propertyName.equals(__GO_CLIP_BOX_SET__)) {
+               case __GO_CLIP_BOX_SET__ :
                        return ClippablePropertyType.CLIPBOXSET;
-               } else {
+               default :
                        return super.getPropertyFromName(propertyName);
                }
        }
index 78fd23b..929fb26 100644 (file)
@@ -148,76 +148,77 @@ public abstract class GraphicObject implements Cloneable {
      * @param typeName the property name
      * @return the type enum
      */
-    public static Type getTypeFromName(String typeName) {
-        if (typeName.equals(__GO_ARC__)) {
+    public static Type getTypeFromName(int typeName) {
+        switch (typeName) {
+        case __GO_ARC__ :
             return Type.ARC;
-        } else if (typeName.equals(__GO_AXES__)) {
+        case __GO_AXES__ :
             return Type.AXES;
-        } else if (typeName.equals(__GO_AXESMODEL__)) {
+        case __GO_AXESMODEL__ :
             return Type.AXESMODEL;
-        } else if (typeName.equals(__GO_AXIS__)) {
+        case __GO_AXIS__ :
             return Type.AXIS;
-        } else if (typeName.equals(__GO_CHAMP__)) {
+        case __GO_CHAMP__ :
             return Type.CHAMP;
-        } else if (typeName.equals(__GO_COMPOUND__)) {
+        case __GO_COMPOUND__ :
             return Type.COMPOUND;
-        } else if (typeName.equals(__GO_FAC3D__)) {
+        case __GO_FAC3D__ :
             return Type.FAC3D;
-        } else if (typeName.equals(__GO_FEC__)) {
+        case __GO_FEC__ :
             return Type.FEC;
-        } else if (typeName.equals(__GO_FIGURE__)) {
+        case __GO_FIGURE__ :
             return Type.FIGURE;
-        } else if (typeName.equals(__GO_FIGUREMODEL__)) {
+        case __GO_FIGUREMODEL__ :
             return Type.FIGUREMODEL;
-        } else if (typeName.equals(__GO_GRAYPLOT__)) {
+        case __GO_GRAYPLOT__ :
             return Type.GRAYPLOT;
-        } else if (typeName.equals(__GO_LABEL__)) {
+        case __GO_LABEL__ :
             return Type.LABEL;
-        } else if (typeName.equals(__GO_LEGEND__)) {
+        case __GO_LEGEND__ :
             return Type.LEGEND;
-        } else if (typeName.equals(__GO_MATPLOT__)) {
+        case __GO_MATPLOT__ :
             return Type.MATPLOT;
-        } else if (typeName.equals(__GO_PLOT3D__)) {
+        case __GO_PLOT3D__ :
             return Type.PLOT3D;
-        } else if (typeName.equals(__GO_POLYLINE__)) {
+        case __GO_POLYLINE__ :
             return Type.POLYLINE;
-        } else if (typeName.equals(__GO_RECTANGLE__)) {
+        case __GO_RECTANGLE__ :
             return Type.RECTANGLE;
-        } else if (typeName.equals(__GO_SEGS__)) {
+        case __GO_SEGS__ :
             return Type.SEGS;
-        } else if (typeName.equals(__GO_TEXT__)) {
+        case __GO_TEXT__ :
             return Type.TEXT;
-        } else if (typeName.equals(__GO_UI_CHECKBOX__)) {
+        case __GO_UI_CHECKBOX__ :
             return Type.CHECKBOX;
-        } else if (typeName.equals(__GO_UI_EDIT__)) {
+        case __GO_UI_EDIT__ :
             return Type.EDIT;
-        } else if (typeName.equals(__GO_UI_FRAME__)) {
+        case __GO_UI_FRAME__ :
             return Type.FRAME;
-        } else if (typeName.equals(__GO_UI_IMAGE__)) {
+        case __GO_UI_IMAGE__ :
             return Type.IMAGE;
-        } else if (typeName.equals(__GO_UI_LISTBOX__)) {
+        case __GO_UI_LISTBOX__ :
             return Type.LISTBOX;
-        } else if (typeName.equals(__GO_UI_POPUPMENU__)) {
+        case __GO_UI_POPUPMENU__ :
             return Type.POPUPMENU;
-        } else if (typeName.equals(__GO_UI_PUSHBUTTON__)) {
+        case __GO_UI_PUSHBUTTON__ :
             return Type.PUSHBUTTON;
-        } else if (typeName.equals(__GO_UI_RADIOBUTTON__)) {
+        case __GO_UI_RADIOBUTTON__ :
             return Type.RADIOBUTTON;
-        } else if (typeName.equals(__GO_UI_SLIDER__)) {
+        case __GO_UI_SLIDER__ :
             return Type.SLIDER;
-        } else if (typeName.equals(__GO_UI_TABLE__)) {
+        case __GO_UI_TABLE__ :
             return Type.TABLE;
-        } else if (typeName.equals(__GO_UI_TEXT__)) {
+        case __GO_UI_TEXT__ :
             return Type.UITEXT;
-        } else if (typeName.equals(__GO_UIMENU__)) {
+        case __GO_UIMENU__ :
             return Type.UIMENU;
-        } else if (typeName.equals(__GO_UICONTEXTMENU__)) {
+        case __GO_UICONTEXTMENU__ :
             return Type.UICONTEXTMENU;
-        } else if (typeName.equals(__GO_PROGRESSIONBAR__)) {
+        case __GO_PROGRESSIONBAR__ :
             return Type.PROGRESSIONBAR;
-        } else if (typeName.equals(__GO_WAITBAR__)) {
+        case __GO_WAITBAR__ :
             return Type.WAITBAR;
-        } else {
+        default :
             return Type.UNKNOWNOBJECT;
         }
     }
@@ -227,48 +228,47 @@ public abstract class GraphicObject implements Cloneable {
      * @param propertyName the property name
      * @return the property enum
      */
-    public Object getPropertyFromName(String propertyName) {
-        if (propertyName.equals(__GO_PARENT__)) {
+    public Object getPropertyFromName(int propertyName) {
+        switch (propertyName) {
+        case __GO_PARENT__ :
             return  GraphicObjectPropertyType.PARENT;
-        } else if (propertyName.equals(__GO_CHILDREN__)) {
+        case __GO_CHILDREN__ :
             return GraphicObjectPropertyType.CHILDREN;
-        } else if (propertyName.equals(__GO_CHILDREN_COUNT__)) {
+        case __GO_CHILDREN_COUNT__ :
             return GraphicObjectPropertyType.CHILDREN_COUNT;
-        } else if (propertyName.equals(__GO_HIDDEN__)) {
+        case __GO_HIDDEN__ :
             return GraphicObjectPropertyType.HIDDEN;
-        } else if (propertyName.equals(__GO_VISIBLE__)) {
+        case __GO_VISIBLE__ :
             return GraphicObjectPropertyType.VISIBLE;
-        } else if (propertyName.equals(__GO_USER_DATA__)) {
+        case __GO_USER_DATA__ :
             return GraphicObjectPropertyType.USERDATA;
-        } else if (propertyName.equals(__GO_USER_DATA_SIZE__)) {
+        case __GO_USER_DATA_SIZE__ :
             return GraphicObjectPropertyType.USERDATASIZE;
-        } else if (propertyName.equals(__GO_REFERENCED__)) {
+        case __GO_REFERENCED__ :
             return GraphicObjectPropertyType.REFERENCED;
-        } else if (propertyName.equals(__GO_VALID__)) {
+        case __GO_VALID__ :
             return GraphicObjectPropertyType.VALID;
-        } else if (propertyName.equals(__GO_PARENT_FIGURE__)) {
+        case __GO_PARENT_FIGURE__ :
             return GraphicObjectPropertyType.PARENT_FIGURE;
-        } else if (propertyName.equals(__GO_PARENT_AXES__)) {
-            return GraphicObjectPropertyType.PARENT_AXES;
-        } else if (propertyName.equals(__GO_PARENT_AXES__)) {
+        case __GO_PARENT_AXES__ :
             return GraphicObjectPropertyType.PARENT_AXES;
-        } else if (propertyName.equals(__GO_HAS_LEGEND_CHILD__)) {
+        case __GO_HAS_LEGEND_CHILD__ :
             return GraphicObjectPropertyType.HASLEGENDCHILD;
-        } else if (propertyName.equals(__GO_LEGEND_CHILD__)) {
+        case __GO_LEGEND_CHILD__ :
             return GraphicObjectPropertyType.LEGENDCHILD;
-        } else if (propertyName.equals(__GO_SELECTED_CHILD__)) {
+        case __GO_SELECTED_CHILD__ :
             return GraphicObjectPropertyType.SELECTEDCHILD;
-        } else if (propertyName.equals(__GO_TYPE__)) {
+        case __GO_TYPE__ :
             return GraphicObjectPropertyType.TYPE;
-        }  else if (propertyName.equals(__GO_DATA_MODEL__)) {
+        case __GO_DATA_MODEL__ :
             return GraphicObjectPropertyType.DATA;
-        }  else if (propertyName.equals(__GO_TAG__)) {
+        case __GO_TAG__ :
             return GraphicObjectPropertyType.TAG;
-        }  else if (propertyName.equals(__GO_CALLBACK__)) {
+        case __GO_CALLBACK__ :
             return GraphicObjectPropertyType.CALLBACK;
-        }  else if (propertyName.equals(__GO_CALLBACKTYPE__)) {
+        case __GO_CALLBACKTYPE__ :
             return GraphicObjectPropertyType.CALLBACKTYPE;
-        }  else {
+        default:
             //System.err.println("[ERROR] Unknown Property : "+propertyName+" !!!!!!!!!!");
             return GraphicObjectPropertyType.UNKNOWNPROPERTY;
         }
@@ -640,11 +640,7 @@ public abstract class GraphicObject implements Cloneable {
      * Each type should name itself
      * @return Type as String
      */
-    // TODO : Should be public abstract.
-    //public abstract String getType();
-    public String getType() {
-        return "???";
-    }
+    public abstract Integer getType();
 
     /**
      * isValid method
index 68de0d3..9e36ebe 100644 (file)
@@ -20,353 +20,340 @@ package org.scilab.modules.graphic_objects.graphicObject;
 
 public class GraphicObjectProperties {
 
-    public static final String __GO_ARC__   =                  "Arc";
-    public static final String __GO_AXES__   =                 "Axes";
-    public static final String __GO_AXESMODEL__   =            "AxesModel";
-    public static final String __GO_AXIS__   =                 "Axis";
-    public static final String __GO_CHAMP__  =                 "Champ";
-    public static final String __GO_COMPOUND__ =               "Compound";
-    public static final String __GO_FAC3D__ =                  "Fac3d";
-    public static final String __GO_FEC__ =                    "Fec";
-    public static final String __GO_FIGURE__ =                 "Figure";
-    public static final String __GO_FIGUREMODEL__ =            "FigureModel";
-    public static final String __GO_GRAYPLOT__ =               "Grayplot";
-    public static final String __GO_LABEL__ =                  "Label";
-    public static final String __GO_LEGEND__ =                 "Legend";
-    public static final String __GO_MATPLOT__ =                "Matplot";
-    public static final String __GO_PLOT3D__ =                 "Plot3d";
-    public static final String __GO_POLYLINE__ =               "Polyline";
-    public static final String __GO_RECTANGLE__ =              "Rectangle";
-    public static final String __GO_SEGS__ =                   "Segs";
-    public static final String __GO_TEXT__ =                   "Text";
-    public static final String __GO_UICONTROL__ =              "uicontrol";
-    public static final String __GO_UIMENU__ =                 "uimenu";
-    public static final String __GO_UICONTEXTMENU__ =          "uicontextmenu";
-
-    public static final String __GO_CHILDREN__ =               "Children";
-    public static final String __GO_CHILDREN_COUNT__ =         "ChildrenCount";
-    public static final String __GO_PARENT__ =                 "Parent";
-    public static final String __GO_USER_DATA__ =              "UserData";
-    public static final String __GO_USER_DATA_SIZE__ =         "UserDataSize";
-    public static final String __GO_VISIBLE__ =                "Visible";
-    public static final String __GO_HIDDEN__ =                 "Hidden";
-    public static final String __GO_TYPE__ =                   "Type";
-    public static final String __GO_DATA_MODEL__ =             "DataModel";
-    public static final String __GO_PARENT_FIGURE__ =          "ParentFigure";
-    public static final String __GO_PARENT_AXES__ =            "ParentAxes";
-    public static final String __GO_HAS_LEGEND_CHILD__ =       "HasLegendChild";
-    public static final String __GO_LEGEND_CHILD__ =           "LegendChild";
-    public static final String __GO_SELECTED_CHILD__ =         "SelectedChild";
-    public static final String __GO_CALLBACK__ =               "Callback";
-    public static final String __GO_CALLBACKTYPE__ =           "CallbackType";
-
-    public static final String __GO_DATA_MODEL_COORDINATES__ = "DataModelCoordinates";
-    public static final String __GO_DATA_MODEL_X__ =           "DataModelX";
-    public static final String __GO_DATA_MODEL_Y__ =           "DataModelY";
-    public static final String __GO_DATA_MODEL_Z__ =           "DataModelZ";
-
-    public static final String __GO_DATA_MODEL_X_COORDINATES_SHIFT__ =     "DataModelXCoordinatesShift";
-    public static final String __GO_DATA_MODEL_Y_COORDINATES_SHIFT__ =     "DataModelYCoordinatesShift";
-    public static final String __GO_DATA_MODEL_Z_COORDINATES_SHIFT__ =     "DataModelZCoordinatesShift";
-
-    public static final String __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__ = "DataModelXCoordinatesShiftSet";
-    public static final String __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__ = "DataModelYCoordinatesShiftSet";
-    public static final String __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__ = "DataModelZCoordinatesShiftSet";
-
-    public static final String __GO_DATA_MODEL_NUM_ELEMENTS__ =            "DataModelNumElements";
-    public static final String __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__ =      "DataModelNumElementsArray";
-    public static final String __GO_DATA_MODEL_NUM_VERTICES_PER_GON__ =    "DataModelNumVerticesPerGon";
-    public static final String __GO_DATA_MODEL_NUM_GONS__ =                "DataModelNumGons";
-
-    public static final String __GO_DATA_MODEL_Z_COORDINATES_SET__ =       "DataModelZCoordinatesSet";
-
-    public static final String __GO_DATA_MODEL_COLORS__ =                  "DataModelColors";
-    public static final String __GO_DATA_MODEL_NUM_COLORS__ =              "DataModelNumColors";
-
-    public static final String __GO_DATA_MODEL_NUM_VERTICES__ =            "DataModelVertices";
-    public static final String __GO_DATA_MODEL_NUM_INDICES__ =             "DataModelNumIndices";
-    public static final String __GO_DATA_MODEL_INDICES__ =                 "DataModelIndices";
-    public static final String __GO_DATA_MODEL_VALUES__ =                  "DataModelValues";
-
-    public static final String __GO_DATA_MODEL_FEC_TRIANGLES__ =           "DataModelFecTriangles";
-
-    public static final String __GO_DATA_MODEL_NUM_X__ =                   "DataModelNumX";
-    public static final String __GO_DATA_MODEL_NUM_Y__ =                   "DataModelNumY";
-    public static final String __GO_DATA_MODEL_NUM_Z__ =                   "DataModelNumZ";
-    public static final String __GO_DATA_MODEL_GRID_SIZE__ =               "DataModelGridSize";
-    public static final String __GO_DATA_MODEL_X_DIMENSIONS__ =            "DataModelXDimensions";
-    public static final String __GO_DATA_MODEL_Y_DIMENSIONS__ =            "DataModelYDimensions";
-
-    public static final String __GO_MATPLOT_TRANSLATE__ =                  "MatplotTranslate";
-    public static final String __GO_MATPLOT_SCALE__ =                      "MatplotScale";
-    public static final String __GO_DATA_MODEL_MATPLOT_BOUNDS__ =          "DataModelMatplotBounds";
-    public static final String __GO_DATA_MODEL_MATPLOT_TYPE__ =            "DataModelMatplotType";
-
-    public static final String __GO_REFERENCED__ =             "Referenced";
-    public static final String __GO_VALID__ =                  "Valid";
-
-    public static final String __GO_POSITION__ =               "Position";
-    public static final String __GO_SIZE__ =                   "Size";
-    public static final String __GO_CANVAS__ =                 "Canvas";
-    public static final String __GO_AUTORESIZE__ =             "AutoResize";
-    public static final String __GO_VIEWPORT__ =               "Viewport";
-    public static final String __GO_AXES_SIZE__ =              "AxesSize";
-    public static final String __GO_FIGURE_NAME__ =            "FigureName";
-    public static final String __GO_NAME__ =                   "Name";
-    public static final String __GO_ID__ =                     "Id";
-    public static final String __GO_INFO_MESSAGE__ =           "InfoMessage";
-    public static final String __GO_COLORMAP__ =               "ColorMap";
-    public static final String __GO_COLORMAP_SIZE__ =          "ColorMapSize";
-    public static final String __GO_RENDERING_MODE__ =         "RenderingMode";
-    public static final String __GO_PIXMAP__ =                 "Pixmap";
-    public static final String __GO_PIXEL_DRAWING_MODE__ =     "PixelDrawingMode";
-    public static final String __GO_ANTIALIASING__ =           "Antialiasing";
-    public static final String __GO_IMMEDIATE_DRAWING__ =      "ImmediateDrawing";
-    public static final String __GO_BACKGROUND__ =             "Background";
-    public static final String __GO_EVENTHANDLER__ =           "EventHandler";
-    public static final String __GO_EVENTHANDLER_NAME__ =      "EventHandlerName";
-    public static final String __GO_EVENTHANDLER_ENABLE__ =    "EventHandlerEnable";
-    public static final String __GO_TAG__ =                    "Tag";
-    public static final String __GO_ROTATION_TYPE__ =          "RotationType";
-    public static final String __GO_RESIZEFCN__ =              "ResizeFcn";
-    public static final String __GO_CLOSEREQUESTFCN__ =        "CloseRequestFcn";
-
-    public static final String __GO_UPPER_LEFT_POINT__ =       "UpperLeftPoint";
-    public static final String __GO_WIDTH__ =                  "Width";
-    public static final String __GO_HEIGHT__ =                 "Height";
-    public static final String __GO_START_ANGLE__ =            "StartAngle";
-    public static final String __GO_END_ANGLE__ =              "EndAngle";
-    public static final String __GO_ARC_DRAWING_METHOD__ =     "ArcDrawingMethod";
-
-    public static final String __GO_X_AXIS_VISIBLE__ =         "XAxisVisible";
-    public static final String __GO_X_AXIS_REVERSE__ =         "XAxisReverse";
-    public static final String __GO_X_AXIS_GRID_COLOR__ =      "XAxisGridColor";
-    public static final String __GO_X_AXIS_LABEL__ =           "XAxisLabel";
-    public static final String __GO_X_AXIS_LOCATION__ =                "XAxisLocation";
-    public static final String __GO_X_AXIS_LOG_FLAG__ =        "XAxisLogFlag";
-    public static final String __GO_X_AXIS_TICKS__ =                   "XAxisTicks";
-    public static final String __GO_X_AXIS_AUTO_TICKS__ =              "XAxisAutoTicks";
-    public static final String __GO_X_AXIS_NUMBER_TICKS__ =            "XAxisNumberTicks";
-    public static final String __GO_X_AXIS_TICKS_LOCATIONS__ = "XAxisTicksLocations";
-    public static final String __GO_X_AXIS_TICKS_LABELS__ =    "XAxisTicksLabels";
-    public static final String __GO_X_AXIS_SUBTICKS__ =        "XAxisSubticks";
-
-    public static final String __GO_Y_AXIS_VISIBLE__ =         "YAxisVisible";
-    public static final String __GO_Y_AXIS_REVERSE__ =         "YAxisReverse";
-    public static final String __GO_Y_AXIS_GRID_COLOR__ =      "YAxisGridColor";
-    public static final String __GO_Y_AXIS_LABEL__ =           "YAxisLabel";
-    public static final String __GO_Y_AXIS_LOCATION__ =                "YAxisLocation";
-    public static final String __GO_Y_AXIS_LOG_FLAG__ =        "YAxisLogFlag";
-    public static final String __GO_Y_AXIS_TICKS__ =                   "YAxisTicks";
-    public static final String __GO_Y_AXIS_AUTO_TICKS__ =              "YAxisAutoTicks";
-    public static final String __GO_Y_AXIS_NUMBER_TICKS__ =            "YAxisNumberTicks";
-    public static final String __GO_Y_AXIS_TICKS_LOCATIONS__ = "YAxisTicksLocations";
-    public static final String __GO_Y_AXIS_TICKS_LABELS__ =    "YAxisTicksLabels";
-    public static final String __GO_Y_AXIS_SUBTICKS__ =        "YAxisSubticks";
-
-    public static final String __GO_Z_AXIS_VISIBLE__ =         "ZAxisVisible";
-    public static final String __GO_Z_AXIS_REVERSE__ =         "ZAxisReverse";
-    public static final String __GO_Z_AXIS_GRID_COLOR__ =      "ZAxisGridColor";
-    public static final String __GO_Z_AXIS_LABEL__ =           "ZAxisLabel";
-    public static final String __GO_Z_AXIS_LOCATION__ =                "ZAxisLocation";
-    public static final String __GO_Z_AXIS_LOG_FLAG__ =        "ZAxisLogFlag";
-    public static final String __GO_Z_AXIS_TICKS__ =                   "ZAxisTicks";
-    public static final String __GO_Z_AXIS_AUTO_TICKS__ =              "ZAxisAutoTicks";
-    public static final String __GO_Z_AXIS_NUMBER_TICKS__ =            "ZAxisNumberTicks";
-    public static final String __GO_Z_AXIS_TICKS_LOCATIONS__ = "ZAxisTicksLocations";
-    public static final String __GO_Z_AXIS_TICKS_LABELS__ =    "ZAxisTicksLabels";
-    public static final String __GO_Z_AXIS_SUBTICKS__ =        "ZAxisSubticks";
-
-    public static final String __GO_AUTO_SUBTICKS__ =          "AutoSubticks";
-
-    public static final String __GO_GRID_POSITION__ =          "GridPosition";
-    public static final String __GO_TITLE__ =                  "Title";
-    public static final String __GO_AUTO_CLEAR__ =             "AutoClear";
-    public static final String __GO_FILLED__ =                 "Filled";
-    public static final String __GO_CAMERA__ =                 "Camera";
-    public static final String __GO_VIEW__ =                   "View";
-    public static final String __GO_ISOVIEW__ =                "Isoview";
-    public static final String __GO_CUBE_SCALING__ =           "CubeScaling";
-    public static final String __GO_ROTATION_ANGLES__ =        "RotationAngles";
-    public static final String __GO_ROTATION_ANGLES_3D__ =     "RotationAngles3d";
-    public static final String __GO_BOX_TYPE__ =               "BoxType";
-    public static final String __GO_HIDDEN_AXIS_COLOR__ =      "HiddenAxisColor";
-    public static final String __GO_TIGHT_LIMITS__ =           "TightLimits";
-    public static final String __GO_DATA_BOUNDS__ =            "DataBounds";
-    public static final String __GO_REAL_DATA_BOUNDS__ =       "RealDataBounds";
-    public static final String __GO_ZOOM_ENABLED__ =           "ZoomEnabled";
-    public static final String __GO_ZOOM_BOX__ =               "ZoomBox";
-    public static final String __GO_AUTO_SCALE__ =             "AutoScale";
-    public static final String __GO_FIRST_PLOT__ =             "FirstPlot";
-    public static final String __GO_MARGINS__ =                "Margins";
-    public static final String __GO_AXES_BOUNDS__ =            "AxesBounds";
-
-    public static final String __GO_CLIP_PROPERTY__ =          "ClipProperty";
-    public static final String __GO_CLIP_STATE__ =             "ClipState";
-    public static final String __GO_CLIP_BOX__ =               "ClipBox";
-    public static final String __GO_CLIP_BOX_SET__ =           "ClipBoxSet";
-
-    public static final String __GO_LINE__ =                   "Line";
-    public static final String __GO_LINE_MODE__ =              "LineMode";
-    public static final String __GO_LINE_STYLE__ =             "LineStyle";
-    public static final String __GO_LINE_THICKNESS__ =         "LineThickness";
-    public static final String __GO_LINE_COLOR__ =             "LineColor";
-    public static final String __GO_FILL_MODE__ =              "FillMode";
-    public static final String __GO_MARK__ =                   "Mark";
-    public static final String __GO_MARK_MODE__ =              "MarkMode";
-    public static final String __GO_MARK_STYLE__ =             "MarkStyle";
-    public static final String __GO_MARK_SIZE_UNIT__ =         "MarkSizeUnit";
-    public static final String __GO_MARK_SIZE__ =              "MarkSize";
-    public static final String __GO_MARK_FOREGROUND__ =        "MarkForeground";
-    public static final String __GO_MARK_BACKGROUND__ =        "MarkBackground";
-
-    public static final String __GO_TICKS_DIRECTION__ =        "TicksDirection";
-    public static final String __GO_X_NUMBER_TICKS__ =         "XNumberTicks";
-    public static final String __GO_Y_NUMBER_TICKS__ =         "YNumberTicks";
-    public static final String __GO_X_TICKS_COORDS__ =         "XTicksCoords";
-    public static final String __GO_Y_TICKS_COORDS__ =         "YTicksCoords";
-    public static final String __GO_TICKS_COLOR__ =            "TicksColor";
-    public static final String __GO_TICKS_SEGMENT__ =          "TicksSegment";
-    public static final String __GO_TICKS_STYLE__ =            "TicksStyle";
-    public static final String __GO_SUBTICKS__ =               "Subticks";
-    public static final String __GO_NUMBER_TICKS_LABELS__ =    "NumberTicksLabels";
-    public static final String __GO_TICKS_LABELS__ =           "TicksLabels";
-    public static final String __GO_FORMATN__ =                "Formatn";
-    public static final String __GO_FONT__ =                   "Font";
-    public static final String __GO_FONT_STYLE__ =             "FontStyle";
-    public static final String __GO_FONT_SIZE__ =              "FontSize";
-    public static final String __GO_FONT_COLOR__ =             "FontColor";
-    public static final String __GO_FONT_FRACTIONAL__ =        "FontFractional";
-
-    public static final String __GO_Z_BOUNDS__ =               "ZBounds";
-    public static final String __GO_OUTSIDE_COLOR__ =          "OutsideColor";
-    public static final String __GO_COLOR_RANGE__ =            "ColorRange";
-
-    public static final String __GO_DATA_MAPPING__ =           "DataMapping";
-
-    public static final String __GO_FONT_ANGLE__ =             "FontAngle";
-    public static final String __GO_AUTO_POSITION__ =          "AutoPosition";
-    public static final String __GO_CORNERS__ =                "Corners";
-    public static final String __GO_AUTO_ROTATION__ =          "AutoRotation";
-
-    public static final String __GO_LINKS__ =                  "Links";
-    public static final String __GO_LINKS_COUNT__ =            "LinksCount";
-    public static final String __GO_LEGEND_LOCATION__ =        "LegendLocation";
-
-    public static final String __GO_CLOSED__ =                 "Closed";
-    public static final String __GO_ARROW_SIZE_FACTOR__ =      "ArrowSizeFactor";
-    public static final String __GO_POLYLINE_STYLE__ =         "PolylineStyle";
-    public static final String __GO_INTERP_COLOR_VECTOR__ =    "InterpColorVector";
-    public static final String __GO_INTERP_COLOR_VECTOR_SET__ =    "InterpColorVectorSet";
-    public static final String __GO_INTERP_COLOR_MODE__ =      "InterpColorMode";
-    public static final String __GO_X_SHIFT__ =                "XShift";
-    public static final String __GO_Y_SHIFT__ =                "YShift";
-    public static final String __GO_Z_SHIFT__ =                "ZShift";
-    public static final String __GO_BAR_WIDTH__ =              "BarWidth";
-
-    public static final String __GO_SURFACE_MODE__ =           "SurfaceMode";
-    public static final String __GO_COLOR_MODE__ =             "ColorMode";
-    public static final String __GO_COLOR_FLAG__ =             "ColorFlag";
-
-    public static final String __GO_ALIGNMENT__ =              "Alignment";
-    public static final String __GO_BOX__ =                    "Box";
-    public static final String __GO_TEXT_BOX__ =               "TextBox";
-    public static final String __GO_TEXT_BOX_MODE__ =          "TextBoxMode";
-    public static final String __GO_AUTO_DIMENSIONING__ =      "AutoDimensioning";
-
-    public static final String __GO_FORMATTED_TEXT__ =         "FormattedText";
-    public static final String __GO_TEXT_ARRAY_DIMENSIONS__ =  "TextArrayDimensions";
-    public static final String __GO_TEXT_STRINGS__ =           "TextStrings";
-
-    public static final String __GO_BASE__ =                   "Base";
-    public static final String __GO_BASE_X__ =                 "BaseX";
-    public static final String __GO_BASE_Y__ =                 "BaseY";
-    public static final String __GO_BASE_Z__ =                 "BaseZ";
-    public static final String __GO_DIRECTION__ =              "Direction";
-    public static final String __GO_DIRECTION_X__ =            "DirectionX";
-    public static final String __GO_DIRECTION_Y__ =            "DirectionY";
-    public static final String __GO_DIRECTION_Z__ =            "DirectionZ";
-    public static final String __GO_ARROW_SIZE__ =             "ArrowSize";
-    public static final String __GO_SEGS_COLORS__ =            "SegsColors";
-
-    public static final String __GO_COLORED__ =                "Colored";
-
-    public static final String __GO_ARROWS__ =                 "Arrows";
-    public static final String __GO_NUMBER_ARROWS__ =          "NumberArrows";
-    public static final String __GO_CHAMP_DIMENSIONS__ =       "ChampDimensions";
-    public static final String __GO_BOUNDING_BOX__ =           "BoundingBox";
-    public static final String __GO_MAX_LENGTH__ =             "MaxLength";
-    public static final String __GO_MAX_USABLE_LENGTH__ =      "MaxUsableLength";
-
-    public static final String __GO_HIDDEN_COLOR__ =           "HiddenColor";
-
-    public static final String __GO_STYLE__ =                  "Style";
-    public static final String __GO_UI_CHECKBOX__ =            "checkbox";
-    public static final String __GO_UI_EDIT__ =                "edit";
-    public static final String __GO_UI_FRAME__ =               "frame";
-    public static final String __GO_UI_IMAGE__ =               "image";
-    public static final String __GO_UI_LISTBOX__ =             "listbox";
-    public static final String __GO_UI_POPUPMENU__ =           "popupmenu";
-    public static final String __GO_UI_PUSHBUTTON__ =          "pushbutton";
-    public static final String __GO_UI_RADIOBUTTON__ =         "radiobutton";
-    public static final String __GO_UI_SLIDER__ =              "slider";
-    public static final String __GO_UI_TABLE__ =               "table";
-    public static final String __GO_UI_TEXT__ =                "text";
-
-    public static final String __GO_UI_BACKGROUNDCOLOR__ =     "UIBackgroundColor";
-    public static final String __GO_UI_ENABLE__ =              "UIEnable";
-    public static final String __GO_UI_FONTANGLE__ =           "UIFontAngle";
-    public static final String __GO_UI_FONTNAME__ =            "UIFontName";
-    public static final String __GO_UI_FONTSIZE__ =            "UIFontSize";
-    public static final String __GO_UI_FONTUNITS__ =           "UIFontUnits";
-    public static final String __GO_UI_FONTWEIGHT__ =          "UIFontWeight";
-    public static final String __GO_UI_FOREGROUNDCOLOR__ =     "UIForegroundColor";
-    public static final String __GO_UI_HORIZONTALALIGNMENT__ = "UIHorizontalAlignment";
-    public static final String __GO_UI_LISTBOXTOP__ =          "UIListboxTop";
-    public static final String __GO_UI_LISTBOXTOP_SIZE__ =     "UIListboxTopSize";
-    public static final String __GO_UI_MAX__ =                 "UIMax";
-    public static final String __GO_UI_MIN__ =                 "UIMin";
-    public static final String __GO_UI_RELIEF__ =              "UIRelief";
-    public static final String __GO_UI_STRING__ =              "UIString";
-    public static final String __GO_UI_STRING_SIZE__ =         "UIStringSize";
-    public static final String __GO_UI_STRING_COLNB__ =        "UIStringColNb";
-    public static final String __GO_UI_TOOLTIPSTRING__ =       "UITooltipString";
-    public static final String __GO_UI_TOOLTIPSTRING_SIZE__ =  "UITooltipStringSize";
-    public static final String __GO_UI_SLIDERSTEP__ =          "UISliderStep";
-    public static final String __GO_UI_UNITS__ =               "UIUnits";
-    public static final String __GO_UI_VALUE__ =               "UIValue";
-    public static final String __GO_UI_VALUE_SIZE__ =          "UIValueSize";
-    public static final String __GO_UI_VERTICALALIGNMENT__ =   "UIVerticalAlignment";
-
-    public static final String __GO_UI_POINTS_UNITS__ =        "points";
-    public static final String __GO_UI_NORMALIZED_UNITS__ =    "normalized";
-    public static final String __GO_UI_INCHES_UNITS__ =        "inches";
-    public static final String __GO_UI_CENTIMETERS_UNITS__ =   "centimeters";
-    public static final String __GO_UI_PIXELS_UNITS__ =        "pixels";
-
-    public static final String __GO_UI_FLAT_RELIEF__ =         "flat";
-    public static final String __GO_UI_RAISED_RELIEF__ =       "raised";
-    public static final String __GO_UI_SUNKEN_RELIEF__ =       "sunken";
-    public static final String __GO_UI_GROOVE_RELIEF__ =       "groove";
-    public static final String __GO_UI_RIDGE_RELIEF__ =        "ridge";
-    public static final String __GO_UI_SOLID_RELIEF__ =        "solid";
-
-    public static final String __GO_UIPARENTMENU__ =           "UIParentMenu";
-    public static final String __GO_UICHILDMENU__ =            "UIChildMenu";
-    public static final String __GO_UICHECKEDMENU__ =          "UICheckedMenu";
-    public static final String __GO_UI_CHECKED__ =             "UIChecked";
-    public static final String __GO_UI_LABEL__ =               "UILabel";
-    public static final String __GO_UI_MNEMONIC__ =            "UIMnemonic";
-    public static final String __GO_UI_ACCELERATOR__ =         "UIAccelerator";
-    public static final String __GO_UI_SEPARATOR__ =           "UISeparator";
-    public static final String __GO_UI_ICON__ =                "UIIcon";
-
-    public static final String __GO_CONSOLE__ =                "Console";
-    public static final String __GO_SHOWHIDDENHANDLES__ =      "ShowHiddenHandles";
-
-    public static final String __GO_WAITBAR__ =                "Waitbar";
-    public static final String __GO_PROGRESSIONBAR__ =         "Progressionbar";
-    public static final String __GO_UI_MESSAGE__ =             "UIMessage";
-    public static final String __GO_UI_MESSAGE_SIZE__ =        "UIMessageSize";
+    public static final int __GO_ARC__   =                  1;
+    public static final int __GO_AXES__   =                 2;
+    public static final int __GO_AXESMODEL__   =            3;
+    public static final int __GO_AXIS__   =                 4;
+    public static final int __GO_CHAMP__  =                 5;
+    public static final int __GO_COMPOUND__ =               6;
+    public static final int __GO_FAC3D__ =                  7;
+    public static final int __GO_FEC__ =                    8;
+    public static final int __GO_FIGURE__ =                 9;
+    public static final int __GO_FIGUREMODEL__ =            10;
+    public static final int __GO_GRAYPLOT__ =               11;
+    public static final int __GO_LABEL__ =                  12;
+    public static final int __GO_LEGEND__ =                 13;
+    public static final int __GO_MATPLOT__ =                14;
+    public static final int __GO_PLOT3D__ =                 15;
+    public static final int __GO_POLYLINE__ =               16;
+    public static final int __GO_RECTANGLE__ =              17;
+    public static final int __GO_SEGS__ =                   18;
+    public static final int __GO_TEXT__ =                   19;
+    public static final int __GO_UICONTROL__ =              20;
+    public static final int __GO_UIMENU__ =                 21;
+    public static final int __GO_UICONTEXTMENU__ =          22;
+
+    public static final int __GO_CHILDREN__ =               23;
+    public static final int __GO_CHILDREN_COUNT__ =         24;
+    public static final int __GO_PARENT__ =                 25;
+    public static final int __GO_USER_DATA__ =              26;
+    public static final int __GO_USER_DATA_SIZE__ =         27;
+    public static final int __GO_VISIBLE__ =                28;
+    public static final int __GO_HIDDEN__ =                 29;
+    public static final int __GO_TYPE__ =                   30;
+    public static final int __GO_DATA_MODEL__ =             31;
+    public static final int __GO_PARENT_FIGURE__ =          32;
+    public static final int __GO_PARENT_AXES__ =            33;
+    public static final int __GO_HAS_LEGEND_CHILD__ =       34;
+    public static final int __GO_LEGEND_CHILD__ =           35;
+    public static final int __GO_SELECTED_CHILD__ =         36;
+    public static final int __GO_CALLBACK__ =               37;
+    public static final int __GO_CALLBACKTYPE__ =           38;
+
+    public static final int __GO_DATA_MODEL_COORDINATES__ = 39;
+    public static final int __GO_DATA_MODEL_X__ =           40;
+    public static final int __GO_DATA_MODEL_Y__ =           41;
+    public static final int __GO_DATA_MODEL_Z__ =           42;
+
+    public static final int __GO_DATA_MODEL_X_COORDINATES_SHIFT__ =     43;
+    public static final int __GO_DATA_MODEL_Y_COORDINATES_SHIFT__ =     44;
+    public static final int __GO_DATA_MODEL_Z_COORDINATES_SHIFT__ =     45;
+
+    public static final int __GO_DATA_MODEL_X_COORDINATES_SHIFT_SET__ = 46;
+    public static final int __GO_DATA_MODEL_Y_COORDINATES_SHIFT_SET__ = 47;
+    public static final int __GO_DATA_MODEL_Z_COORDINATES_SHIFT_SET__ = 48;
+
+    public static final int __GO_DATA_MODEL_NUM_ELEMENTS__ =            49;
+    public static final int __GO_DATA_MODEL_NUM_ELEMENTS_ARRAY__ =      50;
+    public static final int __GO_DATA_MODEL_NUM_VERTICES_PER_GON__ =    51;
+    public static final int __GO_DATA_MODEL_NUM_GONS__ =                52;
+
+    public static final int __GO_DATA_MODEL_Z_COORDINATES_SET__ =       53;
+
+    public static final int __GO_DATA_MODEL_COLORS__ =                  54;
+    public static final int __GO_DATA_MODEL_NUM_COLORS__ =              55;
+
+    public static final int __GO_DATA_MODEL_NUM_VERTICES__ =            56;
+    public static final int __GO_DATA_MODEL_NUM_INDICES__ =             57;
+    public static final int __GO_DATA_MODEL_INDICES__ =                 58;
+    public static final int __GO_DATA_MODEL_VALUES__ =                  59;
+
+    public static final int __GO_DATA_MODEL_FEC_TRIANGLES__ =           60;
+
+    public static final int __GO_DATA_MODEL_NUM_X__ =                   61;
+    public static final int __GO_DATA_MODEL_NUM_Y__ =                   62;
+    public static final int __GO_DATA_MODEL_NUM_Z__ =                   63;
+    public static final int __GO_DATA_MODEL_GRID_SIZE__ =               64;
+    public static final int __GO_DATA_MODEL_X_DIMENSIONS__ =            65;
+    public static final int __GO_DATA_MODEL_Y_DIMENSIONS__ =            66;
+
+    public static final int __GO_MATPLOT_TRANSLATE__ =                  67;
+    public static final int __GO_MATPLOT_SCALE__ =                      68;
+    public static final int __GO_DATA_MODEL_MATPLOT_BOUNDS__ =          69;
+    public static final int __GO_DATA_MODEL_MATPLOT_TYPE__ =            70;
+
+    public static final int __GO_REFERENCED__ =             71;
+    public static final int __GO_VALID__ =                  72;
+
+    public static final int __GO_POSITION__ =               73;
+    public static final int __GO_SIZE__ =                   74;
+    public static final int __GO_CANVAS__ =                 75;
+    public static final int __GO_AUTORESIZE__ =             76;
+    public static final int __GO_VIEWPORT__ =               77;
+    public static final int __GO_AXES_SIZE__ =              78;
+    public static final int __GO_FIGURE_NAME__ =            79;
+    public static final int __GO_NAME__ =                   80;
+    public static final int __GO_ID__ =                     81;
+    public static final int __GO_INFO_MESSAGE__ =           82;
+    public static final int __GO_COLORMAP__ =               83;
+    public static final int __GO_COLORMAP_SIZE__ =          84;
+    public static final int __GO_RENDERING_MODE__ =         85;
+    public static final int __GO_PIXMAP__ =                 86;
+    public static final int __GO_PIXEL_DRAWING_MODE__ =     87;
+    public static final int __GO_ANTIALIASING__ =           88;
+    public static final int __GO_IMMEDIATE_DRAWING__ =      89;
+    public static final int __GO_BACKGROUND__ =             90;
+    public static final int __GO_EVENTHANDLER__ =           91;
+    public static final int __GO_EVENTHANDLER_NAME__ =      92;
+    public static final int __GO_EVENTHANDLER_ENABLE__ =    93;
+    public static final int __GO_TAG__ =                    94;
+    public static final int __GO_ROTATION_TYPE__ =          95;
+    public static final int __GO_RESIZEFCN__ =              96;
+    public static final int __GO_CLOSEREQUESTFCN__ =        97;
+
+    public static final int __GO_UPPER_LEFT_POINT__ =       98;
+    public static final int __GO_WIDTH__ =                  99;
+    public static final int __GO_HEIGHT__ =                 100;
+    public static final int __GO_START_ANGLE__ =            101;
+    public static final int __GO_END_ANGLE__ =              102;
+    public static final int __GO_ARC_DRAWING_METHOD__ =     103;
+
+    public static final int __GO_X_AXIS_VISIBLE__ =         104;
+    public static final int __GO_X_AXIS_REVERSE__ =         105;
+    public static final int __GO_X_AXIS_GRID_COLOR__ =      106;
+    public static final int __GO_X_AXIS_LABEL__ =           107;
+    public static final int __GO_X_AXIS_LOCATION__ =           108;
+    public static final int __GO_X_AXIS_LOG_FLAG__ =        109;
+    public static final int __GO_X_AXIS_TICKS__ =                      110;
+    public static final int __GO_X_AXIS_AUTO_TICKS__ =         111;
+    public static final int __GO_X_AXIS_NUMBER_TICKS__ =       112;
+    public static final int __GO_X_AXIS_TICKS_LOCATIONS__ = 113;
+    public static final int __GO_X_AXIS_TICKS_LABELS__ =    114;
+    public static final int __GO_X_AXIS_SUBTICKS__ =        115;
+
+    public static final int __GO_Y_AXIS_VISIBLE__ =         116;
+    public static final int __GO_Y_AXIS_REVERSE__ =         117;
+    public static final int __GO_Y_AXIS_GRID_COLOR__ =      118;
+    public static final int __GO_Y_AXIS_LABEL__ =           119;
+    public static final int __GO_Y_AXIS_LOCATION__ =           120;
+    public static final int __GO_Y_AXIS_LOG_FLAG__ =        121;
+    public static final int __GO_Y_AXIS_TICKS__ =                      122;
+    public static final int __GO_Y_AXIS_AUTO_TICKS__ =         123;
+    public static final int __GO_Y_AXIS_NUMBER_TICKS__ =       124;
+    public static final int __GO_Y_AXIS_TICKS_LOCATIONS__ = 125;
+    public static final int __GO_Y_AXIS_TICKS_LABELS__ =    126;
+    public static final int __GO_Y_AXIS_SUBTICKS__ =        127;
+
+    public static final int __GO_Z_AXIS_VISIBLE__ =         128;
+    public static final int __GO_Z_AXIS_REVERSE__ =         129;
+    public static final int __GO_Z_AXIS_GRID_COLOR__ =      130;
+    public static final int __GO_Z_AXIS_LABEL__ =           131;
+    public static final int __GO_Z_AXIS_LOCATION__ =           132;
+    public static final int __GO_Z_AXIS_LOG_FLAG__ =        133;
+    public static final int __GO_Z_AXIS_TICKS__ =                      134;
+    public static final int __GO_Z_AXIS_AUTO_TICKS__ =         135;
+    public static final int __GO_Z_AXIS_NUMBER_TICKS__ =       136;
+    public static final int __GO_Z_AXIS_TICKS_LOCATIONS__ = 137;
+    public static final int __GO_Z_AXIS_TICKS_LABELS__ =    138;
+    public static final int __GO_Z_AXIS_SUBTICKS__ =        139;
+
+    public static final int __GO_AUTO_SUBTICKS__ =          140;
+
+    public static final int __GO_GRID_POSITION__ =          141;
+    public static final int __GO_TITLE__ =                  142;
+    public static final int __GO_AUTO_CLEAR__ =             143;
+    public static final int __GO_FILLED__ =                 144;
+    public static final int __GO_CAMERA__ =                 145;
+    public static final int __GO_VIEW__ =                   146;
+    public static final int __GO_ISOVIEW__ =                147;
+    public static final int __GO_CUBE_SCALING__ =           148;
+    public static final int __GO_ROTATION_ANGLES__ =        149;
+    public static final int __GO_ROTATION_ANGLES_3D__ =     150;
+    public static final int __GO_BOX_TYPE__ =               151;
+    public static final int __GO_HIDDEN_AXIS_COLOR__ =      152;
+    public static final int __GO_TIGHT_LIMITS__ =           153;
+    public static final int __GO_DATA_BOUNDS__ =            154;
+    public static final int __GO_REAL_DATA_BOUNDS__ =       155;
+    public static final int __GO_ZOOM_ENABLED__ =           156;
+    public static final int __GO_ZOOM_BOX__ =               157;
+    public static final int __GO_AUTO_SCALE__ =             158;
+    public static final int __GO_FIRST_PLOT__ =             159;
+    public static final int __GO_MARGINS__ =                160;
+    public static final int __GO_AXES_BOUNDS__ =            161;
+
+    public static final int __GO_CLIP_PROPERTY__ =          162;
+    public static final int __GO_CLIP_STATE__ =             163;
+    public static final int __GO_CLIP_BOX__ =               164;
+    public static final int __GO_CLIP_BOX_SET__ =           165;
+
+    public static final int __GO_LINE__ =                   166;
+    public static final int __GO_LINE_MODE__ =              167;
+    public static final int __GO_LINE_STYLE__ =             168;
+    public static final int __GO_LINE_THICKNESS__ =         169;
+    public static final int __GO_LINE_COLOR__ =             170;
+    public static final int __GO_FILL_MODE__ =              171;
+    public static final int __GO_MARK__ =                   172;
+    public static final int __GO_MARK_MODE__ =              173;
+    public static final int __GO_MARK_STYLE__ =             174;
+    public static final int __GO_MARK_SIZE_UNIT__ =         175;
+    public static final int __GO_MARK_SIZE__ =              176;
+