Mercurial > hg > octave-jordi
view scripts/java/inputdlg.m @ 15790:921912c92102
Deprecate java_invoke, replace with javaMethod.
Update all m-files to use javaMethod.
* scripts/deprecated/java_invoke.m: New m-file with warning about function
being deprecated.
* libinterp/octave-value/ov-java.cc(Fjava_invoke, FjavaMethod): Remove
java_invoke. Replace body of javaMethod with old java_invoke code.
* libinterp/octave-value/ov-java.cc(do_java_invoke): Rename to do_javaMethod.
* libinterp/octave-value/ov-java.cc(do_java_create): Rename to do_javaObject.
* libinterp/octave-value/ov-java.h(do_java_invoke, do_java_create): Rename
prototypes for functions to do_javaMethod and do_javaObject respectively.
* scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m,
scripts/deprecated/module.mk, scripts/general/fieldnames.m,
scripts/general/methods.m, scripts/java/errordlg.m, scripts/java/helpdlg.m,
scripts/java/inputdlg.m, scripts/java/javaArray.m, scripts/java/javaaddpath.m,
scripts/java/javaclasspath.m, scripts/java/javamem.m,
scripts/java/javarmpath.m, scripts/java/listdlg.m, scripts/java/msgbox.m,
scripts/java/questdlg.m, scripts/java/warndlg.m: Replace java_invoke calls
with javaMethod calls.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 14 Dec 2012 09:51:37 -0800 |
parents | 0f1a143e5002 |
children |
line wrap: on
line source
## Copyright (C) 2010 Martin Hepperle ## ## 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/>. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{cstr} =} inputdlg (@var{prompt}) ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title}) ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title}, @var{rowscols}) ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title}, @var{rowscols}, @var{defaults}) ## Return user input from a multi-textfield dialog box in a cell array ## of strings, or an empty cell array if the dialog is closed by the ## Cancel button. ## ## Inputs: ## ## @table @var ## @item prompt ## A cell array with strings labeling each text field. This input is required. ## ## @item title ## String to use for the caption of the dialog. The default is "Input Dialog". ## ## @item rowscols ## Specifies the size of the text fields and can take three forms: ## ## @enumerate ## @item a scalar value which defines the number of rows used for each ## text field. ## ## @item a vector which defines the individual number of rows ## used for each text field. ## ## @item a matrix which defines the individual number of rows and ## columns used for each text field. In the matrix each row describes ## a single text field. The first column specifies the number of input ## rows to use and the second column specifies the text field width. ## @end enumerate ## ## @item defaults ## A list of default values to place in each text fields. It must be ## a cell array of strings with the same size as @var{prompt}. ## @end table ## @seealso{errordlg, helpdlg, listdlg, msgbox, questdlg, warndlg} ## @end deftypefn function cstr = inputdlg (prompt, title = "Input Dialog", varargin) if (nargin < 1 || nargin > 4) print_usage (); endif if (iscell (prompt)) ## Silently extract only char elements prompt = prompt(cellfun ("ischar", prompt)); elseif (ischar (prompt)) prompt = {prompt}; else error ("inputdlg: PROMPT must be a character string or cellstr array"); endif if (! ischar (title)) error ("inputdlg: TITLE must be a character string"); endif switch (numel (varargin)) case 0 linespec = 1; defaults = cellstr (cell (size (prompt))); case 1 linespec = varargin{1}; defaults = cellstr (cell (size (prompt))); case 2 linespec = varargin{1}; defaults = varargin{2}; endswitch ## specification of text field sizes as in Matlab ## Matlab requires a matrix for linespec, not a cell array... ## rc = [1,10; 2,20; 3,30]; ## c1 c2 ## r1 1 10 first text field is 1x10 ## r2 2 20 second text field is 2x20 ## r3 3 30 third text field is 3x30 if (isscalar (linespec)) ## only scalar value in lineTo, copy from linespec and add defaults rowscols = zeros (columns (prompt), 2); ## cols rowscols(:,2) = 25; rowscols(:,1) = linespec; elseif (isvector (linespec)) ## only one column in lineTo, copy from vector linespec and add defaults rowscols = zeros (columns (prompt), 2); ## rows from colum vector linespec, columns are set to default rowscols(:,2) = 25; rowscols(:,1) = linespec(:); elseif (ismatrix (linespec)) if (rows (linespec) == columns (prompt) && columns (linespec) == 2) ## (rows x columns) match, copy array linespec rowscols = linespec; else error ("inputdlg: ROWSCOLS matrix does not match size of PROMPT"); endif else ## dunno error ("inputdlg: unknown form of ROWSCOLS argument"); endif ## convert numeric values in defaults cell array to strings defs = cellfun (@num2str, defaults, "UniformOutput", false); rc = arrayfun (@num2str, rowscols, "UniformOutput", false); user_inputs = javaMethod ("inputdlg", "org.octave.JDialogBox", prompt, title, rc, defs); if (isempty (user_inputs)) cstr = {}; else cstr = cellstr (user_inputs); endif endfunction