From: Sasa M. <sa...@us...> - 2004-07-13 10:40:43
|
Update of /cvsroot/jrobin/src/org/jrobin/inspector In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11427/org/jrobin/inspector Modified Files: RrdInspector.java Log Message: Resolved problem with multiple main frames on startup Index: RrdInspector.java =================================================================== RCS file: /cvsroot/jrobin/src/org/jrobin/inspector/RrdInspector.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RrdInspector.java 24 May 2004 15:02:29 -0000 1.5 --- RrdInspector.java 13 Jul 2004 10:40:34 -0000 1.6 *************** *** 59,67 **** private String lastDirectory = null; ! RrdInspector() { super(TITLE); constructUI(); showCentered(); ! //selectFile(); } --- 59,72 ---- private String lastDirectory = null; ! private RrdInspector(String path) { super(TITLE); constructUI(); showCentered(); ! if(path == null) { ! selectFile(); ! } ! else { ! loadFile(new File(path)); ! } } *************** *** 443,447 **** } ! private static void printUsage() { System.err.println("usage: " + RrdInspector.class.getName() + " [<filename>]"); System.exit(1); --- 448,452 ---- } ! private static void printUsageAndExit() { System.err.println("usage: " + RrdInspector.class.getName() + " [<filename>]"); System.exit(1); *************** *** 449,465 **** public static void main(String[] args) { - new RrdInspector(); - File file = null; if (args.length > 1) { ! printUsage(); ! } else if (args.length == 1) { ! file = new File(args[0]); ! } ! RrdInspector inspector = new RrdInspector(); ! if (file == null) { ! inspector.selectFile(); ! } else { ! inspector.loadFile(file); } } } --- 454,462 ---- public static void main(String[] args) { if (args.length > 1) { ! printUsageAndExit(); } + String path = (args.length == 1)? args[0]: null; + new RrdInspector(path); } } |