Merge remote-tracking branch 'refs/remotes/origin/master' into desktop 81/5181/1
Allan CORNET [Mon, 10 Oct 2011 06:56:02 +0000 (08:56 +0200)]
Conflicts:
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/EditorComponent.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/libjvm_Import.def
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/jni/BrowseVar.cpp
scilab/modules/ui_data/src/jni/BrowseVar.hxx

Change-Id: If49d095ac9a8767f1411830db1096be231aeb52c

42 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/etc/librarypath.xml
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/console/src/c/fileio_Import.def
scilab/modules/console/src/c/ui_data_Import.def
scilab/modules/console/src/java/org/scilab/modules/console/SciInputCommandView.java
scilab/modules/console/src/java/org/scilab/modules/console/SciOutputView.java
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowserViewer.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindAction.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/scinotes/src/jflex/scilab.jflex
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj
scilab/modules/ui_data/src/jni/BrowseVar.cpp
scilab/modules/ui_data/src/jni/BrowseVar.hxx
scilab/modules/ui_data/src/jni/FileBrowser.cpp
scilab/modules/ui_data/src/jni/FileBrowser.hxx
scilab/scilab-lib.properties.vc

@@@ -70,6 -136,32 +136,32 @@@ Xcos
  
  * bug 9590 fixed - xcos examples were not embeded in binary version on Windows.
  
+ * bug 9732 fixed - code generation failed on compilation on Windows with
+                    "unresolved external symbol dset_".
+ * bug 9750 fixed - Minor error in the help page of scicos_debug fixed.
+ * bug 9810 fixed - MATINV wrong simulation values errors has been improved.
+ * bug 9947 fixed - VARIABLE_DELAY block could not be dragged to a diagram.
+ * bug 9972 fixed - Error reporting with a wrong context produce an endless
+                    loop.
+ * bug 9988 fixed - CLKSOMV_f has a wrong interface function after loading from
+                    a file.
+ * bug 10003 fixed - The MAXMIN block did not update its display according to
+                     the settings.
 -* bug 10069 fixed - AFFICH_m block did not update its display at 
++* bug 10069 fixed - AFFICH_m block did not update its display at
+                     re-initialization.
+ Localization:
+ =============
+ * Czech localization by ZbynÄ›k Schwarz
  
  File input/output:
  ==================
@@@ -215,27 -381,40 +381,60 @@@ Compilation
    as a static library (only available in the source tree).
    This will avoid an important dependency tree for unitary testing.
  
+ * Under GNU/Linux and Mac OS X, for each module, get ride of the list of
+   the explicit dependencies on the other libraries. Use libscilab-cli.so or
+   libscilab.so to link against Scilab.
+ * Force the Java class version target to version 6 (or 1.6).
+ * Add Java 7 in the Debian & Ubuntu search path under GNU/Linux.
+ * bug 9409 fixed - warning "remark #8291" removed with Intel Fortran 2011 compiler.
+ * bug 9500 fixed - Explicit the GUI module manifest class-path to make Debian
+                    checking tool happy.
+ * bug 9782 fixed - configure with --without-gui was failing.
+ * bug 9793 fixed - --without-gui disables also Xcos.
+ * bug 9883 fixed - Build with --disable-build-help was failing.
+ * bug 9991 fixed - ./configure --without-xcos failed to build
+ Dynamic link:
+ =============
+ * bug 9432 fixed - link a 64 bit dynamic library on a 32 bit platform returned
+                    a wrong error message on Windows.
+ * bug 9761 fixed - "NDEBUG" was not defined for dynamic link (by default) in
+                    release mode on Windows.
+ * bug 9930 fixed - ilib_build did not display all filenames used.
  
 +Variable browser:
 +=================
 +
 +* Shows the dimension of the variable by default.
 +
 +* Automatically resize the variable browser table when docked.
 +
 +* A tooltip has been added on the type column to display the name of the type.
 +
 +* A tooltip has been added on the size column to display the size in Bytes
 +  (like in previous version of Scilab).
 +
 +
 +History:
 +========
 +
 +* Default text in history for a starting session has been changed for:
 +"Begin Session : Tue Jun 21 14:35:45 2011" to "21/05/2011 14:11:19"
 +
 +
  Graphics:
  =========
  
@@@ -275,8 -525,9 +545,11 @@@ Bug fixes
  
  * bug 7061 fixed - changelog.txt, readme.txt, version.xml removed from modules.
  
+ * bug 7249 fixed - 'string' function did not work with a macro as input argument
+                    as documented.
 +* bug 7333 fixed - In BrowseVar, variables could have a weird type number.
 +
  * bug 7358 fixed - Help pages of type and typeof have now links to the actual
                     description pages.
  
Simple merge
Simple merge
Simple merge
Simple merge
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../commons/includes;../../../api_scilab/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
++      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -120,14 -108,8 +121,15 @@@ lib /DEF:"$(ProjectDir)commons_f_Import
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../commons/includes;../../../api_scilab/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
++      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -159,13 -134,8 +161,14 @@@ lib /DEF:"$(ProjectDir)commons_f_Import
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
++      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -203,13 -165,8 +206,14 @@@ lib /DEF:"$(ProjectDir)commons_f_Import
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMMONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
++      <DisableSpecificWarnings>4251</DisableSpecificWarnings>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -236,14 -186,13 +240,16 @@@ lib /DEF:"$(ProjectDir)commons_f_Import
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
 +    <ClCompile Include="..\jni\CommonFileUtils_wrap.c" />
+     <ClCompile Include="..\jni\GiwsException.cpp" />
      <ClCompile Include="DllmainCommons.c" />
      <ClCompile Include="..\jni\ScilabCommons_wrap.c" />
 +    <ClCompile Include="fileutils.c" />
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="..\..\includes\dynlib_commons.h" />
 +    <ClInclude Include="..\..\includes\fileutils.h" />
+     <ClInclude Include="..\jni\GiwsException.hxx" />
    </ItemGroup>
    <ItemGroup>
      <None Include="commons_f_Import.def" />
        <Project>{dd8a0506-8d31-4cf8-856a-c10ece9c13a4}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      </ProjectReference>
+     <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
+       <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
+     </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
    </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
      <ClCompile Include="..\jni\ScilabCommons_wrap.c">
        <Filter>Source Files</Filter>
      </ClCompile>
 +    <ClCompile Include="fileutils.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\jni\CommonFileUtils_wrap.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
+     <ClCompile Include="..\jni\GiwsException.cpp">
+       <Filter>Source Files</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="..\..\includes\dynlib_commons.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 +    <ClInclude Include="..\..\includes\fileutils.h">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
+     <ClInclude Include="..\jni\GiwsException.hxx">
+       <Filter>Header Files</Filter>
+     </ClInclude>
    </ItemGroup>
    <ItemGroup>
      <None Include="commons_f_Import.def">
Simple merge
Simple merge
  /*--------------------------------------------------------------------------*/
  int C2F(sci_exit)(char *fname,unsigned long fname_len)
  {
 -      SciErr sciErr;
 -
 -      CheckLhs(1,1);
 -      CheckRhs(0,1);
 +    SciErr sciErr;
  
 -      if (Rhs == 0)
 -      {
 -              setExitCodeValue(0);
 -      }
 -      else
 -      {
 -              int iExit = 0;
 -              int m1 = 0, n1 = 0;
 -              int iType1 = 0;
 -              int *piAddressVarOne = NULL;
 -              double *pdVarOne = NULL;
 +    CheckLhs(1,1);
 +    CheckRhs(0,1);
  
 -              /* get Address of inputs */
 -              sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
 -              if(sciErr.iErr)
 -              {
 -                      printError(&sciErr, 0);
 -                      return 0;
 -              }
 +    if (Rhs == 0)
 +    {
 +        setExitCodeValue(0);
 +    }
 +    else
 +    {
 +        int iExit = 0;
 +        int m1 = 0, n1 = 0;
 +        int iType1 = 0;
 +        int *piAddressVarOne = NULL;
 +        double *pdVarOne = NULL;
  
 -              sciErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
 -              if(sciErr.iErr)
 -              {
 -                      printError(&sciErr, 0);
 -                      return 0;
 -              }
 +        /* get Address of inputs */
 +        sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
 +        if(sciErr.iErr)
 +        {
 +            printError(&sciErr, 0);
 +            return 0;
 +        }
  
 -              /* check input type */
 -              if ( iType1 != sci_matrix )
 -              {
 -                      Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname,1);
 -                      return 0;
 -              }
 +        sciErr = getVarType(pvApiCtx, piAddressVarOne, &iType1);
 +        if(sciErr.iErr)
 +        {
 +            printError(&sciErr, 0);
 +            return 0;
 +        }
  
 -              sciErr = getMatrixOfDouble(pvApiCtx, piAddressVarOne,&m1,&n1,&pdVarOne);
 -              if(sciErr.iErr)
 -              {
 -                      printError(&sciErr, 0);
 -                      return 0;
 -              }
 +        /* check input type */
 +        if ( iType1 != sci_matrix )
 +        {
 +            Scierror(999,_("%s: Wrong type for input argument #%d: A scalar expected.\n"),fname,1);
 +            return 0;
 +        }
  
 -              if( n1 != 1 || m1 != 1)
 -              {
 -                      Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname,1);
 -                      return 0;
 -              }
 +        sciErr = getMatrixOfDouble(pvApiCtx, piAddressVarOne,&m1,&n1,&pdVarOne);
 +        if(sciErr.iErr)
 +        {
 +            printError(&sciErr, 0);
 +            return 0;
 +        }
  
 -              iExit = (int) *pdVarOne;
 +        if( n1 != 1 || m1 != 1)
 +        {
 +            Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname,1);
 +            return 0;
 +        }
  
 -              if (*pdVarOne != (double)iExit)
 -              {
 -                      Scierror(999,_("%s: Wrong value for input argument #%d: An integer expected.\n"),fname,1);
 -                      return 0;
 -              }
 +        iExit = (int) *pdVarOne;
  
 -              setExitCodeValue(iExit);
 -      }
 +        if (*pdVarOne != (double)iExit)
 +        {
 +            Scierror(999,_("%s: Wrong value for input argument #%d: An integer expected.\n"),fname,1);
 +            return 0;
 +        }
  
 -      // this value do quit in scirun
 -      C2F(com).fun = -999;
 +        setExitCodeValue(iExit);
 +    }
  
 -      LhsVar(1) = 0; 
 -      PutLhsVar();
 +    if (getScilabMode() != SCILAB_NWNI)
 +    {
 +        if (canCloseMainScilabObject())
 +        {
 +            // this value do quit in scirun
 +            C2F(com).fun = -999;
 +        }
 +    }
 +    else
 +    {
 +        C2F(com).fun = -999;
 +    }
  
-     LhsVar(1) = 0;
-     C2F(putlhsvar)();
-     return 0;
 -      return 0;
++  LhsVar(1) = 0; 
++  PutLhsVar();
++   return 0;
  }
  /*--------------------------------------------------------------------------*/
@@@ -349,8 -300,8 +301,9 @@@ lib /DEF:"$(ProjectDir)Console_Import.d
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="includes\addfile.h" />
+     <ClInclude Include="includes\createtempfilename.h" />
      <ClInclude Include="includes\mgetl.h" />
 +    <ClInclude Include="includes\sendtorecyclebin.h" />
      <ClInclude Include="src\c\basename.h" />
      <ClInclude Include="includes\cluni0.h" />
      <ClInclude Include="src\c\copyfile.h" />
      <ClCompile Include="src\c\URIFileToFilename.c">
        <Filter>Source Files</Filter>
      </ClCompile>
 +    <ClCompile Include="src\c\sendtorecyclebin.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
+     <ClCompile Include="src\c\createtempfilename.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
+     <ClCompile Include="sci_gateway\c\sci_tempname.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="includes\addfile.h">
      <ClInclude Include="includes\mgetl.h">
        <Filter>Header Files</Filter>
      </ClInclude>
 +    <ClInclude Include="includes\sendtorecyclebin.h">
++      <Filter>Header Files</Filter>    
++    </ClInclude>
+     <ClInclude Include="includes\createtempfilename.h">
        <Filter>Header Files</Filter>
      </ClInclude>
    </ItemGroup>
