Mercurial > octave-nkf

changeset 15774:eddc68c5e85e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove cell2mlstr.m and update java XXXdlg.m functions. * scripts/java/cell2mlstr.m: Removed. * scripts/java/errordlg.m, scripts/java/helpdlg.m, scripts/java/msgbox.m, scripts/java/questdlg.m, scripts/java/warndlg.m: Update code to use sprintf() rather than cell2mlstr().
author Rik <rik@octave.org>
date Wed, 12 Dec 2012 14:32:59 -0800
parents 884079d45014
children a1d1386daeed
files scripts/java/cell2mlstr.m scripts/java/errordlg.m scripts/java/helpdlg.m scripts/java/msgbox.m scripts/java/questdlg.m scripts/java/warndlg.m
diffstat 6 files changed, 10 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/java/cell2mlstr.m	Wed Dec 12 14:19:37 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-## Copyright (C) 2012 Philip Nienhuis <prnienhuis@users.sf.net>
-## 
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-## cell2mlstr - convert text cells in cellstr arrray to multiline text
-## separated by EOL
-
-## Author: Philip <prnienhuis@users.sf.net>
-## Based on a suggestion by D. Bateman,
-## https://savannah.gnu.org/bugs/?func=detailitem&item_id=31468#comment4
-## Created: 2012-06-29
-
-function retval = cell2mlstr (cstr)
-
-  if (! iscellstr (cstr))
-    ## Only use char elements
-    cstr = cstr (find (cellfun ("ischar", cstr)));
-  endif
-
-  ## Treat cell string array as multi-line text
-  cstr(1:2:2*numel (cstr)) = cstr;
-  cstr(2:2:numel (cstr)) = "\n";
-
-  retval = [cstr{:}];
-
-endfunction
--- a/scripts/java/errordlg.m	Wed Dec 12 14:19:37 2012 -0800
+++ b/scripts/java/errordlg.m	Wed Dec 12 14:32:59 2012 -0800
@@ -38,7 +38,8 @@
 
   if (! ischar (msg))
     if (iscell (msg))
-      msg = cell2mlstr (msg);
+      msg = sprintf ("%s\n", msg{:});
+      msg(end) = "";
     else
       error ("errordlg: MSG must be a string or cellstr array");
     endif
--- a/scripts/java/helpdlg.m	Wed Dec 12 14:19:37 2012 -0800
+++ b/scripts/java/helpdlg.m	Wed Dec 12 14:32:59 2012 -0800
@@ -38,7 +38,8 @@
 
   if (! ischar (msg))
     if (iscell (msg))
-      msg = cell2mlstr (msg);
+      msg = sprintf ("%s\n", msg{:});
+      msg(end) = "";
     else
       error ("helpdlg: MSG must be a string or cellstr array");
     endif
--- a/scripts/java/msgbox.m	Wed Dec 12 14:19:37 2012 -0800
+++ b/scripts/java/msgbox.m	Wed Dec 12 14:32:59 2012 -0800
@@ -43,7 +43,8 @@
 
   if (! ischar (msg))
     if (iscell (msg))
-      msg = cell2mlstr (msg);
+      msg = sprintf ("%s\n", msg{:});
+      msg(end) = "";
     else
       error ("msgbox: MSG must be a character string or cellstr array");
     endif
--- a/scripts/java/questdlg.m	Wed Dec 12 14:19:37 2012 -0800
+++ b/scripts/java/questdlg.m	Wed Dec 12 14:32:59 2012 -0800
@@ -54,7 +54,8 @@
   
   if (! ischar (msg))
     if (iscell (msg))
-      msg = cell2mlstr (msg);
+      msg = sprintf ("%s\n", msg{:});
+      msg(end) = "";
     else
       error ("questdlg: MSG must be a character string or cellstr array");
     endif
--- a/scripts/java/warndlg.m	Wed Dec 12 14:19:37 2012 -0800
+++ b/scripts/java/warndlg.m	Wed Dec 12 14:32:59 2012 -0800
@@ -37,7 +37,8 @@
 
   if (! ischar (msg))
     if (iscell (msg))
-      msg = cell2mlstr (msg);
+      msg = sprintf ("%s\n", msg{:});
+      msg(end) = "";
     else
       error ("warndlg: MSG must be a string or cellstr array");
     endif