* `jconvMatrixMethod` was obsolete and is now removed. Please use `jautoTranspose... 44/18344/4
Samuel GOUGEON [Sat, 2 Jul 2016 16:49:43 +0000 (18:49 +0200)]
jconvMatrixMethod() was obsolete: removal

Change-Id: I0528cf8b4c07027b3414ad9ea2f30eb07821a966

17 files changed:
scilab/CHANGES.md
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/external_objects_java/external_objects_java.vcxproj
scilab/modules/external_objects_java/external_objects_java.vcxproj.filters
scilab/modules/external_objects_java/help/en_US/jconvMatrixMethod.xml [deleted file]
scilab/modules/external_objects_java/help/en_US/jwrap.xml
scilab/modules/external_objects_java/help/ja_JP/jconvMatrixMethod.xml [deleted file]
scilab/modules/external_objects_java/help/ja_JP/jwrap.xml
scilab/modules/external_objects_java/includes/gw_external_objects_java.h
scilab/modules/external_objects_java/locales/external_objects_java.pot
scilab/modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp [deleted file]
scilab/modules/external_objects_java/sci_gateway/external_objects_java_gateway.xml
scilab/modules/external_objects_java/tests/unit_tests/jautoTranspose.dia.ref
scilab/modules/external_objects_java/tests/unit_tests/jautoTranspose.tst
scilab/modules/helptools/data/configuration/scilab_primitives.txt
scilab/modules/slint/src/cpp/DeprecatedChecker.cpp

index c1abd5f..8679e86 100644 (file)
@@ -215,6 +215,7 @@ Removed Functions
 * `gschur` was obsolete already in Scilab 4 and is now removed. Please use `schur` instead.
 * `havewindow` has been removed. Please use `getscilabmode()=="STD"` instead
 * `rafiter` was obsolete since Scilab 5.1 and is now removed.
+* `jconvMatrixMethod` was obsolete and is now removed. Please use `jautoTranspose` instead.
 
 * Symbolic module functions have been removed: `addf`, `cmb_lin`, `ldivf`, `mulf`, `rdivf`, `solve`, `subf`, `trianfml`, `trisolve` and `block2exp`.
 * Functionnalities based on former Scilab stack have been removed:
index a577a60..ca5bb38 100644 (file)
@@ -73,7 +73,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/cpp/sci_jwrapinfloat.cpp \
     sci_gateway/cpp/sci_jsetfield.cpp \
     sci_gateway/cpp/sci_jautoTranspose.cpp \
-    sci_gateway/cpp/sci_jconvMatrixMethod.cpp \
     sci_gateway/cpp/sci_jgetinfo.cpp \
     sci_gateway/cpp/sci_jinvoke_db.cpp
 
index 34cf933..d250c84 100644 (file)
@@ -240,7 +240,6 @@ am__objects_3 =  \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jwrapinfloat.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jsetfield.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jautoTranspose.lo \
-       sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetinfo.lo \
        sci_gateway/cpp/libsciexternal_objects_java_la-sci_jinvoke_db.lo
 am_libsciexternal_objects_java_la_OBJECTS = $(am__objects_3) \
@@ -740,7 +739,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/cpp/sci_jwrapinfloat.cpp \
     sci_gateway/cpp/sci_jsetfield.cpp \
     sci_gateway/cpp/sci_jautoTranspose.cpp \
-    sci_gateway/cpp/sci_jconvMatrixMethod.cpp \
     sci_gateway/cpp/sci_jgetinfo.cpp \
     sci_gateway/cpp/sci_jinvoke_db.cpp
 
@@ -1014,9 +1012,6 @@ sci_gateway/cpp/libsciexternal_objects_java_la-sci_jsetfield.lo:  \
 sci_gateway/cpp/libsciexternal_objects_java_la-sci_jautoTranspose.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo:  \
-       sci_gateway/cpp/$(am__dirstamp) \
-       sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetinfo.lo:  \
        sci_gateway/cpp/$(am__dirstamp) \
        sci_gateway/cpp/$(DEPDIR)/$(am__dirstamp)
@@ -1045,7 +1040,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jautoUnwrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jcast.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jcompile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jconvMatrixMethod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jcreatejar.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jdeff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jdisableTrace.Plo@am__quote@
@@ -1347,13 +1341,6 @@ sci_gateway/cpp/libsciexternal_objects_java_la-sci_jautoTranspose.lo: sci_gatewa
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciexternal_objects_java_la-sci_jautoTranspose.lo `test -f 'sci_gateway/cpp/sci_jautoTranspose.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_jautoTranspose.cpp
 
-sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo: sci_gateway/cpp/sci_jconvMatrixMethod.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jconvMatrixMethod.Tpo -c -o sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo `test -f 'sci_gateway/cpp/sci_jconvMatrixMethod.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_jconvMatrixMethod.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jconvMatrixMethod.Tpo sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jconvMatrixMethod.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='sci_gateway/cpp/sci_jconvMatrixMethod.cpp' object='sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sci_gateway/cpp/libsciexternal_objects_java_la-sci_jconvMatrixMethod.lo `test -f 'sci_gateway/cpp/sci_jconvMatrixMethod.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_jconvMatrixMethod.cpp
-
 sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetinfo.lo: sci_gateway/cpp/sci_jgetinfo.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciexternal_objects_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetinfo.lo -MD -MP -MF sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jgetinfo.Tpo -c -o sci_gateway/cpp/libsciexternal_objects_java_la-sci_jgetinfo.lo `test -f 'sci_gateway/cpp/sci_jgetinfo.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_jgetinfo.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jgetinfo.Tpo sci_gateway/cpp/$(DEPDIR)/libsciexternal_objects_java_la-sci_jgetinfo.Plo
index ede8b9f..b8353e6 100644 (file)
     <ClCompile Include="sci_gateway\cpp\sci_jautoUnwrap.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jcast.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jcompile.cpp" />
-    <ClCompile Include="sci_gateway\cpp\sci_jconvMatrixMethod.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jcreatejar.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jdeff.cpp" />
     <ClCompile Include="sci_gateway\cpp\sci_jdisableTrace.cpp" />
index 2e7d797..4db3391 100644 (file)
     <ClCompile Include="sci_gateway\cpp\sci_jinvoke.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\cpp\sci_jconvMatrixMethod.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_gateway\cpp\sci_jgetinfo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/scilab/modules/external_objects_java/help/en_US/jconvMatrixMethod.xml b/scilab/modules/external_objects_java/help/en_US/jconvMatrixMethod.xml
deleted file mode 100644 (file)
index 27f2393..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2010 - 2011 - Calixte DENIZET <calixte@contrib.scilab.org>
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*
--->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="jconvMatrixMethod">
-    <refnamediv>
-        <refname>jconvMatrixMethod</refname>
-        <refpurpose>
-            Set the way to convert matrices <emphasis role="bold">This function is obsolete.</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>
-            method = jconvMatrixMethod()
-            jconvMatrixMethod(method)
-        </synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parameters</title>
-        <variablelist>
-            <varlistentry>
-                <term>method</term>
-                <listitem>
-                    <para>A string giving the type of conversion: 'rc' or 'cr'</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <warning>
-                This function is obsolete and will be removed in Scilab 6.0.0, use preferably the <link linkend="jautoTranspose">jautoTranspose</link> function.
-            </warning>
-        </para>
-        <para>
-            In Scilab a matrix such as <literal>[1 2 3;4 5 6]</literal> is stored <literal>[1 4 2 5 3 6]</literal> (column by column). In Java the same matrix is stored as <literal>[-&gt;[1 2 3] -&gt;[4 5 6]]</literal> (array of pointers).
-        </para>
-        <para>
-            When method is 'cr' (column-row), the internal array <literal>[1 4 2 5 3 6]</literal> is passed as it is and Java creates the array <literal>[-&gt;[1 4] -&gt;[2 5] -&gt;[3 6]]</literal>.
-        </para>
-        <para>
-            When method is 'rc' (row-column), the array <literal>[1 4 2 5 3 6]</literal> is passed as <literal>[1 2 3 4 5 6]</literal> and converted into <literal>[-&gt;[1 2 3] -&gt;[4 5 6]]</literal>.
-        </para>
-        <para>
-            By default, the method is set to 'cr'.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-               jconvMatrixMethod()
-               jconvMatrixMethod("cr")
-      ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="jautoTranspose">jautoTranspose</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.5.0</revnumber>
-                <revremark>
-                    Function introduced. Based on the 'JIMS' module. The main difference in the behavior compared to the JIMS module is that <link linkend="jautoUnwrap">jautoUnwrap</link> is enabled by default.
-                </revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
-
index c8de97a..f39ecb0 100644 (file)
             <simplelist type="inline">
                 <member>constant (real not complex) into double;</member><member>string into String;</member><member>boolean into boolean;</member><member>int8 into byte;</member><member>uint8 into short;</member><member>int16 into short;</member><member>uint16 into int;</member><member>int32 into int;</member><member>uint32 into long.</member>
             </simplelist>
-            The matrices are wrapped into arrays too, e.g. an int8 matrix 3x4 is wrapped into a <literal>byte[3][4]</literal> or <literal>byte[4][3]</literal> depending on conversion method which can be changed in using the command <link linkend="jconvMatrixMethod">jconvMatrixMethod</link>.
+            The matrices are wrapped into arrays too, e.g. an int8 matrix 3x4 is wrapped into a
+            <literal>byte[3][4]</literal> or <literal>byte[4][3]</literal> depending on conversion
+            method which can be changed in using the command
+            <link linkend="jautoTranspose">jautoTranspose</link>.
             You should take care that the range of the index is the same as in Java, so <literal>a(0)</literal> is valid.
         </para>
         <para>
@@ -68,7 +71,7 @@
         <title>See also</title>
         <simplelist type="inline">
             <member>
-                <link linkend="jconvMatrixMethod">jconvMatrixMethod</link>
+                <link linkend="jautoTranspose">jautoTranspose</link>
             </member>
             <member>
                 <link linkend="jwrapinfloat">jwrapinfloat</link>
diff --git a/scilab/modules/external_objects_java/help/ja_JP/jconvMatrixMethod.xml b/scilab/modules/external_objects_java/help/ja_JP/jconvMatrixMethod.xml
deleted file mode 100644 (file)
index 0caf25e..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2010 - 2011 - Calixte DENIZET <calixte@contrib.scilab.org>
-*
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-*
-*
--->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="ja" xml:id="jconvMatrixMethod">
-    
-    <refnamediv>
-        
-        <refname>jconvMatrixMethod</refname>
-        
-        <refpurpose>
-            
-            行列を変換する方法を設定
-            
-            <emphasis role="bold">この関数は廃止されます.</emphasis>
-            
-        </refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>
-            
-            method = jconvMatrixMethod()
-            
-            jconvMatrixMethod(method)
-            
-        </synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>パラメータ</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>method</term>
-                
-                <listitem>
-                    
-                    <para>
-                        
-                        変換の型を指定する文字列: 'rc' または 'cr'
-                    </para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            <warning>
-                
-                この関数は廃止予定であり, Scilab 6.0.0で削除されます,
-                
-                <link linkend="jautoTranspose">jautoTranspose</link> 関数の
-                
-                使用を推奨します.
-                
-            </warning>
-            
-        </para>
-        
-        <para>
-            
-            Scilabでは,
-            
-            Scilabでは,
-            
-            <literal>[1 2 3;4 5 6]</literal>のような行列は
-            
-            <literal>[1 4 2 5 3 6]</literal> のように(列毎に)保存されます. 
-            
-            Javaでは,同じ行列は
-            
-            <literal>[-&gt;[1 2 3] -&gt;[4 5 6]]</literal> 
-            
-            のように(ポインタの配列)として保存されます.
-            
-        </para>
-        
-        <para>
-            
-            method が 'cr' (列-行)の場合, 内部配列 <literal>[1 4 2 5 3 6]</literal> はそのまま指定され, Javaは配列<literal>[-&gt;[1 4] -&gt;[2 5] -&gt;[3 6]]</literal>を作成します.
-            
-        </para>
-        
-        <para>
-            
-            method が 'rc' (行-列)の場合, 配列 <literal>[1 4 2 5 3 6]</literal>
-            
-            は<literal>[1 2 3 4 5 6]</literal> として渡され,
-            
-            <literal>[-&gt;[1 2 3] -&gt;[4 5 6]]</literal>に変換されます.
-            
-        </para>
-        
-        <para>
-            
-            デフォルトで, method は 'cr'に設定されています.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[
-               jconvMatrixMethod()
-               jconvMatrixMethod("cr")
-      ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="jautoTranspose">jautoTranspose</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>履歴</title>
-        
-        <revhistory>
-            
-            <revision>
-                
-                <revnumber>5.5.0</revnumber>
-                
-                <revremark>
-                    
-                    関数が導入されました. 'JIMS'モジュールに基づきます.
-                    
-                    JIMSモジュールとの動作上の主な違いは,
-                    
-                    <link linkend="jautoUnwrap">jautoUnwrap</link>がデフォルトで
-                    
-                    有効になっていることです.
-                    
-                </revremark>
-                
-            </revision>
-            
-        </revhistory>
-        
-    </refsection>
-    
-</refentry>
-
-
-
index b69d6f1..fa74ed2 100644 (file)
             
             例えば, 3x4のint8行列は,
             
-            <link linkend="jconvMatrixMethod">jconvMatrixMethod</link>
+            <link linkend="jautoTranspose">jautoTranspose</link>
             
             コマンドにより変更可能な変換法により,
             
             
             <member>
                 
-                <link linkend="jconvMatrixMethod">jconvMatrixMethod</link>
+                <link linkend="jautoTranspose">jautoTranspose</link>
                 
             </member>
             
index 5acfdc7..63dc6c4 100644 (file)
@@ -43,7 +43,6 @@ EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jsetfield(char *fname, void* pvApiCt
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jautoUnwrap(char *fname, void* pvApiCtx);
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jautoTranspose(char *fname, void* pvApiCtx);
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jinvoke(char *fname, void* pvApiCtx);
-EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jconvMatrixMethod(char *fname, void* pvApiCtx);
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jgetinfo(char *fname, void* pvApiCtx);
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jinvoke_db(char *fname, void* pvApiCtx);
 EXTERNAL_OBJECTS_JAVA_SCILAB_IMPEXP int sci_jcreatejar(char *fname, void* pvApiCtx);
index 5fb2fff..b39fbbb 100644 (file)
@@ -17,33 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Revision-Date: 2016-06-08 22:21+0100\n"
 
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 38
-#, c-format
-msgid "%s: Function %s is obsolete.\n"
-msgstr ""
-
-#
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 38
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 39
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 40
-msgid "Warning"
-msgstr ""
-
-#
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 39
-#, c-format
-msgid "%s: Please see documentation for more details.\n"
-msgstr ""
-
-#
-# File: modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp, line: 40
-#, c-format
-msgid ""
-"%s: This function will be permanently removed in Scilab %s\n"
-"\n"
-msgstr ""
-
-#
 # File: modules/external_objects_java/sci_gateway/cpp/sci_jcreatejar.cpp, line: 42
 # File: modules/external_objects_java/sci_gateway/cpp/sci_jcreatejar.cpp, line: 99
 # File: modules/external_objects_java/sci_gateway/cpp/sci_jcreatejar.cpp, line: 116
diff --git a/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp b/scilab/modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp
deleted file mode 100644 (file)
index 0477d8d..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2012 - Scilab Enterprises - Calixte DENIZET
- * Copyright (C) 2013 - Scilab Enterprises - Sylvestre Ledru
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * This file is hereby licensed under the terms of the GNU GPL v2.0,
- * pursuant to article 5.3.4 of the CeCILL v.2.1.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- */
-
-#include "ScilabJavaEnvironment.hxx"
-#include "ScilabGateway.hxx"
-
-extern "C" {
-#include "configvariable_interface.h"
-#include "Scierror.h"
-#include "gw_external_objects_java.h"
-}
-
-using namespace org_scilab_modules_external_objects_java;
-using namespace org_modules_external_objects;
-
-int sci_jconvMatrixMethod(char * fname, void* pvApiCtx)
-{
-    int envId;
-    char * type = 0;
-
-    CheckInputArgument(pvApiCtx, 0, 1);
-    CheckOutputArgument(pvApiCtx, 1, 1);
-    if (getWarningMode())
-    {
-        sciprint(_("%s: Function %s is obsolete.\n"), _("Warning"), fname);
-        sciprint(_("%s: Please see documentation for more details.\n"), _("Warning"));
-        sciprint(_("%s: This function will be permanently removed in Scilab %s\n\n"), _("Warning"), "6.0.0");
-    }
-
-    envId = ScilabJavaEnvironment::start();
-    JavaOptionsSetter setter = ScilabJavaEnvironment::getInstance()->getOptionsHelper().getSetter(JavaOptionsSetter::METHODOFCONV);
-    ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
-    ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccurred(false);
-    ScilabObjects::initialization(env, pvApiCtx);
-    options.setIsNew(false);
-
-    if (Rhs == 0)
-    {
-        const char * order = setter.get() ? "rc" : "cr";
-        createMatrixOfString(pvApiCtx, Rhs + 1, 1, 1, &order);
-
-        LhsVar(1) = 1;
-        PutLhsVar();
-
-        return 0;
-    }
-
-    try
-    {
-        type = ScilabObjects::getSingleString(Rhs, pvApiCtx);
-    }
-    catch (const std::exception & e)
-    {
-        Scierror(999, "%s: String \"rc\" or \"cr\" expected.", fname);
-        return 0;
-    }
-
-    if (!strcmp(type, "rc"))
-    {
-        setter.set(true);
-    }
-    else if (!strcmp(type, "cr"))
-    {
-        setter.set(false);
-    }
-    else
-    {
-        FREE(type);
-        Scierror(999, "%s: Invalid string: \"rc\" or \"cr\" expected.", fname);
-        return 0;
-    }
-
-    FREE(type);
-
-    LhsVar(1) = 0;
-    PutLhsVar();
-
-    return 0;
-}
index 0237148..edfda9e 100644 (file)
@@ -43,7 +43,6 @@
     <gateway name="sci_jautoUnwrap"          function="jautoUnwrap"          type="0" />
     <gateway name="sci_jautoTranspose"       function="jautoTranspose"       type="0" />
     <gateway name="sci_jinvoke"              function="jinvoke"              type="0" />
-    <gateway name="sci_jconvMatrixMethod"    function="jconvMatrixMethod"    type="0" />
     <gateway name="sci_jgetinfo"             function="jgetinfo"             type="0" />
     <gateway name="sci_jinvoke_db"           function="jinvoke_db"           type="0" />
     <gateway name="sci_jcreatejar"           function="jcreatejar"           type="0" />
index de0e06e..bcb7a7e 100644 (file)
@@ -16,7 +16,5 @@
 warning("off");
 jautoTranspose(%t);
 assert_checkequal(jautoTranspose(), %t);
-assert_checkequal(jconvMatrixMethod(),"rc");
-jconvMatrixMethod("cr");
-assert_checkequal(jconvMatrixMethod(),"cr");
+jautoTranspose(%f);
 assert_checkequal(jautoTranspose(), %f);
index 762969a..a0177ed 100644 (file)
@@ -18,8 +18,5 @@ warning("off");
 jautoTranspose(%t);
 assert_checkequal(jautoTranspose(), %t);
 
-assert_checkequal(jconvMatrixMethod(),"rc");
-
-jconvMatrixMethod("cr");
-assert_checkequal(jconvMatrixMethod(),"cr");
+jautoTranspose(%f);
 assert_checkequal(jautoTranspose(), %f);
index 852caf4..c8b48cc 100644 (file)
@@ -103,7 +103,8 @@ std::unordered_map<std::wstring, std::wstring> DeprecatedChecker::initDep()
     map.emplace(L"plotframe", L"");
     map.emplace(L"xset", L"set");
     map.emplace(L"xget", L"get");
-    map.emplace(L"xclear", L"");
+    map.emplace(L"xclear", L"clf");
+    map.emplace(L"xpause", L"sleep");
     map.emplace(L"havewindow", L"getscilabmode");
     map.emplace(L"datatipSetStruct", L"");
     map.emplace(L"datatipGetStruct", L"");
@@ -121,6 +122,7 @@ std::unordered_map<std::wstring, std::wstring> DeprecatedChecker::initDep()
     map.emplace(L"derivative", L"numderivative");
     map.emplace(L"mvvacov", L"cov");
     map.emplace(L"strcmpi", L"strcmp");
+    map.emplace(L"jconvMatrixMethod", L"jautoTranspose");
     return map;
 }