Simple merge
Simple merge
Simple merge
@@@ -104,188 -104,190 +104,188 @@@ throw GiwsException::JniObjectCreationE
  curEnv->DeleteLocalRef(localInstance);
  
                  /* Methods ID set to NULL */
- jintnewWindowID=NULL; 
- jintnewMenuBarID=NULL; 
- jintnewMenuID=NULL; 
- jintnewPushButtonID=NULL; 
- jintnewEditBoxID=NULL; 
- jintnewLabelID=NULL; 
- jintnewCheckBoxID=NULL; 
- jintnewRadioButtonID=NULL; 
- jintnewSliderID=NULL; 
- jintnewPopupMenuID=NULL; 
- jintnewListBoxID=NULL; 
- jintnewFrameID=NULL; 
- jstringnewContextMenujobjectArray_ID=NULL; 
- jintnewContextMenuID=NULL; 
- voiddestroyWidgetjintID=NULL; 
- voiddestroyFramejintID=NULL; 
- jintnewWindowjintID=NULL; 
- voidsetFigureAsParentjintjintID=NULL; 
- voidsetMenuAsParentjintjintID=NULL; 
- voidsetRootAsParentjintID=NULL; 
- voidsetParentjintjintID=NULL; 
- voidsetPushButtonParentjintjintID=NULL; 
- voidremovePushButtonFromParentjintjintID=NULL; 
- voidsetEditBoxParentjintjintID=NULL; 
- voidremoveEditBoxFromParentjintjintID=NULL; 
- voidsetLabelParentjintjintID=NULL; 
- voidremoveLabelFromParentjintjintID=NULL; 
- voidsetCheckBoxParentjintjintID=NULL; 
- voidremoveCheckBoxFromParentjintjintID=NULL; 
- voidsetRadioButtonParentjintjintID=NULL; 
- voidremoveRadioButtonFromParentjintjintID=NULL; 
- voidsetSliderParentjintjintID=NULL; 
- voidremoveSliderFromParentjintjintID=NULL; 
- voidsetPopupMenuParentjintjintID=NULL; 
- voidremovePopupMenuFromParentjintjintID=NULL; 
- voidsetListBoxParentjintjintID=NULL; 
- voidremoveListBoxFromParentjintjintID=NULL; 
- voidsetFrameParentjintjintID=NULL; 
- voidremoveFrameFromParentjintjintID=NULL; 
- voidsetWidgetTextjintjstringID=NULL; 
- jstringgetWidgetTextjintID=NULL; 
- voidsetFrameTextjintjstringID=NULL; 
- jstringgetFrameTextjintID=NULL; 
- voidsetWidgetBackgroundColorjintjintjintjintID=NULL; 
- jintArray_getWidgetBackgroundColorjintID=NULL; 
- voidsetWidgetForegroundColorjintjintjintjintID=NULL; 
- jintArray_getWidgetForegroundColorjintID=NULL; 
- voidsetFrameBackgroundColorjintjintjintjintID=NULL; 
- jintArray_getFrameBackgroundColorjintID=NULL; 
- voidsetFrameForegroundColorjintjintjintjintID=NULL; 
- jintArray_getFrameForegroundColorjintID=NULL; 
- voidsetWidgetFontNamejintjstringID=NULL; 
- jstringgetWidgetFontNamejintID=NULL; 
- voidsetWidgetFontWeightjintjstringID=NULL; 
- voidsetWidgetFontSizejintjintID=NULL; 
- jintgetWidgetFontSizejintID=NULL; 
- voidsetWidgetFontAnglejintjstringID=NULL; 
- voidsetFrameFontNamejintjstringID=NULL; 
- jstringgetFrameFontNamejintID=NULL; 
- voidsetFrameFontWeightjintjstringID=NULL; 
- voidsetFrameFontSizejintjintID=NULL; 
- jintgetFrameFontSizejintID=NULL; 
- voidsetFrameFontAnglejintjstringID=NULL; 
- voidsetWidgetPositionjintjintjintjintjintID=NULL; 
- jintArray_getWidgetPositionjintID=NULL; 
- voidsetFramePositionjintjintjintjintjintID=NULL; 
- jintArray_getFramePositionjintID=NULL; 
- voidsetWidgetCallbackjintjstringjintID=NULL; 
- voidsetFrameCallbackjintjstringjintID=NULL; 
- voidsetWidgetHorizontalAlignmentjintjstringID=NULL; 
- voidsetWidgetVerticalAlignmentjintjstringID=NULL; 
- voidsetSliderMinorTickSpacingjintjintID=NULL; 
- voidsetSliderMajorTickSpacingjintjintID=NULL; 
- voidsetListBoxSelectedIndicesjintjintArray_ID=NULL; 
- jintArray_getListBoxSelectedIndicesjintID=NULL; 
- jintgetListBoxSelectionSizejintID=NULL; 
- voidsetPopupMenuSelectedIndexjintjintID=NULL; 
- jintgetPopupMenuSelectedIndexjintID=NULL; 
- voidsetSliderValuejintjintID=NULL; 
- jintgetSliderValuejintID=NULL; 
- voidsetRadioButtonCheckedjintjbooleanID=NULL; 
- jbooleanisRadioButtonCheckedjintID=NULL; 
- voidsetCheckBoxCheckedjintjbooleanID=NULL; 
- jbooleanisCheckBoxCheckedjintID=NULL; 
- voidsetSliderMinValuejintjintID=NULL; 
- voidsetSliderMaxValuejintjintID=NULL; 
- voidsetSliderVerticaljintID=NULL; 
- voidsetSliderHorizontaljintID=NULL; 
- voidsetListBoxMultipleSelectionEnabledjintjbooleanID=NULL; 
- jobjectArray_getListBoxAllItemsTextjintID=NULL; 
- jintgetListBoxNumberOfItemsjintID=NULL; 
- voidsetListBoxTextjintjobjectArray_ID=NULL; 
- voidsetListBoxListBoxTopjintjintID=NULL; 
- jintgetListBoxListBoxTopjintID=NULL; 
- jobjectArray_getPopupMenuAllItemsTextjintID=NULL; 
- jintgetPopupMenuNumberOfItemsjintID=NULL; 
- voidsetPopupMenuTextjintjobjectArray_ID=NULL; 
- voidsetWidgetReliefjintjstringID=NULL; 
- voidsetFrameReliefjintjstringID=NULL; 
- voidsetRootMenuEnabledjstringjbooleanID=NULL; 
- voidsetRootSubMenuEnabledjstringjintjbooleanID=NULL; 
- voidsetFigureMenuEnabledjintjstringjbooleanID=NULL; 
- voidsetFigureSubMenuEnabledjintjstringjintjbooleanID=NULL; 
- voidsetWidgetEnablejintjbooleanID=NULL; 
- voidsetFrameEnablejintjbooleanID=NULL; 
- jbooleanisWidgetEnablejintID=NULL; 
- jbooleanisFrameEnablejintID=NULL; 
- voidsetMenuCheckedjintjbooleanID=NULL; 
- jbooleanisMenuCheckedjintID=NULL; 
- voidremoveRootMenujstringID=NULL; 
- voidremoveFigureMenujintjstringID=NULL; 
- jstringdisplayAndWaitContextMenujintID=NULL; 
- jintnewMessageBoxID=NULL; 
- voidsetMessageBoxTitlejintjstringID=NULL; 
- voidsetMessageBoxMessagejintjstringID=NULL; 
- voidsetMessageBoxMessagejintjobjectArray_ID=NULL; 
- voidmessageBoxDisplayAndWaitjintID=NULL; 
- jintgetMessageBoxSelectedButtonjintID=NULL; 
- voidsetMessageBoxDefaultSelectedButtonsjintjintArray_ID=NULL; 
- jintArray_getMessageBoxUserSelectedButtonsjintID=NULL; 
- voidsetMessageBoxButtonsLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxInitialValuejintjobjectArray_ID=NULL; 
- jobjectArray_getMessageBoxValuejintID=NULL; 
- jintgetMessageBoxValueSizejintID=NULL; 
- voidsetMessageBoxListBoxItemsjintjobjectArray_ID=NULL; 
- jintgetMessageBoxSelectedItemjintID=NULL; 
- voidsetMessageBoxLineLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxColumnLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxDefaultInputjintjobjectArray_ID=NULL; 
- voidsetMessageBoxModaljintjbooleanID=NULL; 
- voidsetMessageBoxIconjintjstringID=NULL; 
- jbooleanisToolbarVisiblejintID=NULL; 
- voidsetToolbarVisiblejintjbooleanID=NULL; 
- voidsetEventHandlerjintjstringID=NULL; 
- voidsetEventHandlerEnabledjintjbooleanID=NULL; 
- jintnewWaitBarID=NULL; 
- voidsetWaitBarMessagejintjobjectArray_ID=NULL; 
- voidsetWaitBarValuejintjintID=NULL; 
- voiddestroyWaitBarjintID=NULL; 
- voidsetWaitBarIndeterminateModejintjbooleanID=NULL; 
- voidlaunchHelpBrowserjobjectArray_jstringID=NULL; 
- voidsearchKeywordjobjectArray_jstringjstringjbooleanID=NULL; 
- jintnewExportFileChooserjintID=NULL; 
- jintnewFontChooserID=NULL; 
- voidfontChooserDisplayAndWaitjintID=NULL; 
- voidsetFontChooserFontNamejintjstringID=NULL; 
- voidsetFontChooserFontSizejintjintID=NULL; 
- voidsetFontChooserBoldjintjbooleanID=NULL; 
- voidsetFontChooserItalicjintjbooleanID=NULL; 
- jstringgetFontChooserFontNamejintID=NULL; 
- jintgetFontChooserFontSizejintID=NULL; 
- jbooleangetFontChooserBoldjintID=NULL; 
- jbooleangetFontChooserItalicjintID=NULL; 
- jintnewColorChooserID=NULL; 
- voidcolorChooserDisplayAndWaitjintID=NULL; 
- voidsetColorChooserDefaultColorjintjintArray_ID=NULL; 
- jintArray_getColorChooserSelectedColorjintID=NULL; 
- voidsetColorChooserTitlejintjstringID=NULL; 
- voidsetWidgetVisiblejintjbooleanID=NULL; 
- voidsetFrameVisiblejintjbooleanID=NULL; 
- jbooleanisWidgetVisiblejintID=NULL; 
- jbooleanisFrameVisiblejintID=NULL; 
- jstringgetClipboardContentsID=NULL; 
- voidpasteClipboardIntoConsoleID=NULL; 
- voidcopyConsoleSelectionID=NULL; 
- voidemptyClipboardID=NULL; 
- voidsetClipboardContentsjstringID=NULL; 
- voidcopyFigureToClipBoardjintID=NULL; 
- jintgetScreenResolutionID=NULL; 
- jdoublegetScreenWidthID=NULL; 
- jdoublegetScreenHeightID=NULL; 
- jintgetScreenDepthID=NULL; 
- jbooleanprintFigurejintjbooleanjbooleanID=NULL; 
- jbooleanprintFilejstringID=NULL; 
- jbooleanprintStringjstringjstringID=NULL; 
- jbooleanpageSetupID=NULL; 
- voidrequestWidgetFocusjintID=NULL; 
- voidrequestFrameFocusjintID=NULL; 
- voidraiseWindowjintID=NULL; 
- voiduseCanvasForDisplayjbooleanID=NULL; 
- jbooleanuseCanvasForDisplayID=NULL; 
- voidscilabAboutBoxID=NULL; 
+ jintnewWindowID=NULL;
+ jintnewMenuBarID=NULL;
+ jintnewMenuID=NULL;
+ jintnewPushButtonID=NULL;
+ jintnewEditBoxID=NULL;
+ jintnewLabelID=NULL;
+ jintnewCheckBoxID=NULL;
+ jintnewRadioButtonID=NULL;
+ jintnewSliderID=NULL;
+ jintnewPopupMenuID=NULL;
+ jintnewListBoxID=NULL;
+ jintnewFrameID=NULL;
+ jstringnewContextMenujobjectArray_java_lang_StringID=NULL;
+ jintnewContextMenuID=NULL;
+ voiddestroyWidgetjintintID=NULL;
+ voiddestroyFramejintintID=NULL;
+ jintnewWindowjintintID=NULL;
+ voidsetFigureAsParentjintintjintintID=NULL;
+ voidsetMenuAsParentjintintjintintID=NULL;
+ voidsetRootAsParentjintintID=NULL;
+ voidsetParentjintintjintintID=NULL;
+ voidsetPushButtonParentjintintjintintID=NULL;
+ voidremovePushButtonFromParentjintintjintintID=NULL;
+ voidsetEditBoxParentjintintjintintID=NULL;
+ voidremoveEditBoxFromParentjintintjintintID=NULL;
+ voidsetLabelParentjintintjintintID=NULL;
+ voidremoveLabelFromParentjintintjintintID=NULL;
+ voidsetCheckBoxParentjintintjintintID=NULL;
+ voidremoveCheckBoxFromParentjintintjintintID=NULL;
+ voidsetRadioButtonParentjintintjintintID=NULL;
+ voidremoveRadioButtonFromParentjintintjintintID=NULL;
+ voidsetSliderParentjintintjintintID=NULL;
+ voidremoveSliderFromParentjintintjintintID=NULL;
+ voidsetPopupMenuParentjintintjintintID=NULL;
+ voidremovePopupMenuFromParentjintintjintintID=NULL;
+ voidsetListBoxParentjintintjintintID=NULL;
+ voidremoveListBoxFromParentjintintjintintID=NULL;
+ voidsetFrameParentjintintjintintID=NULL;
+ voidremoveFrameFromParentjintintjintintID=NULL;
+ voidsetWidgetTextjintintjstringjava_lang_StringID=NULL;
+ jstringgetWidgetTextjintintID=NULL;
+ voidsetFrameTextjintintjstringjava_lang_StringID=NULL;
+ jstringgetFrameTextjintintID=NULL;
+ voidsetWidgetBackgroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetBackgroundColorjintintID=NULL;
+ voidsetWidgetForegroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetForegroundColorjintintID=NULL;
+ voidsetFrameBackgroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getFrameBackgroundColorjintintID=NULL;
+ voidsetFrameForegroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getFrameForegroundColorjintintID=NULL;
+ voidsetWidgetFontNamejintintjstringjava_lang_StringID=NULL;
+ jstringgetWidgetFontNamejintintID=NULL;
+ voidsetWidgetFontWeightjintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetFontSizejintintjintintID=NULL;
+ jintgetWidgetFontSizejintintID=NULL;
+ voidsetWidgetFontAnglejintintjstringjava_lang_StringID=NULL;
+ voidsetFrameFontNamejintintjstringjava_lang_StringID=NULL;
+ jstringgetFrameFontNamejintintID=NULL;
+ voidsetFrameFontWeightjintintjstringjava_lang_StringID=NULL;
+ voidsetFrameFontSizejintintjintintID=NULL;
+ jintgetFrameFontSizejintintID=NULL;
+ voidsetFrameFontAnglejintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetPositionjintintjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetPositionjintintID=NULL;
+ voidsetFramePositionjintintjintintjintintjintintjintintID=NULL;
+ jintArray_getFramePositionjintintID=NULL;
+ voidsetWidgetCallbackjintintjstringjava_lang_StringjintintID=NULL;
+ voidsetFrameCallbackjintintjstringjava_lang_StringjintintID=NULL;
+ voidsetWidgetHorizontalAlignmentjintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetVerticalAlignmentjintintjstringjava_lang_StringID=NULL;
+ voidsetSliderMinorTickSpacingjintintjintintID=NULL;
+ voidsetSliderMajorTickSpacingjintintjintintID=NULL;
+ voidsetListBoxSelectedIndicesjintintjintArray_intID=NULL;
+ jintArray_getListBoxSelectedIndicesjintintID=NULL;
+ jintgetListBoxSelectionSizejintintID=NULL;
+ voidsetPopupMenuSelectedIndexjintintjintintID=NULL;
+ jintgetPopupMenuSelectedIndexjintintID=NULL;
+ voidsetSliderValuejintintjintintID=NULL;
+ jintgetSliderValuejintintID=NULL;
+ voidsetRadioButtonCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisRadioButtonCheckedjintintID=NULL;
+ voidsetCheckBoxCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisCheckBoxCheckedjintintID=NULL;
+ voidsetSliderMinValuejintintjintintID=NULL;
+ voidsetSliderMaxValuejintintjintintID=NULL;
+ voidsetSliderVerticaljintintID=NULL;
+ voidsetSliderHorizontaljintintID=NULL;
+ voidsetListBoxMultipleSelectionEnabledjintintjbooleanbooleanID=NULL;
+ jobjectArray_getListBoxAllItemsTextjintintID=NULL;
+ jintgetListBoxNumberOfItemsjintintID=NULL;
+ voidsetListBoxTextjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetListBoxListBoxTopjintintjintintID=NULL;
+ jintgetListBoxListBoxTopjintintID=NULL;
+ jobjectArray_getPopupMenuAllItemsTextjintintID=NULL;
+ jintgetPopupMenuNumberOfItemsjintintID=NULL;
+ voidsetPopupMenuTextjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetWidgetReliefjintintjstringjava_lang_StringID=NULL;
+ voidsetFrameReliefjintintjstringjava_lang_StringID=NULL;
+ voidsetRootMenuEnabledjstringjava_lang_StringjbooleanbooleanID=NULL;
+ voidsetRootSubMenuEnabledjstringjava_lang_StringjintintjbooleanbooleanID=NULL;
+ voidsetFigureMenuEnabledjintintjstringjava_lang_StringjbooleanbooleanID=NULL;
+ voidsetFigureSubMenuEnabledjintintjstringjava_lang_StringjintintjbooleanbooleanID=NULL;
+ voidsetWidgetEnablejintintjbooleanbooleanID=NULL;
+ voidsetFrameEnablejintintjbooleanbooleanID=NULL;
+ jbooleanisWidgetEnablejintintID=NULL;
+ jbooleanisFrameEnablejintintID=NULL;
+ voidsetMenuCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisMenuCheckedjintintID=NULL;
+ voidremoveRootMenujstringjava_lang_StringID=NULL;
+ voidremoveFigureMenujintintjstringjava_lang_StringID=NULL;
+ jstringdisplayAndWaitContextMenujintintID=NULL;
+ jintnewMessageBoxID=NULL;
+ voidsetMessageBoxTitlejintintjstringjava_lang_StringID=NULL;
+ voidsetMessageBoxMessagejintintjstringjava_lang_StringID=NULL;
+ voidsetMessageBoxMessagejintintjobjectArray_java_lang_StringID=NULL;
+ voidmessageBoxDisplayAndWaitjintintID=NULL;
+ jintgetMessageBoxSelectedButtonjintintID=NULL;
+ voidsetMessageBoxDefaultSelectedButtonsjintintjintArray_intID=NULL;
+ jintArray_getMessageBoxUserSelectedButtonsjintintID=NULL;
+ voidsetMessageBoxButtonsLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxInitialValuejintintjobjectArray_java_lang_StringID=NULL;
+ jobjectArray_getMessageBoxValuejintintID=NULL;
+ jintgetMessageBoxValueSizejintintID=NULL;
+ voidsetMessageBoxListBoxItemsjintintjobjectArray_java_lang_StringID=NULL;
+ jintgetMessageBoxSelectedItemjintintID=NULL;
+ voidsetMessageBoxLineLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxColumnLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxDefaultInputjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxModaljintintjbooleanbooleanID=NULL;
+ voidsetMessageBoxIconjintintjstringjava_lang_StringID=NULL;
+ jbooleanisToolbarVisiblejintintID=NULL;
+ voidsetToolbarVisiblejintintjbooleanbooleanID=NULL;
+ voidsetEventHandlerjintintjstringjava_lang_StringID=NULL;
+ voidsetEventHandlerEnabledjintintjbooleanbooleanID=NULL;
+ jintnewWaitBarID=NULL;
+ voidsetWaitBarMessagejintintjobjectArray_java_lang_StringID=NULL;
+ voidsetWaitBarValuejintintjintintID=NULL;
+ voiddestroyWaitBarjintintID=NULL;
+ voidsetWaitBarIndeterminateModejintintjbooleanbooleanID=NULL;
+ voidlaunchHelpBrowserjobjectArray_java_lang_Stringjstringjava_lang_StringID=NULL;
+ voidsearchKeywordjobjectArray_java_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
 -voidsaveMainWindowSettingsID=NULL;
 -voidsaveHelpWindowSettingsID=NULL;
