commonline-query-file/src/main/resources/ch_cancel.gif commonline-query-file/src/main/resources/run_exc.png @@ -13,8 +13,10 @@ package commonline.query.gui; import commonline.core.layout.CommonlineFieldDefinition; -import commonline.file.FileAnalyzer; +import commonline.file.HeaderRecordFileAnalyzer; import commonline.file.FileInfo; +import commonline.file.FileAnalyzer; +import commonline.file.CompositeFileAnalyzer; import commonline.file.parser.ParserRegistry; import commonline.query.model.CommonLineRecord; import commonline.query.model.CommonlineRecordFactory; @@ -39,7 +41,7 @@ import java.util.Map; public class LoadFilesWorker extends SwingWorker<Void, Void> { - private FileAnalyzer fileAnalyzer = new FileAnalyzer(); + private CompositeFileAnalyzer fileAnalyzer = new CompositeFileAnalyzer(); private ParserRegistry parserRegistry = new ParserRegistry(); private ByteMapRecordFieldParser fieldParser; private SameRecordFactoryResolver recordFactoryResolver; commonline-query-file/src/main/java/commonline/query/gui/LoadFilesWorker.java @@ -35,7 +35,7 @@ public class ExecuteScriptAction extends AbtractMacableAction { public ExecuteScriptAction(boolean isMac, List dataSources) { super("Execute...", "Execute the current query", KeyEvent.VK_E, isMac); - putValue(Action.SMALL_ICON, new ImageIcon(getClass().getClassLoader().getResource("icon_run.gif"))); + putValue(Action.SMALL_ICON, new ImageIcon(getClass().getClassLoader().getResource("run_exc.png"))); this.dataSources = dataSources; } commonline-query-file/src/main/java/commonline/query/gui/action/ExecuteScriptAction.java @@ -20,7 +20,7 @@ import java.awt.event.KeyEvent; public class StopScriptAction extends AbtractMacableAction { public StopScriptAction(boolean isMac) { super("Stop", "Stop the current query", KeyEvent.VK_S, isMac); - putValue(Action.SMALL_ICON, new ImageIcon(getClass().getClassLoader().getResource("icon_stop.gif"))); + putValue(Action.SMALL_ICON, new ImageIcon(getClass().getClassLoader().getResource("ch_cancel.gif"))); } public void actionPerformed(ActionEvent actionEvent) { commonline-query-file/src/main/java/commonline/query/gui/action/StopScriptAction.java commonline-query-file/src/main/resources/icon_run.gif commonline-query-file/src/main/resources/icon_stop.gif de15813948541b6c744b7c01efa15b5804c9d4a0 Dan Dudley born2snipe@gmail.com http://github.com/born2snipe/common-line/commit/dbafe1c3c4f74d450f41c1a80edb609c760d7b83 dbafe1c3c4f74d450f41c1a80edb609c760d7b83 2009-07-23T20:47:49-07:00 2009-07-23T20:47:49-07:00 fixed icons updated load file worker to use the new file analyzer c0b0157de642b60f061e943ea98611d23f019def Dan Dudley born2snipe@gmail.com