Revision: 6e8226217887 Author: John Boyer <john.boyer@xxxxxxxxxxxxxxxxx> Date: Sat May 5 18:43:13 2012 Log: more bugfixes and more to come http://code.google.com/p/brailleblaster/source/detail?r=6e8226217887 Modified: /src/main/org/brailleblaster/BBIni.java /src/main/org/brailleblaster/Subcommands.java /src/main/org/brailleblaster/wordprocessor/BBMenu.java ======================================= --- /src/main/org/brailleblaster/BBIni.java Sat May 5 17:52:09 2012 +++ /src/main/org/brailleblaster/BBIni.java Sat May 5 18:43:13 2012 @@ -140,8 +140,10 @@ logger.addHandler (logFile); } if (args.length > 0) { - int i = 0; - while (args[i].charAt(0) == '-' && i < args.length) { +for (int i = 0; i < args.length; i++) { +if (args[i].charAt(0) != '-') { +break; +} if (args[i].equals ("-debug")) { debug = true; } @@ -154,7 +156,6 @@ else { System.out.println ("Bad option " + args[i]); } - i++; } } if (gotGui) { ======================================= --- /src/main/org/brailleblaster/Subcommands.java Mon Apr 30 12:42:35 2012 +++ /src/main/org/brailleblaster/Subcommands.java Sat May 5 18:43:13 2012 @@ -64,9 +64,15 @@ // ParseCommandLine.getInstance().parseCommand (args); louisutdml = liblouisutdml.getInstance(); int i = 0; -while (args[i].charAt(0) == '-') { +while ( i < args.length) { +if (args[i].charAt(0) != '-') { +break; +} i++; } +if (i == args.length) { +return; +} subcommand = args[i]; subArgs = Arrays.copyOfRange (args, i + 1, args.length); if (subcommand.equals ("translate")) { =======================================--- /src/main/org/brailleblaster/wordprocessor/BBMenu.java Sat May 5 17:52:09 2012 +++ /src/main/org/brailleblaster/wordprocessor/BBMenu.java Sat May 5 18:43:13 2012
@@ -175,7 +175,7 @@ //5/3 just a tmp place to test the switch function switchItem = new MenuItem (fileMenu, SWT.PUSH); - switchItem.setText (lh.localValue("S&wtich")); + switchItem.setText (lh.localValue("S&witch")); switchItem.addSelectionListener (new SelectionAdapter() { public void widgetSelected (SelectionEvent e) { dm.setReturn(WP.SwitchDocuments);