+ jintnewExportFileChooserjintintID=NULL;
+ jintnewFontChooserID=NULL;
+ voidfontChooserDisplayAndWaitjintintID=NULL;
+ voidsetFontChooserFontNamejintintjstringjava_lang_StringID=NULL;
+ voidsetFontChooserFontSizejintintjintintID=NULL;
+ voidsetFontChooserBoldjintintjbooleanbooleanID=NULL;
+ voidsetFontChooserItalicjintintjbooleanbooleanID=NULL;
+ jstringgetFontChooserFontNamejintintID=NULL;
+ jintgetFontChooserFontSizejintintID=NULL;
+ jbooleangetFontChooserBoldjintintID=NULL;
+ jbooleangetFontChooserItalicjintintID=NULL;
+ jintnewColorChooserID=NULL;
+ voidcolorChooserDisplayAndWaitjintintID=NULL;
+ voidsetColorChooserDefaultColorjintintjintArray_intID=NULL;
+ jintArray_getColorChooserSelectedColorjintintID=NULL;
+ voidsetColorChooserTitlejintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetVisiblejintintjbooleanbooleanID=NULL;
+ voidsetFrameVisiblejintintjbooleanbooleanID=NULL;
+ jbooleanisWidgetVisiblejintintID=NULL;
+ jbooleanisFrameVisiblejintintID=NULL;
+ jstringgetClipboardContentsID=NULL;
+ voidpasteClipboardIntoConsoleID=NULL;
+ voidcopyConsoleSelectionID=NULL;
+ voidemptyClipboardID=NULL;
+ voidsetClipboardContentsjstringjava_lang_StringID=NULL;
+ voidcopyFigureToClipBoardjintintID=NULL;
+ jintgetScreenResolutionID=NULL;
+ jdoublegetScreenWidthID=NULL;
+ jdoublegetScreenHeightID=NULL;
+ jintgetScreenDepthID=NULL;
+ jbooleanprintFigurejintintjbooleanbooleanjbooleanbooleanID=NULL;
+ jbooleanprintFilejstringjava_lang_StringID=NULL;
+ jbooleanprintStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
+ jbooleanpageSetupID=NULL;
+ voidrequestWidgetFocusjintintID=NULL;
+ voidrequestFrameFocusjintintID=NULL;
+ voidraiseWindowjintintID=NULL;
+ voiduseCanvasForDisplayjbooleanbooleanID=NULL;
+ jbooleanuseCanvasForDisplayID=NULL;
+ voidscilabAboutBoxID=NULL;
  
  
  }
@@@ -308,188 -310,190 +308,188 @@@ throw GiwsException::JniObjectCreationE
  throw GiwsException::JniObjectCreationException(curEnv, this->className());
          }
          /* Methods ID set to NULL */
