+ * Main window of the SWT GUI. + *
+ * + * @author Steffen Herbold + * @version 1.0 + */ public class MainWindow { - protected Shell shell; - + protected Shell shlEventbenchConsole; + protected TabItem consoleTab; protected TabItem sequencesTab; @@ -29,10 +36,12 @@ protected ModelsTabComposite modelsTabComposite; protected DataTabComposite dataTabComposite; - + protected CommandHistoryDialog historyDialog; - - /** + /** + ** Open the window. + *
+ * * @wbp.parser.entryPoint */ @@ -40,9 +49,9 @@ Display display = Display.getDefault(); createContents(); - new SWTConsole(getTextConsoleOutput()); - historyDialog = new CommandHistoryDialog(shell, SWT.NONE); - shell.open(); - shell.layout(); - while (!shell.isDisposed()) { + new SWTConsole(consoleTabComposite.textConsoleOutput); + historyDialog = new CommandHistoryDialog(shlEventbenchConsole, SWT.NONE); + shlEventbenchConsole.open(); + shlEventbenchConsole.layout(); + while (!shlEventbenchConsole.isDisposed()) { if (!display.readAndDispatch()) { display.sleep(); @@ -52,26 +61,36 @@ /** + ** Create contents of the window. + *
*/ protected void createContents() { - shell = new Shell(); - shell.setSize(500, 300); - shell.setText("SWT Application"); - shell.setLayout(new GridLayout(1, false)); - - Menu menu = new Menu(shell, SWT.BAR); - shell.setMenuBar(menu); - + shlEventbenchConsole = new Shell(); + shlEventbenchConsole.setSize(500, 300); + shlEventbenchConsole.setText("EventBench Console"); + shlEventbenchConsole.setLayout(new GridLayout(1, false)); + + createMenu(); + createTabs(); + } + + /** + * Creates the menu of the window. + */ + private void createMenu() { + Menu menu = new Menu(shlEventbenchConsole, SWT.BAR); + shlEventbenchConsole.setMenuBar(menu); + MenuItem mntmFile = new MenuItem(menu, SWT.CASCADE); mntmFile.setText("File"); - + Menu menu_1 = new Menu(mntmFile); mntmFile.setMenu(menu_1); - + MenuItem mntmShowHistory = new MenuItem(menu_1, SWT.NONE); mntmShowHistory.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if( !historyDialog.isOpen()) { + if (!historyDialog.isOpen()) { historyDialog.open(); } @@ -79,12 +98,13 @@ }); mntmShowHistory.setText("Show History"); - + MenuItem mntmExecBatchFile = new MenuItem(menu_1, SWT.NONE); mntmExecBatchFile.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - FileDialog fileDialog = new FileDialog(shell, SWT.OPEN); + FileDialog fileDialog = new FileDialog(shlEventbenchConsole, + SWT.OPEN); String filename = fileDialog.open(); - if( filename!=null ) { + if (filename != null) { String command = "exec '" + filename + "'"; CommandExecuter.getInstance().exec(command); @@ -93,14 +113,15 @@ }); mntmExecBatchFile.setText("Exec. Batch File"); - + new MenuItem(menu_1, SWT.SEPARATOR); - + MenuItem mntmLoad = new MenuItem(menu_1, SWT.NONE); mntmLoad.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - FileDialog fileDialog = new FileDialog(shell, SWT.OPEN); + FileDialog fileDialog = new FileDialog(shlEventbenchConsole, + SWT.OPEN); String filename = fileDialog.open(); - if( filename!=null ) { + if (filename != null) { String command = "load '" + filename + "'"; CommandExecuter.getInstance().exec(command); @@ -109,12 +130,13 @@ }); mntmLoad.setText("Load..."); - + MenuItem mntmSave = new MenuItem(menu_1, SWT.NONE); mntmSave.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); + FileDialog fileDialog = new FileDialog(shlEventbenchConsole, + SWT.SAVE); String filename = fileDialog.open(); - if( filename!=null ) { + if (filename != null) { String command = "save '" + filename + "'"; CommandExecuter.getInstance().exec(command); @@ -123,76 +145,82 @@ }); mntmSave.setText("Save..."); - + new MenuItem(menu_1, SWT.SEPARATOR); - + MenuItem mntmExit = new MenuItem(menu_1, SWT.NONE); mntmExit.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - shell.dispose(); + shlEventbenchConsole.dispose(); } }); mntmExit.setText("Exit"); - + MenuItem mntmHelp = new MenuItem(menu, SWT.CASCADE); mntmHelp.setText("Help"); - + Menu menu_2 = new Menu(mntmHelp); mntmHelp.setMenu(menu_2); - + MenuItem mntmAbout = new MenuItem(menu_2, SWT.NONE); mntmAbout.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - AboutDialog aboutDialog = new AboutDialog(shell, SWT.NONE); + AboutDialog aboutDialog = new AboutDialog(shlEventbenchConsole, + SWT.NONE); aboutDialog.open(); } }); mntmAbout.setText("About"); - - TabFolder tabFolder = new TabFolder(shell, SWT.NONE); + } + + /** + *+ * Creates the central TabFolder of the window. + *
+ */ + private void createTabs() { + TabFolder tabFolder = new TabFolder(shlEventbenchConsole, SWT.NONE); tabFolder.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if( e.item == sequencesTab ) { + if (e.item == sequencesTab) { sequencesTabComposite.updateSequenceList(); - } - else if(e.item == modelsTab ) { + } else if (e.item == modelsTab) { modelsTabComposite.updateModelList(); - } - else if(e.item == dataTab) { + } else if (e.item == dataTab) { dataTabComposite.updateDataList(); } } }); - tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - + tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, + 1)); + consoleTab = new TabItem(tabFolder, SWT.NONE); consoleTab.setText("Console"); - - consoleTabComposite = new ConsoleTabComposite(tabFolder, SWT.NO_BACKGROUND); + + consoleTabComposite = new ConsoleTabComposite(tabFolder, + SWT.NO_BACKGROUND); consoleTab.setControl(consoleTabComposite); - + sequencesTab = new TabItem(tabFolder, SWT.NONE); sequencesTab.setText("Sequences"); - - sequencesTabComposite = new SequencesTabComposite(tabFolder, SWT.NO_BACKGROUND); + + sequencesTabComposite = new SequencesTabComposite(tabFolder, + SWT.NO_BACKGROUND); sequencesTab.setControl(sequencesTabComposite); - + modelsTab = new TabItem(tabFolder, SWT.NONE); modelsTab.setText("Models"); - - modelsTabComposite = new ModelsTabComposite(tabFolder, SWT.NO_BACKGROUND); + + modelsTabComposite = new ModelsTabComposite(tabFolder, + SWT.NO_BACKGROUND); modelsTab.setControl(modelsTabComposite); - + dataTab = new TabItem(tabFolder, SWT.NONE); dataTab.setText("Data"); - + dataTabComposite = new DataTabComposite(tabFolder, SWT.NO_BACKGROUND); dataTab.setControl(dataTabComposite); - - } - public Text getTextConsoleOutput() { - return consoleTabComposite.textConsoleOutput; } } Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/SWTConsole.java =================================================================== --- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/SWTConsole.java (revision 236) +++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/SWTConsole.java (revision 238) @@ -1,5 +1,7 @@ package de.ugoe.cs.eventbench.swt; -import org.eclipse.swt.widgets.Text; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.custom.StyledText; import de.ugoe.cs.util.StringTools; @@ -12,12 +14,12 @@ public class SWTConsole implements IOutputListener, IErrorListener, ITraceListener, ICommandListener { - Text output; + StyledText output; - public SWTConsole(Text output) { + public SWTConsole(StyledText styledText) { Console.getInstance().registerOutputListener(this); Console.getInstance().registerErrorListener(this); Console.getInstance().registerTraceListener(this); Console.getInstance().registerCommandListener(this); - this.output = output; + this.output = styledText; } @@ -29,11 +31,10 @@ @Override public void errorMsg(String errMessage) { - output.append(errMessage); - + appendColored(errMessage, SWT.COLOR_RED); } @Override public void traceMsg(String traceMessage) { - output.append(traceMessage); + appendColored(traceMessage, SWT.COLOR_BLUE); } @@ -42,3 +43,12 @@ output.append("> " + command + StringTools.ENDLINE); } + + private void appendColored(String str, int id) { + StyleRange styleRange = new StyleRange(); + styleRange.start = output.getText().length(); + styleRange.length = str.length(); + styleRange.foreground = output.getDisplay().getSystemColor(id); + output.append(str); + output.setStyleRange(styleRange); + } }