javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java | 12 ++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
New commits: commit 43cda91057c2e5aeb361c9a5fde216023de37713 Author: rbuj <[email protected]> Date: Mon Aug 11 12:14:50 2014 +0200 javaunohelper: Fix Bootstrap_Test.java & add warning messages Accept bootstrap parameters that contained more than one = Reject empty key Change-Id: Ie04364867d56d5687cbbc2c142ea73be90bbafdf Signed-off-by: Stephan Bergmann <[email protected]> diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java index f52ce28..0031e1a 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java @@ -94,13 +94,17 @@ public class Bootstrap_Test { java.util.HashMap<String,String> bootstrap_parameters = new java.util.HashMap<String,String>(); for ( int nPos = 1; nPos < args.length; ++nPos ) { if (args[nPos].contains("=")) { - String bootstrap_parameter[] = args[nPos].split("="); - if (bootstrap_parameter.length == 2){ + String bootstrap_parameter[] = args[nPos].split("=",2); + if (bootstrap_parameter[0].length() > 0) { bootstrap_parameters.put( bootstrap_parameter[0], bootstrap_parameter[1] ); - } else{ + } else { + System.out.println(); + System.out.println("The 1st argument in a bootstrap parameter is the key of a HashMap element and can't be null : '" + args[nPos] + "'"); usage(); } - } else{ + } else { + System.out.println(); + System.out.println("Missing '=' in bootstrap parameter : '" + args[nPos] + "'"); usage(); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