-         jintnewWindowID=NULL; 
- jintnewMenuBarID=NULL; 
- jintnewMenuID=NULL; 
- jintnewPushButtonID=NULL; 
- jintnewEditBoxID=NULL; 
- jintnewLabelID=NULL; 
- jintnewCheckBoxID=NULL; 
- jintnewRadioButtonID=NULL; 
- jintnewSliderID=NULL; 
- jintnewPopupMenuID=NULL; 
- jintnewListBoxID=NULL; 
- jintnewFrameID=NULL; 
- jstringnewContextMenujobjectArray_ID=NULL; 
- jintnewContextMenuID=NULL; 
- voiddestroyWidgetjintID=NULL; 
- voiddestroyFramejintID=NULL; 
- jintnewWindowjintID=NULL; 
- voidsetFigureAsParentjintjintID=NULL; 
- voidsetMenuAsParentjintjintID=NULL; 
- voidsetRootAsParentjintID=NULL; 
- voidsetParentjintjintID=NULL; 
- voidsetPushButtonParentjintjintID=NULL; 
- voidremovePushButtonFromParentjintjintID=NULL; 
- voidsetEditBoxParentjintjintID=NULL; 
- voidremoveEditBoxFromParentjintjintID=NULL; 
- voidsetLabelParentjintjintID=NULL; 
- voidremoveLabelFromParentjintjintID=NULL; 
- voidsetCheckBoxParentjintjintID=NULL; 
- voidremoveCheckBoxFromParentjintjintID=NULL; 
- voidsetRadioButtonParentjintjintID=NULL; 
- voidremoveRadioButtonFromParentjintjintID=NULL; 
- voidsetSliderParentjintjintID=NULL; 
- voidremoveSliderFromParentjintjintID=NULL; 
- voidsetPopupMenuParentjintjintID=NULL; 
- voidremovePopupMenuFromParentjintjintID=NULL; 
- voidsetListBoxParentjintjintID=NULL; 
- voidremoveListBoxFromParentjintjintID=NULL; 
- voidsetFrameParentjintjintID=NULL; 
- voidremoveFrameFromParentjintjintID=NULL; 
- voidsetWidgetTextjintjstringID=NULL; 
- jstringgetWidgetTextjintID=NULL; 
- voidsetFrameTextjintjstringID=NULL; 
- jstringgetFrameTextjintID=NULL; 
- voidsetWidgetBackgroundColorjintjintjintjintID=NULL; 
- jintArray_getWidgetBackgroundColorjintID=NULL; 
- voidsetWidgetForegroundColorjintjintjintjintID=NULL; 
- jintArray_getWidgetForegroundColorjintID=NULL; 
- voidsetFrameBackgroundColorjintjintjintjintID=NULL; 
- jintArray_getFrameBackgroundColorjintID=NULL; 
- voidsetFrameForegroundColorjintjintjintjintID=NULL; 
- jintArray_getFrameForegroundColorjintID=NULL; 
- voidsetWidgetFontNamejintjstringID=NULL; 
- jstringgetWidgetFontNamejintID=NULL; 
- voidsetWidgetFontWeightjintjstringID=NULL; 
- voidsetWidgetFontSizejintjintID=NULL; 
- jintgetWidgetFontSizejintID=NULL; 
- voidsetWidgetFontAnglejintjstringID=NULL; 
- voidsetFrameFontNamejintjstringID=NULL; 
- jstringgetFrameFontNamejintID=NULL; 
- voidsetFrameFontWeightjintjstringID=NULL; 
- voidsetFrameFontSizejintjintID=NULL; 
- jintgetFrameFontSizejintID=NULL; 
- voidsetFrameFontAnglejintjstringID=NULL; 
- voidsetWidgetPositionjintjintjintjintjintID=NULL; 
- jintArray_getWidgetPositionjintID=NULL; 
- voidsetFramePositionjintjintjintjintjintID=NULL; 
- jintArray_getFramePositionjintID=NULL; 
- voidsetWidgetCallbackjintjstringjintID=NULL; 
- voidsetFrameCallbackjintjstringjintID=NULL; 
- voidsetWidgetHorizontalAlignmentjintjstringID=NULL; 
- voidsetWidgetVerticalAlignmentjintjstringID=NULL; 
- voidsetSliderMinorTickSpacingjintjintID=NULL; 
- voidsetSliderMajorTickSpacingjintjintID=NULL; 
- voidsetListBoxSelectedIndicesjintjintArray_ID=NULL; 
- jintArray_getListBoxSelectedIndicesjintID=NULL; 
- jintgetListBoxSelectionSizejintID=NULL; 
- voidsetPopupMenuSelectedIndexjintjintID=NULL; 
- jintgetPopupMenuSelectedIndexjintID=NULL; 
- voidsetSliderValuejintjintID=NULL; 
- jintgetSliderValuejintID=NULL; 
- voidsetRadioButtonCheckedjintjbooleanID=NULL; 
- jbooleanisRadioButtonCheckedjintID=NULL; 
- voidsetCheckBoxCheckedjintjbooleanID=NULL; 
- jbooleanisCheckBoxCheckedjintID=NULL; 
- voidsetSliderMinValuejintjintID=NULL; 
- voidsetSliderMaxValuejintjintID=NULL; 
- voidsetSliderVerticaljintID=NULL; 
- voidsetSliderHorizontaljintID=NULL; 
- voidsetListBoxMultipleSelectionEnabledjintjbooleanID=NULL; 
- jobjectArray_getListBoxAllItemsTextjintID=NULL; 
- jintgetListBoxNumberOfItemsjintID=NULL; 
- voidsetListBoxTextjintjobjectArray_ID=NULL; 
- voidsetListBoxListBoxTopjintjintID=NULL; 
- jintgetListBoxListBoxTopjintID=NULL; 
- jobjectArray_getPopupMenuAllItemsTextjintID=NULL; 
- jintgetPopupMenuNumberOfItemsjintID=NULL; 
- voidsetPopupMenuTextjintjobjectArray_ID=NULL; 
- voidsetWidgetReliefjintjstringID=NULL; 
- voidsetFrameReliefjintjstringID=NULL; 
- voidsetRootMenuEnabledjstringjbooleanID=NULL; 
- voidsetRootSubMenuEnabledjstringjintjbooleanID=NULL; 
- voidsetFigureMenuEnabledjintjstringjbooleanID=NULL; 
- voidsetFigureSubMenuEnabledjintjstringjintjbooleanID=NULL; 
- voidsetWidgetEnablejintjbooleanID=NULL; 
- voidsetFrameEnablejintjbooleanID=NULL; 
- jbooleanisWidgetEnablejintID=NULL; 
- jbooleanisFrameEnablejintID=NULL; 
- voidsetMenuCheckedjintjbooleanID=NULL; 
- jbooleanisMenuCheckedjintID=NULL; 
- voidremoveRootMenujstringID=NULL; 
- voidremoveFigureMenujintjstringID=NULL; 
- jstringdisplayAndWaitContextMenujintID=NULL; 
- jintnewMessageBoxID=NULL; 
- voidsetMessageBoxTitlejintjstringID=NULL; 
- voidsetMessageBoxMessagejintjstringID=NULL; 
- voidsetMessageBoxMessagejintjobjectArray_ID=NULL; 
- voidmessageBoxDisplayAndWaitjintID=NULL; 
- jintgetMessageBoxSelectedButtonjintID=NULL; 
- voidsetMessageBoxDefaultSelectedButtonsjintjintArray_ID=NULL; 
- jintArray_getMessageBoxUserSelectedButtonsjintID=NULL; 
- voidsetMessageBoxButtonsLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxInitialValuejintjobjectArray_ID=NULL; 
- jobjectArray_getMessageBoxValuejintID=NULL; 
- jintgetMessageBoxValueSizejintID=NULL; 
- voidsetMessageBoxListBoxItemsjintjobjectArray_ID=NULL; 
- jintgetMessageBoxSelectedItemjintID=NULL; 
- voidsetMessageBoxLineLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxColumnLabelsjintjobjectArray_ID=NULL; 
- voidsetMessageBoxDefaultInputjintjobjectArray_ID=NULL; 
- voidsetMessageBoxModaljintjbooleanID=NULL; 
- voidsetMessageBoxIconjintjstringID=NULL; 
- jbooleanisToolbarVisiblejintID=NULL; 
- voidsetToolbarVisiblejintjbooleanID=NULL; 
- voidsetEventHandlerjintjstringID=NULL; 
- voidsetEventHandlerEnabledjintjbooleanID=NULL; 
- jintnewWaitBarID=NULL; 
- voidsetWaitBarMessagejintjobjectArray_ID=NULL; 
- voidsetWaitBarValuejintjintID=NULL; 
- voiddestroyWaitBarjintID=NULL; 
- voidsetWaitBarIndeterminateModejintjbooleanID=NULL; 
- voidlaunchHelpBrowserjobjectArray_jstringID=NULL; 
- voidsearchKeywordjobjectArray_jstringjstringjbooleanID=NULL; 
- jintnewExportFileChooserjintID=NULL; 
- jintnewFontChooserID=NULL; 
- voidfontChooserDisplayAndWaitjintID=NULL; 
- voidsetFontChooserFontNamejintjstringID=NULL; 
- voidsetFontChooserFontSizejintjintID=NULL; 
- voidsetFontChooserBoldjintjbooleanID=NULL; 
- voidsetFontChooserItalicjintjbooleanID=NULL; 
- jstringgetFontChooserFontNamejintID=NULL; 
- jintgetFontChooserFontSizejintID=NULL; 
- jbooleangetFontChooserBoldjintID=NULL; 
- jbooleangetFontChooserItalicjintID=NULL; 
- jintnewColorChooserID=NULL; 
- voidcolorChooserDisplayAndWaitjintID=NULL; 
- voidsetColorChooserDefaultColorjintjintArray_ID=NULL; 
- jintArray_getColorChooserSelectedColorjintID=NULL; 
- voidsetColorChooserTitlejintjstringID=NULL; 
- voidsetWidgetVisiblejintjbooleanID=NULL; 
- voidsetFrameVisiblejintjbooleanID=NULL; 
- jbooleanisWidgetVisiblejintID=NULL; 
- jbooleanisFrameVisiblejintID=NULL; 
- jstringgetClipboardContentsID=NULL; 
- voidpasteClipboardIntoConsoleID=NULL; 
- voidcopyConsoleSelectionID=NULL; 
- voidemptyClipboardID=NULL; 
- voidsetClipboardContentsjstringID=NULL; 
- voidcopyFigureToClipBoardjintID=NULL; 
- jintgetScreenResolutionID=NULL; 
- jdoublegetScreenWidthID=NULL; 
- jdoublegetScreenHeightID=NULL; 
- jintgetScreenDepthID=NULL; 
- jbooleanprintFigurejintjbooleanjbooleanID=NULL; 
- jbooleanprintFilejstringID=NULL; 
- jbooleanprintStringjstringjstringID=NULL; 
- jbooleanpageSetupID=NULL; 
- voidrequestWidgetFocusjintID=NULL; 
- voidrequestFrameFocusjintID=NULL; 
- voidraiseWindowjintID=NULL; 
- voiduseCanvasForDisplayjbooleanID=NULL; 
- jbooleanuseCanvasForDisplayID=NULL; 
- voidscilabAboutBoxID=NULL; 
+         jintnewWindowID=NULL;
+ jintnewMenuBarID=NULL;
+ jintnewMenuID=NULL;
+ jintnewPushButtonID=NULL;
+ jintnewEditBoxID=NULL;
+ jintnewLabelID=NULL;
+ jintnewCheckBoxID=NULL;
+ jintnewRadioButtonID=NULL;
+ jintnewSliderID=NULL;
+ jintnewPopupMenuID=NULL;
+ jintnewListBoxID=NULL;
+ jintnewFrameID=NULL;
+ jstringnewContextMenujobjectArray_java_lang_StringID=NULL;
+ jintnewContextMenuID=NULL;
+ voiddestroyWidgetjintintID=NULL;
+ voiddestroyFramejintintID=NULL;
+ jintnewWindowjintintID=NULL;
+ voidsetFigureAsParentjintintjintintID=NULL;
+ voidsetMenuAsParentjintintjintintID=NULL;
+ voidsetRootAsParentjintintID=NULL;
+ voidsetParentjintintjintintID=NULL;
+ voidsetPushButtonParentjintintjintintID=NULL;
+ voidremovePushButtonFromParentjintintjintintID=NULL;
+ voidsetEditBoxParentjintintjintintID=NULL;
+ voidremoveEditBoxFromParentjintintjintintID=NULL;
+ voidsetLabelParentjintintjintintID=NULL;
+ voidremoveLabelFromParentjintintjintintID=NULL;
+ voidsetCheckBoxParentjintintjintintID=NULL;
+ voidremoveCheckBoxFromParentjintintjintintID=NULL;
+ voidsetRadioButtonParentjintintjintintID=NULL;
+ voidremoveRadioButtonFromParentjintintjintintID=NULL;
+ voidsetSliderParentjintintjintintID=NULL;
+ voidremoveSliderFromParentjintintjintintID=NULL;
+ voidsetPopupMenuParentjintintjintintID=NULL;
+ voidremovePopupMenuFromParentjintintjintintID=NULL;
+ voidsetListBoxParentjintintjintintID=NULL;
+ voidremoveListBoxFromParentjintintjintintID=NULL;
+ voidsetFrameParentjintintjintintID=NULL;
+ voidremoveFrameFromParentjintintjintintID=NULL;
+ voidsetWidgetTextjintintjstringjava_lang_StringID=NULL;
+ jstringgetWidgetTextjintintID=NULL;
+ voidsetFrameTextjintintjstringjava_lang_StringID=NULL;
+ jstringgetFrameTextjintintID=NULL;
+ voidsetWidgetBackgroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetBackgroundColorjintintID=NULL;
+ voidsetWidgetForegroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetForegroundColorjintintID=NULL;
+ voidsetFrameBackgroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getFrameBackgroundColorjintintID=NULL;
+ voidsetFrameForegroundColorjintintjintintjintintjintintID=NULL;
+ jintArray_getFrameForegroundColorjintintID=NULL;
+ voidsetWidgetFontNamejintintjstringjava_lang_StringID=NULL;
+ jstringgetWidgetFontNamejintintID=NULL;
+ voidsetWidgetFontWeightjintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetFontSizejintintjintintID=NULL;
+ jintgetWidgetFontSizejintintID=NULL;
+ voidsetWidgetFontAnglejintintjstringjava_lang_StringID=NULL;
+ voidsetFrameFontNamejintintjstringjava_lang_StringID=NULL;
+ jstringgetFrameFontNamejintintID=NULL;
+ voidsetFrameFontWeightjintintjstringjava_lang_StringID=NULL;
+ voidsetFrameFontSizejintintjintintID=NULL;
+ jintgetFrameFontSizejintintID=NULL;
+ voidsetFrameFontAnglejintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetPositionjintintjintintjintintjintintjintintID=NULL;
+ jintArray_getWidgetPositionjintintID=NULL;
+ voidsetFramePositionjintintjintintjintintjintintjintintID=NULL;
+ jintArray_getFramePositionjintintID=NULL;
+ voidsetWidgetCallbackjintintjstringjava_lang_StringjintintID=NULL;
+ voidsetFrameCallbackjintintjstringjava_lang_StringjintintID=NULL;
+ voidsetWidgetHorizontalAlignmentjintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetVerticalAlignmentjintintjstringjava_lang_StringID=NULL;
+ voidsetSliderMinorTickSpacingjintintjintintID=NULL;
+ voidsetSliderMajorTickSpacingjintintjintintID=NULL;
+ voidsetListBoxSelectedIndicesjintintjintArray_intID=NULL;
+ jintArray_getListBoxSelectedIndicesjintintID=NULL;
+ jintgetListBoxSelectionSizejintintID=NULL;
+ voidsetPopupMenuSelectedIndexjintintjintintID=NULL;
+ jintgetPopupMenuSelectedIndexjintintID=NULL;
+ voidsetSliderValuejintintjintintID=NULL;
+ jintgetSliderValuejintintID=NULL;
+ voidsetRadioButtonCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisRadioButtonCheckedjintintID=NULL;
+ voidsetCheckBoxCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisCheckBoxCheckedjintintID=NULL;
+ voidsetSliderMinValuejintintjintintID=NULL;
+ voidsetSliderMaxValuejintintjintintID=NULL;
+ voidsetSliderVerticaljintintID=NULL;
+ voidsetSliderHorizontaljintintID=NULL;
+ voidsetListBoxMultipleSelectionEnabledjintintjbooleanbooleanID=NULL;
+ jobjectArray_getListBoxAllItemsTextjintintID=NULL;
+ jintgetListBoxNumberOfItemsjintintID=NULL;
+ voidsetListBoxTextjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetListBoxListBoxTopjintintjintintID=NULL;
+ jintgetListBoxListBoxTopjintintID=NULL;
+ jobjectArray_getPopupMenuAllItemsTextjintintID=NULL;
+ jintgetPopupMenuNumberOfItemsjintintID=NULL;
+ voidsetPopupMenuTextjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetWidgetReliefjintintjstringjava_lang_StringID=NULL;
+ voidsetFrameReliefjintintjstringjava_lang_StringID=NULL;
+ voidsetRootMenuEnabledjstringjava_lang_StringjbooleanbooleanID=NULL;
+ voidsetRootSubMenuEnabledjstringjava_lang_StringjintintjbooleanbooleanID=NULL;
+ voidsetFigureMenuEnabledjintintjstringjava_lang_StringjbooleanbooleanID=NULL;
+ voidsetFigureSubMenuEnabledjintintjstringjava_lang_StringjintintjbooleanbooleanID=NULL;
+ voidsetWidgetEnablejintintjbooleanbooleanID=NULL;
+ voidsetFrameEnablejintintjbooleanbooleanID=NULL;
+ jbooleanisWidgetEnablejintintID=NULL;
+ jbooleanisFrameEnablejintintID=NULL;
+ voidsetMenuCheckedjintintjbooleanbooleanID=NULL;
+ jbooleanisMenuCheckedjintintID=NULL;
+ voidremoveRootMenujstringjava_lang_StringID=NULL;
+ voidremoveFigureMenujintintjstringjava_lang_StringID=NULL;
+ jstringdisplayAndWaitContextMenujintintID=NULL;
+ jintnewMessageBoxID=NULL;
+ voidsetMessageBoxTitlejintintjstringjava_lang_StringID=NULL;
+ voidsetMessageBoxMessagejintintjstringjava_lang_StringID=NULL;
+ voidsetMessageBoxMessagejintintjobjectArray_java_lang_StringID=NULL;
+ voidmessageBoxDisplayAndWaitjintintID=NULL;
+ jintgetMessageBoxSelectedButtonjintintID=NULL;
+ voidsetMessageBoxDefaultSelectedButtonsjintintjintArray_intID=NULL;
+ jintArray_getMessageBoxUserSelectedButtonsjintintID=NULL;
+ voidsetMessageBoxButtonsLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxInitialValuejintintjobjectArray_java_lang_StringID=NULL;
+ jobjectArray_getMessageBoxValuejintintID=NULL;
+ jintgetMessageBoxValueSizejintintID=NULL;
+ voidsetMessageBoxListBoxItemsjintintjobjectArray_java_lang_StringID=NULL;
+ jintgetMessageBoxSelectedItemjintintID=NULL;
+ voidsetMessageBoxLineLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxColumnLabelsjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxDefaultInputjintintjobjectArray_java_lang_StringID=NULL;
+ voidsetMessageBoxModaljintintjbooleanbooleanID=NULL;
+ voidsetMessageBoxIconjintintjstringjava_lang_StringID=NULL;
+ jbooleanisToolbarVisiblejintintID=NULL;
+ voidsetToolbarVisiblejintintjbooleanbooleanID=NULL;
+ voidsetEventHandlerjintintjstringjava_lang_StringID=NULL;
+ voidsetEventHandlerEnabledjintintjbooleanbooleanID=NULL;
+ jintnewWaitBarID=NULL;
+ voidsetWaitBarMessagejintintjobjectArray_java_lang_StringID=NULL;
+ voidsetWaitBarValuejintintjintintID=NULL;
+ voiddestroyWaitBarjintintID=NULL;
+ voidsetWaitBarIndeterminateModejintintjbooleanbooleanID=NULL;
+ voidlaunchHelpBrowserjobjectArray_java_lang_Stringjstringjava_lang_StringID=NULL;
+ voidsearchKeywordjobjectArray_java_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
 -voidsaveMainWindowSettingsID=NULL;
 -voidsaveHelpWindowSettingsID=NULL;
+ jintnewExportFileChooserjintintID=NULL;
+ jintnewFontChooserID=NULL;
+ voidfontChooserDisplayAndWaitjintintID=NULL;
+ voidsetFontChooserFontNamejintintjstringjava_lang_StringID=NULL;
+ voidsetFontChooserFontSizejintintjintintID=NULL;
+ voidsetFontChooserBoldjintintjbooleanbooleanID=NULL;
+ voidsetFontChooserItalicjintintjbooleanbooleanID=NULL;
+ jstringgetFontChooserFontNamejintintID=NULL;
+ jintgetFontChooserFontSizejintintID=NULL;
+ jbooleangetFontChooserBoldjintintID=NULL;
+ jbooleangetFontChooserItalicjintintID=NULL;
+ jintnewColorChooserID=NULL;
+ voidcolorChooserDisplayAndWaitjintintID=NULL;
+ voidsetColorChooserDefaultColorjintintjintArray_intID=NULL;
+ jintArray_getColorChooserSelectedColorjintintID=NULL;
+ voidsetColorChooserTitlejintintjstringjava_lang_StringID=NULL;
+ voidsetWidgetVisiblejintintjbooleanbooleanID=NULL;
+ voidsetFrameVisiblejintintjbooleanbooleanID=NULL;
+ jbooleanisWidgetVisiblejintintID=NULL;
+ jbooleanisFrameVisiblejintintID=NULL;
+ jstringgetClipboardContentsID=NULL;
+ voidpasteClipboardIntoConsoleID=NULL;
+ voidcopyConsoleSelectionID=NULL;
+ voidemptyClipboardID=NULL;
+ voidsetClipboardContentsjstringjava_lang_StringID=NULL;
+ voidcopyFigureToClipBoardjintintID=NULL;
+ jintgetScreenResolutionID=NULL;
+ jdoublegetScreenWidthID=NULL;
+ jdoublegetScreenHeightID=NULL;
+ jintgetScreenDepthID=NULL;
+ jbooleanprintFigurejintintjbooleanbooleanjbooleanbooleanID=NULL;
+ jbooleanprintFilejstringjava_lang_StringID=NULL;
+ jbooleanprintStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
+ jbooleanpageSetupID=NULL;
+ voidrequestWidgetFocusjintintID=NULL;
+ voidrequestFrameFocusjintintID=NULL;
+ voidraiseWindowjintintID=NULL;
+ voiduseCanvasForDisplayjbooleanbooleanID=NULL;
+ jbooleanuseCanvasForDisplayID=NULL;
+ voidscilabAboutBoxID=NULL;
  
  
  }
@@@ -76,157 -89,159 +89,157 @@@ jmethodID jintnewSliderID; // cache met
  jmethodID jintnewPopupMenuID; // cache method id
  jmethodID jintnewListBoxID; // cache method id
  jmethodID jintnewFrameID; // cache method id
- jmethodID jstringnewContextMenujobjectArray_ID; // cache method id
+ jmethodID jstringnewContextMenujobjectArray_java_lang_StringID; // cache method id
  jclass stringArrayClass;
  jmethodID jintnewContextMenuID; // cache method id
- jmethodID voiddestroyWidgetjintID; // cache method id
- jmethodID voiddestroyFramejintID; // cache method id
- jmethodID jintnewWindowjintID; // cache method id
- jmethodID voidsetFigureAsParentjintjintID; // cache method id
- jmethodID voidsetMenuAsParentjintjintID; // cache method id
- jmethodID voidsetRootAsParentjintID; // cache method id
- jmethodID voidsetParentjintjintID; // cache method id
- jmethodID voidsetPushButtonParentjintjintID; // cache method id
- jmethodID voidremovePushButtonFromParentjintjintID; // cache method id
- jmethodID voidsetEditBoxParentjintjintID; // cache method id
- jmethodID voidremoveEditBoxFromParentjintjintID; // cache method id
- jmethodID voidsetLabelParentjintjintID; // cache method id
- jmethodID voidremoveLabelFromParentjintjintID; // cache method id
- jmethodID voidsetCheckBoxParentjintjintID; // cache method id
- jmethodID voidremoveCheckBoxFromParentjintjintID; // cache method id
- jmethodID voidsetRadioButtonParentjintjintID; // cache method id
- jmethodID voidremoveRadioButtonFromParentjintjintID; // cache method id
- jmethodID voidsetSliderParentjintjintID; // cache method id
- jmethodID voidremoveSliderFromParentjintjintID; // cache method id
- jmethodID voidsetPopupMenuParentjintjintID; // cache method id
- jmethodID voidremovePopupMenuFromParentjintjintID; // cache method id
- jmethodID voidsetListBoxParentjintjintID; // cache method id
- jmethodID voidremoveListBoxFromParentjintjintID; // cache method id
- jmethodID voidsetFrameParentjintjintID; // cache method id
- jmethodID voidremoveFrameFromParentjintjintID; // cache method id
- jmethodID voidsetWidgetTextjintjstringID; // cache method id
- jmethodID jstringgetWidgetTextjintID; // cache method id
- jmethodID voidsetFrameTextjintjstringID; // cache method id
- jmethodID jstringgetFrameTextjintID; // cache method id
- jmethodID voidsetWidgetBackgroundColorjintjintjintjintID; // cache method id
- jmethodID jintArray_getWidgetBackgroundColorjintID; // cache method id
- jmethodID voidsetWidgetForegroundColorjintjintjintjintID; // cache method id
- jmethodID jintArray_getWidgetForegroundColorjintID; // cache method id
- jmethodID voidsetFrameBackgroundColorjintjintjintjintID; // cache method id
- jmethodID jintArray_getFrameBackgroundColorjintID; // cache method id
- jmethodID voidsetFrameForegroundColorjintjintjintjintID; // cache method id
- jmethodID jintArray_getFrameForegroundColorjintID; // cache method id
- jmethodID voidsetWidgetFontNamejintjstringID; // cache method id
- jmethodID jstringgetWidgetFontNamejintID; // cache method id
- jmethodID voidsetWidgetFontWeightjintjstringID; // cache method id
- jmethodID voidsetWidgetFontSizejintjintID; // cache method id
- jmethodID jintgetWidgetFontSizejintID; // cache method id
- jmethodID voidsetWidgetFontAnglejintjstringID; // cache method id
- jmethodID voidsetFrameFontNamejintjstringID; // cache method id
- jmethodID jstringgetFrameFontNamejintID; // cache method id
- jmethodID voidsetFrameFontWeightjintjstringID; // cache method id
- jmethodID voidsetFrameFontSizejintjintID; // cache method id
- jmethodID jintgetFrameFontSizejintID; // cache method id
- jmethodID voidsetFrameFontAnglejintjstringID; // cache method id
- jmethodID voidsetWidgetPositionjintjintjintjintjintID; // cache method id
- jmethodID jintArray_getWidgetPositionjintID; // cache method id
- jmethodID voidsetFramePositionjintjintjintjintjintID; // cache method id
- jmethodID jintArray_getFramePositionjintID; // cache method id
- jmethodID voidsetWidgetCallbackjintjstringjintID; // cache method id
- jmethodID voidsetFrameCallbackjintjstringjintID; // cache method id
- jmethodID voidsetWidgetHorizontalAlignmentjintjstringID; // cache method id
- jmethodID voidsetWidgetVerticalAlignmentjintjstringID; // cache method id
- jmethodID voidsetSliderMinorTickSpacingjintjintID; // cache method id
- jmethodID voidsetSliderMajorTickSpacingjintjintID; // cache method id
- jmethodID voidsetListBoxSelectedIndicesjintjintArray_ID; // cache method id
- jmethodID jintArray_getListBoxSelectedIndicesjintID; // cache method id
- jmethodID jintgetListBoxSelectionSizejintID; // cache method id
- jmethodID voidsetPopupMenuSelectedIndexjintjintID; // cache method id
- jmethodID jintgetPopupMenuSelectedIndexjintID; // cache method id
- jmethodID voidsetSliderValuejintjintID; // cache method id
- jmethodID jintgetSliderValuejintID; // cache method id
- jmethodID voidsetRadioButtonCheckedjintjbooleanID; // cache method id
- jmethodID jbooleanisRadioButtonCheckedjintID; // cache method id
- jmethodID voidsetCheckBoxCheckedjintjbooleanID; // cache method id
- jmethodID jbooleanisCheckBoxCheckedjintID; // cache method id
- jmethodID voidsetSliderMinValuejintjintID; // cache method id
- jmethodID voidsetSliderMaxValuejintjintID; // cache method id
- jmethodID voidsetSliderVerticaljintID; // cache method id
- jmethodID voidsetSliderHorizontaljintID; // cache method id
- jmethodID voidsetListBoxMultipleSelectionEnabledjintjbooleanID; // cache method id
- jmethodID jobjectArray_getListBoxAllItemsTextjintID; // cache method id
- jmethodID jintgetListBoxNumberOfItemsjintID; // cache method id
- jmethodID voidsetListBoxTextjintjobjectArray_ID; // cache method id
- jmethodID voidsetListBoxListBoxTopjintjintID; // cache method id
- jmethodID jintgetListBoxListBoxTopjintID; // cache method id
- jmethodID jobjectArray_getPopupMenuAllItemsTextjintID; // cache method id
- jmethodID jintgetPopupMenuNumberOfItemsjintID; // cache method id
- jmethodID voidsetPopupMenuTextjintjobjectArray_ID; // cache method id
- jmethodID voidsetWidgetReliefjintjstringID; // cache method id
- jmethodID voidsetFrameReliefjintjstringID; // cache method id
- jmethodID voidsetRootMenuEnabledjstringjbooleanID; // cache method id
- jmethodID voidsetRootSubMenuEnabledjstringjintjbooleanID; // cache method id
- jmethodID voidsetFigureMenuEnabledjintjstringjbooleanID; // cache method id
- jmethodID voidsetFigureSubMenuEnabledjintjstringjintjbooleanID; // cache method id
- jmethodID voidsetWidgetEnablejintjbooleanID; // cache method id
- jmethodID voidsetFrameEnablejintjbooleanID; // cache method id
- jmethodID jbooleanisWidgetEnablejintID; // cache method id
- jmethodID jbooleanisFrameEnablejintID; // cache method id
- jmethodID voidsetMenuCheckedjintjbooleanID; // cache method id
- jmethodID jbooleanisMenuCheckedjintID; // cache method id
- jmethodID voidremoveRootMenujstringID; // cache method id
- jmethodID voidremoveFigureMenujintjstringID; // cache method id
- jmethodID jstringdisplayAndWaitContextMenujintID; // cache method id
+ jmethodID voiddestroyWidgetjintintID; // cache method id
+ jmethodID voiddestroyFramejintintID; // cache method id
+ jmethodID jintnewWindowjintintID; // cache method id
+ jmethodID voidsetFigureAsParentjintintjintintID; // cache method id
+ jmethodID voidsetMenuAsParentjintintjintintID; // cache method id
+ jmethodID voidsetRootAsParentjintintID; // cache method id
+ jmethodID voidsetParentjintintjintintID; // cache method id
+ jmethodID voidsetPushButtonParentjintintjintintID; // cache method id
+ jmethodID voidremovePushButtonFromParentjintintjintintID; // cache method id
+ jmethodID voidsetEditBoxParentjintintjintintID; // cache method id
+ jmethodID voidremoveEditBoxFromParentjintintjintintID; // cache method id
+ jmethodID voidsetLabelParentjintintjintintID; // cache method id
+ jmethodID voidremoveLabelFromParentjintintjintintID; // cache method id
+ jmethodID voidsetCheckBoxParentjintintjintintID; // cache method id
+ jmethodID voidremoveCheckBoxFromParentjintintjintintID; // cache method id
+ jmethodID voidsetRadioButtonParentjintintjintintID; // cache method id
+ jmethodID voidremoveRadioButtonFromParentjintintjintintID; // cache method id
+ jmethodID voidsetSliderParentjintintjintintID; // cache method id
+ jmethodID voidremoveSliderFromParentjintintjintintID; // cache method id
+ jmethodID voidsetPopupMenuParentjintintjintintID; // cache method id
+ jmethodID voidremovePopupMenuFromParentjintintjintintID; // cache method id
+ jmethodID voidsetListBoxParentjintintjintintID; // cache method id
+ jmethodID voidremoveListBoxFromParentjintintjintintID; // cache method id
+ jmethodID voidsetFrameParentjintintjintintID; // cache method id
+ jmethodID voidremoveFrameFromParentjintintjintintID; // cache method id
+ jmethodID voidsetWidgetTextjintintjstringjava_lang_StringID; // cache method id
+ jmethodID jstringgetWidgetTextjintintID; // cache method id
+ jmethodID voidsetFrameTextjintintjstringjava_lang_StringID; // cache method id
+ jmethodID jstringgetFrameTextjintintID; // cache method id
+ jmethodID voidsetWidgetBackgroundColorjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getWidgetBackgroundColorjintintID; // cache method id
+ jmethodID voidsetWidgetForegroundColorjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getWidgetForegroundColorjintintID; // cache method id
+ jmethodID voidsetFrameBackgroundColorjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getFrameBackgroundColorjintintID; // cache method id
+ jmethodID voidsetFrameForegroundColorjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getFrameForegroundColorjintintID; // cache method id
+ jmethodID voidsetWidgetFontNamejintintjstringjava_lang_StringID; // cache method id
+ jmethodID jstringgetWidgetFontNamejintintID; // cache method id
+ jmethodID voidsetWidgetFontWeightjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetWidgetFontSizejintintjintintID; // cache method id
+ jmethodID jintgetWidgetFontSizejintintID; // cache method id
+ jmethodID voidsetWidgetFontAnglejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetFrameFontNamejintintjstringjava_lang_StringID; // cache method id
+ jmethodID jstringgetFrameFontNamejintintID; // cache method id
+ jmethodID voidsetFrameFontWeightjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetFrameFontSizejintintjintintID; // cache method id
+ jmethodID jintgetFrameFontSizejintintID; // cache method id
+ jmethodID voidsetFrameFontAnglejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetWidgetPositionjintintjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getWidgetPositionjintintID; // cache method id
+ jmethodID voidsetFramePositionjintintjintintjintintjintintjintintID; // cache method id
+ jmethodID jintArray_getFramePositionjintintID; // cache method id
+ jmethodID voidsetWidgetCallbackjintintjstringjava_lang_StringjintintID; // cache method id
+ jmethodID voidsetFrameCallbackjintintjstringjava_lang_StringjintintID; // cache method id
+ jmethodID voidsetWidgetHorizontalAlignmentjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetWidgetVerticalAlignmentjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetSliderMinorTickSpacingjintintjintintID; // cache method id
+ jmethodID voidsetSliderMajorTickSpacingjintintjintintID; // cache method id
+ jmethodID voidsetListBoxSelectedIndicesjintintjintArray_intID; // cache method id
+ jmethodID jintArray_getListBoxSelectedIndicesjintintID; // cache method id
+ jmethodID jintgetListBoxSelectionSizejintintID; // cache method id
+ jmethodID voidsetPopupMenuSelectedIndexjintintjintintID; // cache method id
+ jmethodID jintgetPopupMenuSelectedIndexjintintID; // cache method id
+ jmethodID voidsetSliderValuejintintjintintID; // cache method id
+ jmethodID jintgetSliderValuejintintID; // cache method id
+ jmethodID voidsetRadioButtonCheckedjintintjbooleanbooleanID; // cache method id
+ jmethodID jbooleanisRadioButtonCheckedjintintID; // cache method id
+ jmethodID voidsetCheckBoxCheckedjintintjbooleanbooleanID; // cache method id
+ jmethodID jbooleanisCheckBoxCheckedjintintID; // cache method id
+ jmethodID voidsetSliderMinValuejintintjintintID; // cache method id
+ jmethodID voidsetSliderMaxValuejintintjintintID; // cache method id
+ jmethodID voidsetSliderVerticaljintintID; // cache method id
+ jmethodID voidsetSliderHorizontaljintintID; // cache method id
+ jmethodID voidsetListBoxMultipleSelectionEnabledjintintjbooleanbooleanID; // cache method id
+ jmethodID jobjectArray_getListBoxAllItemsTextjintintID; // cache method id
+ jmethodID jintgetListBoxNumberOfItemsjintintID; // cache method id
+ jmethodID voidsetListBoxTextjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetListBoxListBoxTopjintintjintintID; // cache method id
+ jmethodID jintgetListBoxListBoxTopjintintID; // cache method id
+ jmethodID jobjectArray_getPopupMenuAllItemsTextjintintID; // cache method id
+ jmethodID jintgetPopupMenuNumberOfItemsjintintID; // cache method id
+ jmethodID voidsetPopupMenuTextjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetWidgetReliefjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetFrameReliefjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetRootMenuEnabledjstringjava_lang_StringjbooleanbooleanID; // cache method id
+ jmethodID voidsetRootSubMenuEnabledjstringjava_lang_StringjintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetFigureMenuEnabledjintintjstringjava_lang_StringjbooleanbooleanID; // cache method id
+ jmethodID voidsetFigureSubMenuEnabledjintintjstringjava_lang_StringjintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetWidgetEnablejintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetFrameEnablejintintjbooleanbooleanID; // cache method id
+ jmethodID jbooleanisWidgetEnablejintintID; // cache method id
+ jmethodID jbooleanisFrameEnablejintintID; // cache method id
+ jmethodID voidsetMenuCheckedjintintjbooleanbooleanID; // cache method id
+ jmethodID jbooleanisMenuCheckedjintintID; // cache method id
+ jmethodID voidremoveRootMenujstringjava_lang_StringID; // cache method id
+ jmethodID voidremoveFigureMenujintintjstringjava_lang_StringID; // cache method id
+ jmethodID jstringdisplayAndWaitContextMenujintintID; // cache method id
  jmethodID jintnewMessageBoxID; // cache method id
- jmethodID voidsetMessageBoxTitlejintjstringID; // cache method id
- jmethodID voidsetMessageBoxMessagejintjstringID; // cache method id
- jmethodID voidsetMessageBoxMessagejintjobjectArray_ID; // cache method id
- jmethodID voidmessageBoxDisplayAndWaitjintID; // cache method id
- jmethodID jintgetMessageBoxSelectedButtonjintID; // cache method id
- jmethodID voidsetMessageBoxDefaultSelectedButtonsjintjintArray_ID; // cache method id
- jmethodID jintArray_getMessageBoxUserSelectedButtonsjintID; // cache method id
- jmethodID voidsetMessageBoxButtonsLabelsjintjobjectArray_ID; // cache method id
- jmethodID voidsetMessageBoxInitialValuejintjobjectArray_ID; // cache method id
- jmethodID jobjectArray_getMessageBoxValuejintID; // cache method id
- jmethodID jintgetMessageBoxValueSizejintID; // cache method id
- jmethodID voidsetMessageBoxListBoxItemsjintjobjectArray_ID; // cache method id
- jmethodID jintgetMessageBoxSelectedItemjintID; // cache method id
- jmethodID voidsetMessageBoxLineLabelsjintjobjectArray_ID; // cache method id
- jmethodID voidsetMessageBoxColumnLabelsjintjobjectArray_ID; // cache method id
- jmethodID voidsetMessageBoxDefaultInputjintjobjectArray_ID; // cache method id
- jmethodID voidsetMessageBoxModaljintjbooleanID; // cache method id
- jmethodID voidsetMessageBoxIconjintjstringID; // cache method id
- jmethodID jbooleanisToolbarVisiblejintID; // cache method id
- jmethodID voidsetToolbarVisiblejintjbooleanID; // cache method id
- jmethodID voidsetEventHandlerjintjstringID; // cache method id
- jmethodID voidsetEventHandlerEnabledjintjbooleanID; // cache method id
+ jmethodID voidsetMessageBoxTitlejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxMessagejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxMessagejintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidmessageBoxDisplayAndWaitjintintID; // cache method id
+ jmethodID jintgetMessageBoxSelectedButtonjintintID; // cache method id
+ jmethodID voidsetMessageBoxDefaultSelectedButtonsjintintjintArray_intID; // cache method id
+ jmethodID jintArray_getMessageBoxUserSelectedButtonsjintintID; // cache method id
+ jmethodID voidsetMessageBoxButtonsLabelsjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxInitialValuejintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID jobjectArray_getMessageBoxValuejintintID; // cache method id
+ jmethodID jintgetMessageBoxValueSizejintintID; // cache method id
+ jmethodID voidsetMessageBoxListBoxItemsjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID jintgetMessageBoxSelectedItemjintintID; // cache method id
+ jmethodID voidsetMessageBoxLineLabelsjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxColumnLabelsjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxDefaultInputjintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetMessageBoxModaljintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetMessageBoxIconjintintjstringjava_lang_StringID; // cache method id
+ jmethodID jbooleanisToolbarVisiblejintintID; // cache method id
+ jmethodID voidsetToolbarVisiblejintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetEventHandlerjintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetEventHandlerEnabledjintintjbooleanbooleanID; // cache method id
  jmethodID jintnewWaitBarID; // cache method id
- jmethodID voidsetWaitBarMessagejintjobjectArray_ID; // cache method id
- jmethodID voidsetWaitBarValuejintjintID; // cache method id
- jmethodID voiddestroyWaitBarjintID; // cache method id
- jmethodID voidsetWaitBarIndeterminateModejintjbooleanID; // cache method id
- jmethodID voidlaunchHelpBrowserjobjectArray_jstringID; // cache method id
- jmethodID voidsearchKeywordjobjectArray_jstringjstringjbooleanID; // cache method id
- jmethodID jintnewExportFileChooserjintID; // cache method id
+ jmethodID voidsetWaitBarMessagejintintjobjectArray_java_lang_StringID; // cache method id
+ jmethodID voidsetWaitBarValuejintintjintintID; // cache method id
+ jmethodID voiddestroyWaitBarjintintID; // cache method id
+ jmethodID voidsetWaitBarIndeterminateModejintintjbooleanbooleanID; // cache method id
+ jmethodID voidlaunchHelpBrowserjobjectArray_java_lang_Stringjstringjava_lang_StringID; // cache method id
+ jmethodID voidsearchKeywordjobjectArray_java_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID; // cache method id
 -jmethodID voidsaveMainWindowSettingsID; // cache method id
 -jmethodID voidsaveHelpWindowSettingsID; // cache method id
+ jmethodID jintnewExportFileChooserjintintID; // cache method id
  jmethodID jintnewFontChooserID; // cache method id
- jmethodID voidfontChooserDisplayAndWaitjintID; // cache method id
- jmethodID voidsetFontChooserFontNamejintjstringID; // cache method id
- jmethodID voidsetFontChooserFontSizejintjintID; // cache method id
- jmethodID voidsetFontChooserBoldjintjbooleanID; // cache method id
- jmethodID voidsetFontChooserItalicjintjbooleanID; // cache method id
- jmethodID jstringgetFontChooserFontNamejintID; // cache method id
- jmethodID jintgetFontChooserFontSizejintID; // cache method id
- jmethodID jbooleangetFontChooserBoldjintID; // cache method id
- jmethodID jbooleangetFontChooserItalicjintID; // cache method id
+ jmethodID voidfontChooserDisplayAndWaitjintintID; // cache method id
+ jmethodID voidsetFontChooserFontNamejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetFontChooserFontSizejintintjintintID; // cache method id
+ jmethodID voidsetFontChooserBoldjintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetFontChooserItalicjintintjbooleanbooleanID; // cache method id
+ jmethodID jstringgetFontChooserFontNamejintintID; // cache method id
+ jmethodID jintgetFontChooserFontSizejintintID; // cache method id
+ jmethodID jbooleangetFontChooserBoldjintintID; // cache method id
+ jmethodID jbooleangetFontChooserItalicjintintID; // cache method id
  jmethodID jintnewColorChooserID; // cache method id
- jmethodID voidcolorChooserDisplayAndWaitjintID; // cache method id
- jmethodID voidsetColorChooserDefaultColorjintjintArray_ID; // cache method id
- jmethodID jintArray_getColorChooserSelectedColorjintID; // cache method id
- jmethodID voidsetColorChooserTitlejintjstringID; // cache method id
- jmethodID voidsetWidgetVisiblejintjbooleanID; // cache method id
- jmethodID voidsetFrameVisiblejintjbooleanID; // cache method id
- jmethodID jbooleanisWidgetVisiblejintID; // cache method id
- jmethodID jbooleanisFrameVisiblejintID; // cache method id
+ jmethodID voidcolorChooserDisplayAndWaitjintintID; // cache method id
+ jmethodID voidsetColorChooserDefaultColorjintintjintArray_intID; // cache method id
+ jmethodID jintArray_getColorChooserSelectedColorjintintID; // cache method id
+ jmethodID voidsetColorChooserTitlejintintjstringjava_lang_StringID; // cache method id
+ jmethodID voidsetWidgetVisiblejintintjbooleanbooleanID; // cache method id
+ jmethodID voidsetFrameVisiblejintintjbooleanbooleanID; // cache method id
+ jmethodID jbooleanisWidgetVisiblejintintID; // cache method id
+ jmethodID jbooleanisFrameVisiblejintintID; // cache method id
  jmethodID jstringgetClipboardContentsID; // cache method id
  jmethodID voidpasteClipboardIntoConsoleID; // cache method id
  jmethodID voidcopyConsoleSelectionID; // cache method id
@@@ -151,6 -151,6 +151,9 @@@ call ant clea
    <ItemDefinitionGroup>
    </ItemDefinitionGroup>
    <ItemGroup>
++    <ProjectReference Include="..\..\..\core\src\java\core-JAVA.vcxproj">
++      <Project>{78d8b862-964a-4d0e-93d2-ca8a25ba1207}</Project>
++    </ProjectReference>
      <ProjectReference Include="..\..\..\gui\src\java\gui-JAVA.vcxproj">
        <Project>{f01c26e3-e409-4e74-ba84-c7c4a71a7fdc}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@@ -160,6 -160,6 +160,9 @@@ call ant clea
        <Project>{b2911268-79e2-4fe5-ad59-2c3cb7cb794e}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      </ProjectReference>
++    <ProjectReference Include="..\..\..\core\src\java\core-JAVA.vcxproj">
++      <Project>{78d8b862-964a-4d0e-93d2-ca8a25ba1207}</Project>
++    </ProjectReference>
      <ProjectReference Include="..\..\..\gui\src\java\gui-JAVA.vcxproj">
        <Project>{f01c26e3-e409-4e74-ba84-c7c4a71a7fdc}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@@ -68,9 -64,9 +68,10 @@@ libsciui_data_la_CPPFLAGS = $(JAVA_JNI_
                        -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/commons/src/jni \
                        -I$(top_srcdir)/modules/localization/includes \
 -                      -I$(top_srcdir)/modules/api_scilab/includes
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/fileio/includes
  
  # Without the ui_data module 
  libsciui_data_disable_la_CFLAGS = -Iincludes/ \
@@@ -136,14 -135,10 +137,11 @@@ libsciui_data_disable_la_LINK = $(LIBTO
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(libsciui_data_disable_la_CFLAGS) $(CFLAGS) \
        $(libsciui_data_disable_la_LDFLAGS) $(LDFLAGS) -o $@
- libsciui_data_la_DEPENDENCIES = libsciui_data-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
+ libsciui_data_la_DEPENDENCIES = libsciui_data-algo.la
  am__objects_5 = libsciui_data_la-gw_ui_data.lo
  am__objects_6 = libsciui_data_la-sci_editvar.lo \
 -      libsciui_data_la-sci_browsevar.lo
 +      libsciui_data_la-sci_browsevar.lo \
 +      libsciui_data_la-sci_filebrowser.lo
  am_libsciui_data_la_OBJECTS = $(am__objects_5) $(am__objects_6)
  libsciui_data_la_OBJECTS = $(am_libsciui_data_la_OBJECTS)
  libsciui_data_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@@ -549,9 -534,9 +542,10 @@@ libsciui_data_la_CPPFLAGS = $(JAVA_JNI_
                        -I$(srcdir)/src/jni/ \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/commons/src/jni \
                        -I$(top_srcdir)/modules/localization/includes \
 -                      -I$(top_srcdir)/modules/api_scilab/includes
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/fileio/includes
  
  
  # Without the ui_data module 
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_filebrowser.cpp" />
 +    <ClCompile Include="..\cpp\FileBrowserChDir.cpp" />
      <ClCompile Include="..\cpp\UpdateBrowseVar.cpp" />
      <ClCompile Include="..\jni\BrowseVar.cpp" />
 +    <ClCompile Include="..\jni\FileBrowser.cpp" />
      <ClCompile Include="DllmainUi_data.c" />
      <ClCompile Include="..\jni\EditVar.cpp" />
-     <ClCompile Include="..\jni\GiwsException.cpp" />
      <ClCompile Include="..\..\sci_gateway\c\gw_ui_data.c" />
      <ClCompile Include="..\..\sci_gateway\cpp\sci_browsevar.cpp" />
      <ClCompile Include="..\..\sci_gateway\cpp\sci_editvar.cpp" />
        <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      </ProjectReference>
 +    <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
 +      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
++    </ProjectReference>      
+     <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
+       <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
      </ProjectReference>
      <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
        <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
@@@ -158,6 -158,6 +158,9 @@@ call ant clea
        <Project>{b2911268-79e2-4fe5-ad59-2c3cb7cb794e}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      </ProjectReference>
++    <ProjectReference Include="..\..\..\commons\src\java\commons-JAVA.vcxproj">
++      <Project>{9188fa91-e039-485d-af1d-781cea92f541}</Project>
++    </ProjectReference>
      <ProjectReference Include="..\..\..\gui\src\java\gui-JAVA.vcxproj">
        <Project>{f01c26e3-e409-4e74-ba84-c7c4a71a7fdc}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@@ -104,9 -104,9 +104,9 @@@ throw GiwsException::JniObjectCreationE
  curEnv->DeleteLocalRef(localInstance);
  
                  /* Methods ID set to NULL */
- voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID=NULL; 
- jbooleanisVariableBrowserOpenedID=NULL; 
- voidcloseVariableBrowserID=NULL; 
 -voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID=NULL;
++voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID=NULL;
+ jbooleanisVariableBrowserOpenedID=NULL;
+ voidcloseVariableBrowserID=NULL;
  
  
  }
@@@ -129,9 -129,9 +129,9 @@@ throw GiwsException::JniObjectCreationE
  throw GiwsException::JniObjectCreationException(curEnv, this->className());
          }
          /* Methods ID set to NULL */
-         voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID=NULL; 
- jbooleanisVariableBrowserOpenedID=NULL; 
- voidcloseVariableBrowserID=NULL; 
 -        voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID=NULL;
++        voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID=NULL;
+ jbooleanisVariableBrowserOpenedID=NULL;
+ voidcloseVariableBrowserID=NULL;
  
  
  }
@@@ -157,8 -157,8 +157,8 @@@ JNIEnv * curEnv = NULL
  jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
  jclass cls = curEnv->FindClass( className().c_str() );
  
- jmethodID voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID = curEnv->GetStaticMethodID(cls, "openVariableBrowser", "(Z[Ljava/lang/String;[I[I[Ljava/lang/String;[Ljava/lang/String;[Z)V" ) ;
- if (voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID == NULL) {
 -jmethodID voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID = curEnv->GetStaticMethodID(cls, "openVariableBrowser", "(Z[Ljava/lang/String;[Ljava/lang/String;[I[I[Ljava/lang/String;)V" ) ;
 -if (voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID == NULL) {
++jmethodID voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID = curEnv->GetStaticMethodID(cls, "openVariableBrowser", "(Z[Ljava/lang/String;[I[I[Ljava/lang/String;[Ljava/lang/String;[Z)V" ) ;
++if (voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID == NULL) {
  throw GiwsException::JniMethodNotFoundException(curEnv, "openVariableBrowser");
  }
  
@@@ -252,11 -252,9 +252,11 @@@ curEnv->SetObjectArrayElement( variable
  // avoid keeping reference on to many strings
  curEnv->DeleteLocalRef(TempString);
  }
 -                         curEnv->CallStaticVoidMethod(cls, voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID ,update_, columnNames_, variableNames_, variableBytes_, variableTypes_, variableVisibility_);
 +jbooleanArray variableFromUser_ = curEnv->NewBooleanArray( variableFromUserSize ) ;
 +curEnv->SetBooleanArrayRegion( variableFromUser_, 0, variableFromUserSize, (jboolean*)variableFromUser ) ;
 +
-                          curEnv->CallStaticVoidMethod(cls, voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID ,update_, variableNames_, variableBytes_, variableTypes_, variableSize_, variableVisibility_, variableFromUser_);
++                         curEnv->CallStaticVoidMethod(cls, voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID ,update_, variableNames_, variableBytes_, variableTypes_, variableSize_, variableVisibility_, variableFromUser_);
                          curEnv->DeleteLocalRef(stringArrayClass);
 -curEnv->DeleteLocalRef(columnNames_);
  curEnv->DeleteLocalRef(variableNames_);
  curEnv->DeleteLocalRef(variableBytes_);
  curEnv->DeleteLocalRef(variableTypes_);
@@@ -64,7 -77,7 +77,7 @@@ private
  JavaVM * jvm;
  
  protected:
- jmethodID voidopenVariableBrowserjbooleanjobjectArray_jintArray_jintArray_jobjectArray_jobjectArray_jbooleanArray_ID; // cache method id
 -jmethodID voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringID; // cache method id
++jmethodID voidopenVariableBrowserjbooleanbooleanjobjectArray_java_lang_StringjintArray_intjintArray_intjobjectArray_java_lang_StringjobjectArray_java_lang_StringjbooleanArray_booleanID; // cache method id
  jclass stringArrayClass;
  jmethodID jbooleanisVariableBrowserOpenedID; // cache method id
  jmethodID voidcloseVariableBrowserID; // cache method id
index 58784bc,0000000..e3a6da6
mode 100644,000000..100644
--- /dev/null
@@@ -1,196 -1,0 +1,196 @@@
 +#include "FileBrowser.hxx"
- /* Generated by GIWS (version 1.2.4) */
++/* Generated by GIWS (version 1.3.0) */
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +namespace org_scilab_modules_ui_data {
 +
 +// Returns the current env
 +
 +JNIEnv * FileBrowser::getCurrentEnv() {
 +JNIEnv * curEnv = NULL;
 +jint res=this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +if (res != JNI_OK) {
 +throw GiwsException::JniException(getCurrentEnv());
 +}
 +return curEnv;
 +}
 +// Destructor
 +
 +FileBrowser::~FileBrowser() {
 +JNIEnv * curEnv = NULL;
 +this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +
 +curEnv->DeleteGlobalRef(this->instance);
 +curEnv->DeleteGlobalRef(this->instanceClass);
 +}
 +// Constructors
 +FileBrowser::FileBrowser(JavaVM * jvm_) {
 +jmethodID constructObject = NULL ;
 +jobject localInstance ;
 +jclass localClass ;
 +const std::string construct="<init>";
 +const std::string param="()V";
 +jvm=jvm_;
 +
 +JNIEnv * curEnv = getCurrentEnv();
 +
 +localClass = curEnv->FindClass( this->className().c_str() ) ;
 +if (localClass == NULL) {
 +  throw GiwsException::JniClassNotFoundException(curEnv, this->className());
 +}
 +
 +this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +
 +/* localClass is not needed anymore */
 +curEnv->DeleteLocalRef(localClass);
 +
 +if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +
 +constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
 +if(constructObject == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
 +if(localInstance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 + 
 +this->instance = curEnv->NewGlobalRef(localInstance) ;
 +if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +/* localInstance not needed anymore */
 +curEnv->DeleteLocalRef(localInstance);
 +
 +                /* Methods ID set to NULL */
- voidopenFileBrowserID=NULL; 
- voidsetBaseDirjstringID=NULL; 
++voidopenFileBrowserID=NULL;
++voidsetBaseDirjstringjava_lang_StringID=NULL;
 +
 +
 +}
 +
 +FileBrowser::FileBrowser(JavaVM * jvm_, jobject JObj) {
 +        jvm=jvm_;
 +
 +        JNIEnv * curEnv = getCurrentEnv();
 +
 +jclass localClass = curEnv->GetObjectClass(JObj);
 +        this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +        curEnv->DeleteLocalRef(localClass);
 +
 +        if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +
 +        this->instance = curEnv->NewGlobalRef(JObj) ;
 +        if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +        /* Methods ID set to NULL */
-         voidopenFileBrowserID=NULL; 
- voidsetBaseDirjstringID=NULL; 
++        voidopenFileBrowserID=NULL;
++voidsetBaseDirjstringjava_lang_StringID=NULL;
 +
 +
 +}
 +
 +// Generic methods
 +
 +void FileBrowser::synchronize() {
 +if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "FileBrowser");
 +}
 +}
 +
 +void FileBrowser::endSynchronize() {
 +if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "FileBrowser");
 +}
 +}
 +// Method(s)
 +
 +void FileBrowser::openFileBrowser (JavaVM * jvm_){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidopenFileBrowserID = curEnv->GetStaticMethodID(cls, "openFileBrowser", "()V" ) ;
 +if (voidopenFileBrowserID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "openFileBrowser");
 +}
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidopenFileBrowserID );
 +                        curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +void FileBrowser::setBaseDir (JavaVM * jvm_, char * baseDir){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID voidsetBaseDirjstringID = curEnv->GetStaticMethodID(cls, "setBaseDir", "(Ljava/lang/String;)V" ) ;
- if (voidsetBaseDirjstringID == NULL) {
++jmethodID voidsetBaseDirjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setBaseDir", "(Ljava/lang/String;)V" ) ;
++if (voidsetBaseDirjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setBaseDir");
 +}
 +
 +jstring baseDir_ = curEnv->NewStringUTF( baseDir );
- if (baseDir_ == NULL)
++if (baseDir != NULL && baseDir_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
-                          curEnv->CallStaticVoidMethod(cls, voidsetBaseDirjstringID ,baseDir_);
++                         curEnv->CallStaticVoidMethod(cls, voidsetBaseDirjstringjava_lang_StringID ,baseDir_);
 +                        curEnv->DeleteLocalRef(baseDir_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +}
index d99a443,0000000..467553d
mode 100644,000000..100644
--- /dev/null
@@@ -1,144 -1,0 +1,157 @@@
- /* Generated by GIWS (version 1.2.4) */
++/* Generated by GIWS (version 1.3.0) */
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +
 +#ifndef __ORG_SCILAB_MODULES_UI_DATA_FILEBROWSER__
 +#define __ORG_SCILAB_MODULES_UI_DATA_FILEBROWSER__
 +#include <iostream>
 +#include <string>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <jni.h>
 +
 +#include "GiwsException.hxx"
 +
 +#ifndef _MSC_VER /* Defined anyway with Visual */
 +#if !defined(byte)
 +typedef signed char byte;
 +#else
 +#pragma message("Byte has been redefined elsewhere. Some problems can happen")
 +#endif
 +#endif
 +
++
++#ifndef GIWSEXPORT
++# if defined(_MSC_VER) || defined(__WIN32__) || defined(__CYGWIN__)
++#   if defined(STATIC_LINKED)
++#     define GIWSEXPORT
++#   else
++#     define GIWSEXPORT __declspec(dllexport)
++#   endif
++# else
++#     define GIWSEXPORT
++# endif
++#endif
++
 +namespace org_scilab_modules_ui_data {
- class FileBrowser {
++class GIWSEXPORT FileBrowser {
 +
 +private:
 +JavaVM * jvm;
 +
 +protected:
 +jmethodID voidopenFileBrowserID; // cache method id
- jmethodID voidsetBaseDirjstringID; // cache method id
++jmethodID voidsetBaseDirjstringjava_lang_StringID; // cache method id
 +
 +
 +
 +jobject instance;
 +jclass instanceClass; // cache class
 +
 +
 +/**
 +* Get the environment matching to the current thread.
 +*/
 +virtual JNIEnv * getCurrentEnv();
 +
 +public:
 +// Constructor
 +/**
 +* Create a wrapping of the object from a JNIEnv.
 +* It will call the default constructor
 +* @param JEnv_ the Java Env
 +*/
 +FileBrowser(JavaVM * jvm_);
 +
 +/**
 +* Create a wrapping of an already existing object from a JNIEnv.
 +* The object must have already been instantiated
 +* @param JEnv_ the Java Env
 +* @param JObj the object
 +*/
 +FileBrowser(JavaVM * jvm_, jobject JObj);
 +
 +
 +/** 
 +* This is a fake constructor to avoid the constructor
 +* chaining when dealing with extended giws classes 
 +*/
 +#ifdef FAKEGIWSDATATYPE
 +FileBrowser(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
 +#endif
 +
 +// Destructor
 +~FileBrowser();
 +
 +// Generic method
 +// Synchronization methods
 +/**
 +* Enter monitor associated with the object.
 +* Equivalent of creating a "synchronized(obj)" scope in Java.
 +*/
 +void synchronize();
 +
 +/**
 +* Exit monitor associated with the object.
 +* Equivalent of ending a "synchronized(obj)" scope.
 +*/
 +void endSynchronize();
 +
 +// Methods
 +static void openFileBrowser(JavaVM * jvm_);
 +
 +static void setBaseDir(JavaVM * jvm_, char * baseDir);
 +
 +
 +                        /**
 +                        * Get class name to use for static methods
 +                        * @return class name to use for static methods
 +                        */
 +                        
 +                static const std::string className()
 +                {
 +                return "org/scilab/modules/ui_data/FileBrowser";
 +                }
 +                
 +};
 +
 +
 +}
 +#endif
Simple merge