Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AboutDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AboutDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AboutDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -14,59 +15,63 @@ public class AboutDialog extends Dialog { - protected Shell shlAboutEventbenchconsole; - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); + protected Shell shlAboutEventbenchconsole; + private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - /** - * Create the dialog. - * @param parent - * @param style - */ - public AboutDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public AboutDialog(Shell parent, int style) { + super(parent, style); + setText("SWT Dialog"); + } - /** - * Open the dialog. - */ - public void open() { - createContents(); - shlAboutEventbenchconsole.open(); - shlAboutEventbenchconsole.layout(); - Display display = getParent().getDisplay(); - while (!shlAboutEventbenchconsole.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + /** + * Open the dialog. + */ + public void open() { + createContents(); + shlAboutEventbenchconsole.open(); + shlAboutEventbenchconsole.layout(); + Display display = getParent().getDisplay(); + while (!shlAboutEventbenchconsole.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } - /** - * Create contents of the dialog. - */ - private void createContents() { - shlAboutEventbenchconsole = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); - shlAboutEventbenchconsole.setSize(283, 113); - shlAboutEventbenchconsole.setText("About EventBenchConsole"); - - Label lblEventbenchconsole = new Label(shlAboutEventbenchconsole, SWT.CENTER); - lblEventbenchconsole.setBounds(10, 10, 267, 15); - lblEventbenchconsole.setText("EventBenchConsole"); - - Label lblFurtherInformationAbout = new Label(shlAboutEventbenchconsole, SWT.WRAP); - lblFurtherInformationAbout.setBounds(10, 31, 267, 31); - lblFurtherInformationAbout.setText("Further information about this software is provided on our homepage."); - - final Hyperlink hprlnkHttpeventbenchinformatikunigoettingende = formToolkit.createHyperlink(shlAboutEventbenchconsole, "http://eventbench.informatik.uni-goettingen.de", SWT.NONE); - hprlnkHttpeventbenchinformatikunigoettingende.addMouseListener(new MouseAdapter() { - @Override - public void mouseDown(MouseEvent e) { - Program.launch(hprlnkHttpeventbenchinformatikunigoettingende.getText()); - } - }); - hprlnkHttpeventbenchinformatikunigoettingende.setBounds(10, 68, 267, 17); - formToolkit.paintBordersFor(hprlnkHttpeventbenchinformatikunigoettingende); - hprlnkHttpeventbenchinformatikunigoettingende.setBackground(null); + /** + * Create contents of the dialog. + */ + private void createContents() { + shlAboutEventbenchconsole = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); + shlAboutEventbenchconsole.setSize(283, 113); + shlAboutEventbenchconsole.setText("About EventBenchConsole"); - } + Label lblEventbenchconsole = new Label(shlAboutEventbenchconsole, SWT.CENTER); + lblEventbenchconsole.setBounds(10, 10, 267, 15); + lblEventbenchconsole.setText("EventBenchConsole"); + + Label lblFurtherInformationAbout = new Label(shlAboutEventbenchconsole, SWT.WRAP); + lblFurtherInformationAbout.setBounds(10, 31, 267, 31); + lblFurtherInformationAbout + .setText("Further information about this software is provided on our homepage."); + + final Hyperlink hprlnkHttpeventbenchinformatikunigoettingende = + formToolkit.createHyperlink(shlAboutEventbenchconsole, + "http://eventbench.informatik.uni-goettingen.de", SWT.NONE); + hprlnkHttpeventbenchinformatikunigoettingende.addMouseListener(new MouseAdapter() { + @Override + public void mouseDown(MouseEvent e) { + Program.launch(hprlnkHttpeventbenchinformatikunigoettingende.getText()); + } + }); + hprlnkHttpeventbenchinformatikunigoettingende.setBounds(10, 68, 267, 17); + formToolkit.paintBordersFor(hprlnkHttpeventbenchinformatikunigoettingende); + hprlnkHttpeventbenchinformatikunigoettingende.setBackground(null); + + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -9,12 +10,12 @@ abstract public class AbstractInsertEventComposite extends Composite { - protected SortedSet targets; - - public AbstractInsertEventComposite(Composite parent, int style, SortedSet targets) { - super(parent, style); - this.targets = targets; - } - - public abstract Event getEvent(); + protected SortedSet targets; + + public AbstractInsertEventComposite(Composite parent, int style, SortedSet targets) { + super(parent, style); + this.targets = targets; + } + + public abstract Event getEvent(); } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/CommandHistoryDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -32,148 +33,153 @@ public class CommandHistoryDialog extends Dialog implements ICommandListener { - - protected java.util.List history = new LinkedList(); - - protected List commandHistoryList; - protected Shell shell; - - boolean isOpen; - /** - * Create the dialog. - * @param parent - * @param style - */ - public CommandHistoryDialog(Shell parent, int style) { - super(parent, style); - setText("Command History"); - isOpen = false; - Console.getInstance().registerCommandListener(this); - } + protected java.util.List history = new LinkedList(); - /** - * Open the dialog. - */ - public void open() { - createContents(); - shell.open(); - shell.layout(); - isOpen = true; - Display display = getParent().getDisplay(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + protected List commandHistoryList; + protected Shell shell; - /** - * Create contents of the dialog. - */ - private void createContents() { - shell = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.RESIZE); - shell.addDisposeListener(new DisposeListener() { - public void widgetDisposed(DisposeEvent arg0) { - isOpen = false; - } - }); - shell.setSize(450, 300); - shell.setText(getText()); - shell.setLayout(new GridLayout(3, false)); - - Label lblRecentCommands = new Label(shell, SWT.NONE); - lblRecentCommands.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); - lblRecentCommands.setText("Recent Commands:"); - new Label(shell, SWT.NONE); - - commandHistoryList = new List(shell, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI); - commandHistoryList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); - for( String command : history ) { - commandHistoryList.add(command); - } - - Button btnExec = new Button(shell, SWT.NONE); - btnExec.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - for( String command : commandHistoryList.getSelection() ) { - CommandExecuter.getInstance().exec(command); - } - } - }); - btnExec.setText("Execute"); - - Button btnCopyToClipboard = new Button(shell, SWT.NONE); - btnCopyToClipboard.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - StringSelection content = new StringSelection(getSelectedCommands()); - clipboard.setContents(content, null); - } - }); - btnCopyToClipboard.setText("Copy to Clipboard"); - - Button btnCreateBatchfile = new Button(shell, SWT.NONE); - btnCreateBatchfile.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); - String filename = fileDialog.open(); - if( filename!=null ) { - File file = new File(filename); - boolean fileCreated; - try { - fileCreated = file.createNewFile(); - if (!fileCreated) { - Console.traceln("Created batchfile " + filename); - } else { - Console.traceln("Overwrote file " + filename); - } - } catch (IOException e) { - Console.printerrln("Unable to create file " + filename); - Console.logException(e); - } - OutputStreamWriter writer = null; - try { - writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); - } catch (IOException e) { - Console.printerrln("Unable to open file for writing (read-only file):" - + filename); - Console.logException(e); - return; - } - try { - writer.write(getSelectedCommands()); - writer.close(); - } catch (IOException e) { - Console.printerrln("Unable to write to file."); - Console.logException(e); - } - } - } - }); - btnCreateBatchfile.setText("Create Batchfile"); + boolean isOpen; - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public CommandHistoryDialog(Shell parent, int style) { + super(parent, style); + setText("Command History"); + isOpen = false; + Console.getInstance().registerCommandListener(this); + } - @Override - public void commandNotification(String command) { - history.add(command); - if( isOpen ) { - commandHistoryList.add(command); - } - } - - public boolean isOpen() { - return isOpen; - } - - private String getSelectedCommands() { - StringBuilder commands = new StringBuilder(); - for( String command : commandHistoryList.getSelection()) { - commands.append(command + StringTools.ENDLINE); - } - return commands.toString(); - } + /** + * Open the dialog. + */ + public void open() { + createContents(); + shell.open(); + shell.layout(); + isOpen = true; + Display display = getParent().getDisplay(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } + + /** + * Create contents of the dialog. + */ + private void createContents() { + shell = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.RESIZE); + shell.addDisposeListener(new DisposeListener() { + public void widgetDisposed(DisposeEvent arg0) { + isOpen = false; + } + }); + shell.setSize(450, 300); + shell.setText(getText()); + shell.setLayout(new GridLayout(3, false)); + + Label lblRecentCommands = new Label(shell, SWT.NONE); + lblRecentCommands.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); + lblRecentCommands.setText("Recent Commands:"); + new Label(shell, SWT.NONE); + + commandHistoryList = new List(shell, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI); + commandHistoryList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); + for (String command : history) { + commandHistoryList.add(command); + } + + Button btnExec = new Button(shell, SWT.NONE); + btnExec.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + for (String command : commandHistoryList.getSelection()) { + CommandExecuter.getInstance().exec(command); + } + } + }); + btnExec.setText("Execute"); + + Button btnCopyToClipboard = new Button(shell, SWT.NONE); + btnCopyToClipboard.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + StringSelection content = new StringSelection(getSelectedCommands()); + clipboard.setContents(content, null); + } + }); + btnCopyToClipboard.setText("Copy to Clipboard"); + + Button btnCreateBatchfile = new Button(shell, SWT.NONE); + btnCreateBatchfile.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); + String filename = fileDialog.open(); + if (filename != null) { + File file = new File(filename); + boolean fileCreated; + try { + fileCreated = file.createNewFile(); + if (!fileCreated) { + Console.traceln("Created batchfile " + filename); + } + else { + Console.traceln("Overwrote file " + filename); + } + } + catch (IOException e) { + Console.printerrln("Unable to create file " + filename); + Console.logException(e); + } + OutputStreamWriter writer = null; + try { + writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); + } + catch (IOException e) { + Console.printerrln("Unable to open file for writing (read-only file):" + + filename); + Console.logException(e); + return; + } + try { + writer.write(getSelectedCommands()); + writer.close(); + } + catch (IOException e) { + Console.printerrln("Unable to write to file."); + Console.logException(e); + } + } + } + }); + btnCreateBatchfile.setText("Create Batchfile"); + + } + + @Override + public void commandNotification(String command) { + history.add(command); + if (isOpen) { + commandHistoryList.add(command); + } + } + + public boolean isOpen() { + return isOpen; + } + + private String getSelectedCommands() { + StringBuilder commands = new StringBuilder(); + for (String command : commandHistoryList.getSelection()) { + commands.append(command + StringTools.ENDLINE); + } + return commands.toString(); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ConsoleTabComposite.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ConsoleTabComposite.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ConsoleTabComposite.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -17,10 +18,9 @@ import org.eclipse.swt.events.KeyEvent; - import de.ugoe.cs.util.console.CommandExecuter; /** *

- * Implements the composite for the console tab in the applications main window. + * Implements the composite for the console tab in the applications main window. *

* @@ -30,70 +30,73 @@ public class ConsoleTabComposite extends Composite { - protected Text textCommand; - - protected StyledText textConsoleOutput; - - /** - * Create the composite. - * @param parent - * @param style - */ - public ConsoleTabComposite(Composite parent, int style) { - super(parent, style); - createContents(); - } - - private void createContents() { - setLayout(new GridLayout(3, false)); - - Label lblCommand = new Label(this, SWT.NONE); - lblCommand.setText("Command:"); - - textCommand = new Text(this, SWT.BORDER); - textCommand.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - if( e.keyCode==SWT.CR ) { - executeCommand(); - } - } - }); - GridData gd_textCommand = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1); - gd_textCommand.widthHint = 304; - textCommand.setLayoutData(gd_textCommand); - textCommand.setFocus(); - - Button btnEnter = new Button(this, SWT.NONE); - btnEnter.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - executeCommand(); - } - }); - btnEnter.setText("Enter"); - - textConsoleOutput = new StyledText(this, SWT.BORDER | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CANCEL); - GridData gd_textConsoleOutput = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1); - gd_textConsoleOutput.heightHint = 102; - gd_textConsoleOutput.widthHint = 456; - textConsoleOutput.setLayoutData(gd_textConsoleOutput); - textConsoleOutput.addListener(SWT.Modify, new Listener(){ - public void handleEvent(Event e){ - textConsoleOutput.setTopIndex(textConsoleOutput.getLineCount() - 1); - } - }); + protected Text textCommand; - } - - private void executeCommand() { - String command = textCommand.getText().trim(); - CommandExecuter.getInstance().exec(command); - textCommand.setText(""); - } + protected StyledText textConsoleOutput; - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } + /** + * Create the composite. + * + * @param parent + * @param style + */ + public ConsoleTabComposite(Composite parent, int style) { + super(parent, style); + createContents(); + } + + private void createContents() { + setLayout(new GridLayout(3, false)); + + Label lblCommand = new Label(this, SWT.NONE); + lblCommand.setText("Command:"); + + textCommand = new Text(this, SWT.BORDER); + textCommand.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + if (e.keyCode == SWT.CR) { + executeCommand(); + } + } + }); + GridData gd_textCommand = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1); + gd_textCommand.widthHint = 304; + textCommand.setLayoutData(gd_textCommand); + textCommand.setFocus(); + + Button btnEnter = new Button(this, SWT.NONE); + btnEnter.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + executeCommand(); + } + }); + btnEnter.setText("Enter"); + + textConsoleOutput = + new StyledText(this, SWT.BORDER | SWT.READ_ONLY | SWT.H_SCROLL | SWT.V_SCROLL | + SWT.CANCEL); + GridData gd_textConsoleOutput = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1); + gd_textConsoleOutput.heightHint = 102; + gd_textConsoleOutput.widthHint = 456; + textConsoleOutput.setLayoutData(gd_textConsoleOutput); + textConsoleOutput.addListener(SWT.Modify, new Listener() { + public void handleEvent(Event e) { + textConsoleOutput.setTopIndex(textConsoleOutput.getLineCount() - 1); + } + }); + + } + + private void executeCommand() { + String command = textCommand.getText().trim(); + CommandExecuter.getInstance().exec(command); + textCommand.setText(""); + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/DataTabComposite.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -19,95 +20,99 @@ public class DataTabComposite extends Composite { - List dataList; - - /** - * Create the composite. - * @param parent - * @param style - */ - public DataTabComposite(Composite parent, int style) { - super(parent, style); - createContent(); - } - - private void createContent() { - setLayout(new GridLayout(3, false)); - - dataList = new List(this, SWT.BORDER | SWT.V_SCROLL); - dataList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); - - Button btnLoad = new Button(this, SWT.NONE); - btnLoad.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - GetObjectNameDialog getObjectNameDialog = new GetObjectNameDialog(getShell(), SWT.NONE); - getObjectNameDialog.open(); - String objectName = getObjectNameDialog.getObjectName(); - if( "".equals(objectName) ) { - return; - } - FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN); - String filename = fileDialog.open(); - if( filename==null ) { - return; - } - String command = "loadObject " + filename + " " + objectName; - CommandExecuter.getInstance().exec(command); - updateDataList(); - } - }); - btnLoad.setText("Load"); - - Button btnSave = new Button(this, SWT.NONE); - btnSave.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedStrings = dataList.getSelection(); - if( selectedStrings.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - return; - } - if( selectedStrings.length>1 ) { - MessageBox messageBox = new MessageBox(getShell(), SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Only one object storable at a time." + StringTools.ENDLINE + "Please select only one object."); - return; - } - FileDialog fileDialog = new FileDialog(getShell(), SWT.SAVE); - String filename = fileDialog.open(); - if( filename==null ) { - return; - } - String command = "saveObject " + filename + " " + selectedStrings[0]; - CommandExecuter.getInstance().exec(command); - } - }); - btnSave.setText("Save"); - - Button btnDelete_2 = new Button(this, SWT.NONE); - btnDelete_2.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if( SWTHelpers.deleteSelectedFromStorage(dataList)) { - updateDataList(); - } else { - SWTHelpers.noSelectionError(getShell()); - } - } - }); - btnDelete_2.setText("Delete"); - } + List dataList; - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public void updateDataList() { - dataList.removeAll(); - for( String sequencesName : GlobalDataContainer.getInstance().getAllKeys() ) { - dataList.add(sequencesName); - } - } + /** + * Create the composite. + * + * @param parent + * @param style + */ + public DataTabComposite(Composite parent, int style) { + super(parent, style); + createContent(); + } + + private void createContent() { + setLayout(new GridLayout(3, false)); + + dataList = new List(this, SWT.BORDER | SWT.V_SCROLL); + dataList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); + + Button btnLoad = new Button(this, SWT.NONE); + btnLoad.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + GetObjectNameDialog getObjectNameDialog = + new GetObjectNameDialog(getShell(), SWT.NONE); + getObjectNameDialog.open(); + String objectName = getObjectNameDialog.getObjectName(); + if ("".equals(objectName)) { + return; + } + FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN); + String filename = fileDialog.open(); + if (filename == null) { + return; + } + String command = "loadObject " + filename + " " + objectName; + CommandExecuter.getInstance().exec(command); + updateDataList(); + } + }); + btnLoad.setText("Load"); + + Button btnSave = new Button(this, SWT.NONE); + btnSave.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedStrings = dataList.getSelection(); + if (selectedStrings.length == 0) { + SWTHelpers.noSelectionError(getShell()); + return; + } + if (selectedStrings.length > 1) { + MessageBox messageBox = new MessageBox(getShell(), SWT.ERROR); + messageBox.setText("Error"); + messageBox.setMessage("Only one object storable at a time." + + StringTools.ENDLINE + "Please select only one object."); + return; + } + FileDialog fileDialog = new FileDialog(getShell(), SWT.SAVE); + String filename = fileDialog.open(); + if (filename == null) { + return; + } + String command = "saveObject " + filename + " " + selectedStrings[0]; + CommandExecuter.getInstance().exec(command); + } + }); + btnSave.setText("Save"); + + Button btnDelete_2 = new Button(this, SWT.NONE); + btnDelete_2.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (SWTHelpers.deleteSelectedFromStorage(dataList)) { + updateDataList(); + } + else { + SWTHelpers.noSelectionError(getShell()); + } + } + }); + btnDelete_2.setText("Delete"); + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + public void updateDataList() { + dataList.removeAll(); + for (String sequencesName : GlobalDataContainer.getInstance().getAllKeys()) { + dataList.add(sequencesName); + } + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -23,170 +24,173 @@ public class EditSequenceDialog extends Dialog { - protected Shell shell; - private Table table; - private TableColumn tblclmnEventType; - private TableColumn tblclmnEventTarget; + protected Shell shell; + private Table table; + private TableColumn tblclmnEventType; + private TableColumn tblclmnEventTarget; - private java.util.List sequence; - private SortedSet targets; + private java.util.List sequence; + private SortedSet targets; - /** - * Create the dialog. - * - * @param parent - * @param style - */ - public EditSequenceDialog(Shell parent, int style, SortedSet targets) { - super(parent, style); - setText("SWT Dialog"); - this.targets = targets; - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public EditSequenceDialog(Shell parent, int style, SortedSet targets) { + super(parent, style); + setText("SWT Dialog"); + this.targets = targets; + } - /** - * Open the dialog. - */ - public void open(java.util.List sequence) { - this.sequence = sequence; - createContents(); - shell.open(); - shell.layout(); - Display display = getParent().getDisplay(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + /** + * Open the dialog. + */ + public void open(java.util.List sequence) { + this.sequence = sequence; + createContents(); + shell.open(); + shell.layout(); + Display display = getParent().getDisplay(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } - /** - * Create contents of the dialog. - */ - private void createContents() { - shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER - | SWT.APPLICATION_MODAL); - shell.setSize(450, 300); - shell.setText(getText()); - shell.setLayout(new GridLayout(3, false)); + /** + * Create contents of the dialog. + */ + private void createContents() { + shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER | SWT.APPLICATION_MODAL); + shell.setSize(450, 300); + shell.setText(getText()); + shell.setLayout(new GridLayout(3, false)); - table = new Table(shell, SWT.BORDER | SWT.FULL_SELECTION); - table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); - table.setHeaderVisible(true); - table.setLinesVisible(true); + table = new Table(shell, SWT.BORDER | SWT.FULL_SELECTION); + table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1)); + table.setHeaderVisible(true); + table.setLinesVisible(true); - tblclmnEventType = new TableColumn(table, SWT.NONE); - tblclmnEventType.setWidth(100); - tblclmnEventType.setText("Event Type"); + tblclmnEventType = new TableColumn(table, SWT.NONE); + tblclmnEventType.setWidth(100); + tblclmnEventType.setText("Event Type"); - tblclmnEventTarget = new TableColumn(table, SWT.NONE); - tblclmnEventTarget.setWidth(100); - tblclmnEventTarget.setText("Event Target"); + tblclmnEventTarget = new TableColumn(table, SWT.NONE); + tblclmnEventTarget.setWidth(100); + tblclmnEventTarget.setText("Event Target"); - // this listener makes the table entries multiline - Listener paintListener = new Listener() { - public void handleEvent(org.eclipse.swt.widgets.Event event) { - switch (event.type) { - case SWT.MeasureItem: { - TableItem item = (TableItem) event.item; - String text = item.getText(event.index); - Point size = event.gc.textExtent(text); - event.width = size.x; - event.height = Math.max(event.height, size.y); - break; - } - case SWT.PaintItem: { - TableItem item = (TableItem) event.item; - String text = item.getText(event.index); - Point size = event.gc.textExtent(text); - int offset = event.index == 0 ? Math.max(0, - (event.height - size.y) / 2) : 0; - event.gc.drawText(text, event.x, event.y + offset, true); - break; - } - case SWT.EraseItem: - event.detail &= ~SWT.FOREGROUND; - break; - default: - break; - } - } + // this listener makes the table entries multiline + Listener paintListener = new Listener() { + public void handleEvent(org.eclipse.swt.widgets.Event event) { + switch (event.type) + { + case SWT.MeasureItem: { + TableItem item = (TableItem) event.item; + String text = item.getText(event.index); + Point size = event.gc.textExtent(text); + event.width = size.x; + event.height = Math.max(event.height, size.y); + break; + } + case SWT.PaintItem: { + TableItem item = (TableItem) event.item; + String text = item.getText(event.index); + Point size = event.gc.textExtent(text); + int offset = + event.index == 0 ? Math.max(0, (event.height - size.y) / 2) : 0; + event.gc.drawText(text, event.x, event.y + offset, true); + break; + } + case SWT.EraseItem: + event.detail &= ~SWT.FOREGROUND; + break; + default: + break; + } + } - }; - table.addListener(SWT.MeasureItem, paintListener); - table.addListener(SWT.PaintItem, paintListener); - table.addListener(SWT.EraseItem, paintListener); + }; + table.addListener(SWT.MeasureItem, paintListener); + table.addListener(SWT.PaintItem, paintListener); + table.addListener(SWT.EraseItem, paintListener); - updateTableContents(); + updateTableContents(); - Button btnInsertBefore = new Button(shell, SWT.NONE); - btnInsertBefore.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - int index = table.getSelectionIndex(); - if (index == -1) { - MessageBox messageBox = new MessageBox(shell, SWT.ERROR); - messageBox.setMessage("No event selected!"); - messageBox.setText("Error"); - messageBox.open(); - } else { - openInsertDialog(index); - } - } - }); - btnInsertBefore.setText("Insert Before"); + Button btnInsertBefore = new Button(shell, SWT.NONE); + btnInsertBefore.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + int index = table.getSelectionIndex(); + if (index == -1) { + MessageBox messageBox = new MessageBox(shell, SWT.ERROR); + messageBox.setMessage("No event selected!"); + messageBox.setText("Error"); + messageBox.open(); + } + else { + openInsertDialog(index); + } + } + }); + btnInsertBefore.setText("Insert Before"); - Button btnInsertAfter = new Button(shell, SWT.NONE); - btnInsertAfter.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - int index = table.getSelectionIndex(); - if (index == -1) { - MessageBox messageBox = new MessageBox(shell, SWT.ERROR); - messageBox.setMessage("No event selected!"); - messageBox.setText("Error"); - messageBox.open(); - } else { - openInsertDialog(index + 1); - } - } - }); - btnInsertAfter.setText("Insert After"); + Button btnInsertAfter = new Button(shell, SWT.NONE); + btnInsertAfter.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + int index = table.getSelectionIndex(); + if (index == -1) { + MessageBox messageBox = new MessageBox(shell, SWT.ERROR); + messageBox.setMessage("No event selected!"); + messageBox.setText("Error"); + messageBox.open(); + } + else { + openInsertDialog(index + 1); + } + } + }); + btnInsertAfter.setText("Insert After"); - Button btnClose = new Button(shell, SWT.NONE); - btnClose.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shell.dispose(); - } - }); - btnClose.setText("Close"); + Button btnClose = new Button(shell, SWT.NONE); + btnClose.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shell.dispose(); + } + }); + btnClose.setText("Close"); - } + } - private void updateTableContents() { - table.removeAll(); - for (Event event : sequence) { - TableItem tableItem = new TableItem(table, SWT.NONE); - String target = event.getTarget(); - if (target != null) { - // the target is split into multiple lines, as one line may - // only be 259 characters in tables with Windows - target = target.replace("].", "].\n"); - } - tableItem.setText(new String[] { event.getType().toString(), target }); - } - for (int i = 0; i < table.getColumnCount(); i++) { - table.getColumn(i).pack(); - } - } + private void updateTableContents() { + table.removeAll(); + for (Event event : sequence) { + TableItem tableItem = new TableItem(table, SWT.NONE); + // TODO check if toString is sufficient + String target = event.getTarget().toString(); + if (target != null) { + // the target is split into multiple lines, as one line may + // only be 259 characters in tables with Windows + target = target.replace("].", "].\n"); + } + tableItem.setText(new String[] + { event.getType().toString(), target }); + } + for (int i = 0; i < table.getColumnCount(); i++) { + table.getColumn(i).pack(); + } + } - private void openInsertDialog(int position) { - InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, - SWT.NONE, targets); - Event event = insertDialog.open(); - if (event != null) { - sequence.add(position, event); - updateTableContents(); - } - } + private void openInsertDialog(int position) { + InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, SWT.NONE, targets); + Event event = insertDialog.open(); + if (event != null) { + sequence.add(position, event); + updateTableContents(); + } + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GenerateSequencesDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GenerateSequencesDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GenerateSequencesDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -22,185 +23,193 @@ public class GenerateSequencesDialog extends Dialog { - private String processName; - - protected Button btnNumberAll; - protected Button btnLengthAll; - protected Spinner numberSpinner; - protected Spinner iterationsSpinner; - protected Spinner minLengthSpinner; - protected Spinner maxLengthSpinner; - - protected Shell shlGenerateSequences; - private Text sequencesNameText; - private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); - - /** - * Create the dialog. - * @param parent - * @param style - */ - public GenerateSequencesDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } - - /** - * Open the dialog. - */ - public void open() { - createContents(); - shlGenerateSequences.open(); - shlGenerateSequences.layout(); - Display display = getParent().getDisplay(); - while (!shlGenerateSequences.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } - - /** - * Create contents of the dialog. - */ - private void createContents() { - shlGenerateSequences = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); - shlGenerateSequences.setSize(201, 303); - shlGenerateSequences.setText("Generate Sequences"); - shlGenerateSequences.setLayout(new GridLayout(2, false)); - - Group group = new Group(shlGenerateSequences, SWT.NONE); - group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - group.setText("Name"); - group.setLayout(new GridLayout(1, false)); - - sequencesNameText = new Text(group, SWT.BORDER); - sequencesNameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - - Group grpNumber = new Group(shlGenerateSequences, SWT.NONE); - grpNumber.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - grpNumber.setText("Number"); - grpNumber.setLayout(new GridLayout(2, false)); - - numberSpinner = new Spinner(grpNumber, SWT.BORDER); - numberSpinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - numberSpinner.setMinimum(1); - numberSpinner.setMaximum(Integer.MAX_VALUE); - - btnNumberAll = new Button(grpNumber, SWT.CHECK); - btnNumberAll.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - numberSpinner.setEnabled(!btnNumberAll.getSelection()); - btnLengthAll.setEnabled(!btnNumberAll.getSelection()); - iterationsSpinner.setEnabled(!btnNumberAll.getSelection()); - } - }); - btnNumberAll.setText("All"); - - Group grpIterations = new Group(shlGenerateSequences, SWT.NONE); - grpIterations.setLayout(new GridLayout(1, false)); - grpIterations.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - grpIterations.setText("Iterations"); - - iterationsSpinner = new Spinner(grpIterations, SWT.BORDER); - iterationsSpinner.setMinimum(1); - iterationsSpinner.setMaximum(Integer.MAX_VALUE); - iterationsSpinner.setSelection(100000); - iterationsSpinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - - Group grpLength = new Group(shlGenerateSequences, SWT.NONE); - grpLength.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - grpLength.setText("Length"); - grpLength.setLayout(new GridLayout(4, false)); - - btnLengthAll = new Button(grpLength, SWT.CHECK); - btnLengthAll.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - minLengthSpinner.setEnabled(!btnLengthAll.getSelection()); - maxLengthSpinner.setEnabled(!btnLengthAll.getSelection()); - } - }); - btnLengthAll.setText("All"); - new Label(grpLength, SWT.NONE); - new Label(grpLength, SWT.NONE); - new Label(grpLength, SWT.NONE); - - Label label = new Label(grpLength, SWT.NONE); - label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); - label.setText("Min."); - - minLengthSpinner = new Spinner(grpLength, SWT.BORDER); - minLengthSpinner.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - minLengthSpinner.setMinimum(1); - - Label label_1 = new Label(grpLength, SWT.NONE); - label_1.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true, 1, 1)); - label_1.setText("Max."); - - maxLengthSpinner = new Spinner(grpLength, SWT.BORDER); - maxLengthSpinner.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - maxLengthSpinner.setToolTipText("0 means no limitations"); - maxLengthSpinner.setMinimum(1); - - Button btnGenerate = formToolkit.createButton(shlGenerateSequences, "Generate!", SWT.NONE); - btnGenerate.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if("".equals(sequencesNameText.getText())) { - MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Sequences name not defined!"); - messageBox.open(); - return; - } - String sequencesName = sequencesNameText.getText(); - int number = numberSpinner.getSelection(); - int minLength = minLengthSpinner.getSelection(); - int maxLength = maxLengthSpinner.getSelection(); - int maxIter = iterationsSpinner.getSelection(); - if( maxIter<=number ) { - maxIter = number; - } - String command = ""; - if( btnNumberAll.getSelection() ) { - if( minLength>maxLength ) { - MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Min. length must be smaller than or equal to max. length!"); - messageBox.open(); - return; - } - command = "generateFixedLengthSequences " + processName + " " + sequencesName + " " + minLength + " " + maxLength + " true"; - } else { - command = "generateRandomSequences " + processName + " " + sequencesName + " " + number + " " + maxIter; - if( !btnLengthAll.getSelection() ) { - if( minLength>maxLength ) { - MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Min. length must be smaller than or equal to max. length!"); - messageBox.open(); - return; - } - command += " " + minLength + " " + maxLength; - } - } - CommandExecuter.getInstance().exec(command); - shlGenerateSequences.dispose(); - } - }); - - Button btnAbort = formToolkit.createButton(shlGenerateSequences, "Abort", SWT.NONE); - btnAbort.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shlGenerateSequences.dispose(); - } - }); - - } - - public void setProcessName(String name) { - this.processName = name; - } + private String processName; + + protected Button btnNumberAll; + protected Button btnLengthAll; + protected Spinner numberSpinner; + protected Spinner iterationsSpinner; + protected Spinner minLengthSpinner; + protected Spinner maxLengthSpinner; + + protected Shell shlGenerateSequences; + private Text sequencesNameText; + private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); + + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public GenerateSequencesDialog(Shell parent, int style) { + super(parent, style); + setText("SWT Dialog"); + } + + /** + * Open the dialog. + */ + public void open() { + createContents(); + shlGenerateSequences.open(); + shlGenerateSequences.layout(); + Display display = getParent().getDisplay(); + while (!shlGenerateSequences.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } + + /** + * Create contents of the dialog. + */ + private void createContents() { + shlGenerateSequences = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); + shlGenerateSequences.setSize(201, 303); + shlGenerateSequences.setText("Generate Sequences"); + shlGenerateSequences.setLayout(new GridLayout(2, false)); + + Group group = new Group(shlGenerateSequences, SWT.NONE); + group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); + group.setText("Name"); + group.setLayout(new GridLayout(1, false)); + + sequencesNameText = new Text(group, SWT.BORDER); + sequencesNameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + + Group grpNumber = new Group(shlGenerateSequences, SWT.NONE); + grpNumber.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); + grpNumber.setText("Number"); + grpNumber.setLayout(new GridLayout(2, false)); + + numberSpinner = new Spinner(grpNumber, SWT.BORDER); + numberSpinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + numberSpinner.setMinimum(1); + numberSpinner.setMaximum(Integer.MAX_VALUE); + + btnNumberAll = new Button(grpNumber, SWT.CHECK); + btnNumberAll.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + numberSpinner.setEnabled(!btnNumberAll.getSelection()); + btnLengthAll.setEnabled(!btnNumberAll.getSelection()); + iterationsSpinner.setEnabled(!btnNumberAll.getSelection()); + } + }); + btnNumberAll.setText("All"); + + Group grpIterations = new Group(shlGenerateSequences, SWT.NONE); + grpIterations.setLayout(new GridLayout(1, false)); + grpIterations.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); + grpIterations.setText("Iterations"); + + iterationsSpinner = new Spinner(grpIterations, SWT.BORDER); + iterationsSpinner.setMinimum(1); + iterationsSpinner.setMaximum(Integer.MAX_VALUE); + iterationsSpinner.setSelection(100000); + iterationsSpinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + + Group grpLength = new Group(shlGenerateSequences, SWT.NONE); + grpLength.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); + grpLength.setText("Length"); + grpLength.setLayout(new GridLayout(4, false)); + + btnLengthAll = new Button(grpLength, SWT.CHECK); + btnLengthAll.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + minLengthSpinner.setEnabled(!btnLengthAll.getSelection()); + maxLengthSpinner.setEnabled(!btnLengthAll.getSelection()); + } + }); + btnLengthAll.setText("All"); + new Label(grpLength, SWT.NONE); + new Label(grpLength, SWT.NONE); + new Label(grpLength, SWT.NONE); + + Label label = new Label(grpLength, SWT.NONE); + label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1)); + label.setText("Min."); + + minLengthSpinner = new Spinner(grpLength, SWT.BORDER); + minLengthSpinner.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + minLengthSpinner.setMinimum(1); + + Label label_1 = new Label(grpLength, SWT.NONE); + label_1.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true, 1, 1)); + label_1.setText("Max."); + + maxLengthSpinner = new Spinner(grpLength, SWT.BORDER); + maxLengthSpinner.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + maxLengthSpinner.setToolTipText("0 means no limitations"); + maxLengthSpinner.setMinimum(1); + + Button btnGenerate = formToolkit.createButton(shlGenerateSequences, "Generate!", SWT.NONE); + btnGenerate.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if ("".equals(sequencesNameText.getText())) { + MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); + messageBox.setText("Error"); + messageBox.setMessage("Sequences name not defined!"); + messageBox.open(); + return; + } + String sequencesName = sequencesNameText.getText(); + int number = numberSpinner.getSelection(); + int minLength = minLengthSpinner.getSelection(); + int maxLength = maxLengthSpinner.getSelection(); + int maxIter = iterationsSpinner.getSelection(); + if (maxIter <= number) { + maxIter = number; + } + String command = ""; + if (btnNumberAll.getSelection()) { + if (minLength > maxLength) { + MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); + messageBox.setText("Error"); + messageBox + .setMessage("Min. length must be smaller than or equal to max. length!"); + messageBox.open(); + return; + } + command = + "generateFixedLengthSequences " + processName + " " + sequencesName + " " + + minLength + " " + maxLength + " true"; + } + else { + command = + "generateRandomSequences " + processName + " " + sequencesName + " " + + number + " " + maxIter; + if (!btnLengthAll.getSelection()) { + if (minLength > maxLength) { + MessageBox messageBox = new MessageBox(shlGenerateSequences, SWT.ERROR); + messageBox.setText("Error"); + messageBox + .setMessage("Min. length must be smaller than or equal to max. length!"); + messageBox.open(); + return; + } + command += " " + minLength + " " + maxLength; + } + } + CommandExecuter.getInstance().exec(command); + shlGenerateSequences.dispose(); + } + }); + + Button btnAbort = formToolkit.createButton(shlGenerateSequences, "Abort", SWT.NONE); + btnAbort.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shlGenerateSequences.dispose(); + } + }); + + } + + public void setProcessName(String name) { + this.processName = name; + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GetObjectNameDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GetObjectNameDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/GetObjectNameDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -16,81 +17,82 @@ public class GetObjectNameDialog extends Dialog { - String objectName = ""; - - protected Shell shlObjectName; - private Text text; + String objectName = ""; - /** - * Create the dialog. - * @param parent - * @param style - */ - public GetObjectNameDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } + protected Shell shlObjectName; + private Text text; - /** - * Open the dialog. - */ - public void open() { - createContents(); - shlObjectName.open(); - shlObjectName.layout(); - Display display = getParent().getDisplay(); - while (!shlObjectName.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public GetObjectNameDialog(Shell parent, int style) { + super(parent, style); + setText("SWT Dialog"); + } - /** - * Create contents of the dialog. - */ - private void createContents() { - shlObjectName = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); - shlObjectName.setSize(171, 109); - shlObjectName.setText("Object Name"); - shlObjectName.setLayout(new GridLayout(2, false)); - - Label lblPleaseEnterThe = new Label(shlObjectName, SWT.NONE); - lblPleaseEnterThe.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); - lblPleaseEnterThe.setText("Please enter the object name:"); - - text = new Text(shlObjectName, SWT.BORDER); - text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - - Button btnOk = new Button(shlObjectName, SWT.NONE); - btnOk.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if( text.getText().equals("") ) { - MessageBox messageBox = new MessageBox(shlObjectName, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("No name entered!"); - return; - } - objectName = text.getText(); - shlObjectName.dispose(); - } - }); - btnOk.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - btnOk.setText("Ok"); - - Button btnAbort = new Button(shlObjectName, SWT.NONE); - btnAbort.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shlObjectName.dispose(); - } - }); - btnAbort.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - btnAbort.setText("Abort"); + /** + * Open the dialog. + */ + public void open() { + createContents(); + shlObjectName.open(); + shlObjectName.layout(); + Display display = getParent().getDisplay(); + while (!shlObjectName.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } - } - - public String getObjectName() { - return objectName; - } + /** + * Create contents of the dialog. + */ + private void createContents() { + shlObjectName = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL); + shlObjectName.setSize(171, 109); + shlObjectName.setText("Object Name"); + shlObjectName.setLayout(new GridLayout(2, false)); + + Label lblPleaseEnterThe = new Label(shlObjectName, SWT.NONE); + lblPleaseEnterThe.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1)); + lblPleaseEnterThe.setText("Please enter the object name:"); + + text = new Text(shlObjectName, SWT.BORDER); + text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); + + Button btnOk = new Button(shlObjectName, SWT.NONE); + btnOk.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (text.getText().equals("")) { + MessageBox messageBox = new MessageBox(shlObjectName, SWT.ERROR); + messageBox.setText("Error"); + messageBox.setMessage("No name entered!"); + return; + } + objectName = text.getText(); + shlObjectName.dispose(); + } + }); + btnOk.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + btnOk.setText("Ok"); + + Button btnAbort = new Button(shlObjectName, SWT.NONE); + btnAbort.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shlObjectName.dispose(); + } + }); + btnAbort.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + btnAbort.setText("Abort"); + + } + + public String getObjectName() { + return objectName; + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -21,86 +22,89 @@ public class InsertAssertionDialog extends Dialog { - protected Event result; - protected Shell shell; - - private TabFolder tabFolder; - - List insertEventComposites; - SortedSet targets; + protected Event result; + protected Shell shell; - /** - * Create the dialog. - * @param parent - * @param style - */ - public InsertAssertionDialog(Shell parent, int style, SortedSet targets) { - super(parent, style); - setText("SWT Dialog"); - this.targets = targets; - } + private TabFolder tabFolder; - /** - * Open the dialog. - * @return the result - */ - public Event open() { - result = null; - insertEventComposites = new ArrayList(); - createContents(); - shell.open(); - shell.layout(); - Display display = getParent().getDisplay(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - return result; - } + List insertEventComposites; + SortedSet targets; - /** - * Create contents of the dialog. - */ - private void createContents() { - shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER | SWT.APPLICATION_MODAL); - shell.setSize(450, 300); - shell.setText(getText()); - shell.setLayout(new GridLayout(2, false)); - - tabFolder = new TabFolder(shell, SWT.NONE); - tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); - - - TabItem tbtmTextEquals = new TabItem(tabFolder, SWT.NONE); - tbtmTextEquals.setText("TextEquals"); - AbstractInsertEventComposite compTextEquals = new InsertTextEquals(tabFolder, SWT.NO_BACKGROUND, targets); - tbtmTextEquals.setControl(compTextEquals); - insertEventComposites.add(compTextEquals); - - TabItem tbtmFileEquals = new TabItem(tabFolder, SWT.NONE); - tbtmFileEquals.setText("FileEquals"); - AbstractInsertEventComposite compFileEquals = new InsertFileEquals(tabFolder, SWT.NO_BACKGROUND, targets); - tbtmFileEquals.setControl(compFileEquals); - insertEventComposites.add(compFileEquals); - - Button btnInsert = new Button(shell, SWT.NONE); - btnInsert.setText("Insert"); - btnInsert.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - int index = tabFolder.getSelectionIndex(); - result = insertEventComposites.get(index).getEvent(); - shell.dispose(); - } - }); - - Button btnAbort = new Button(shell, SWT.NONE); - btnAbort.setText("Abort"); - btnAbort.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shell.dispose(); - } - }); - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public InsertAssertionDialog(Shell parent, int style, SortedSet targets) { + super(parent, style); + setText("SWT Dialog"); + this.targets = targets; + } + + /** + * Open the dialog. + * + * @return the result + */ + public Event open() { + result = null; + insertEventComposites = new ArrayList(); + createContents(); + shell.open(); + shell.layout(); + Display display = getParent().getDisplay(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + return result; + } + + /** + * Create contents of the dialog. + */ + private void createContents() { + shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER | SWT.APPLICATION_MODAL); + shell.setSize(450, 300); + shell.setText(getText()); + shell.setLayout(new GridLayout(2, false)); + + tabFolder = new TabFolder(shell, SWT.NONE); + tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); + + TabItem tbtmTextEquals = new TabItem(tabFolder, SWT.NONE); + tbtmTextEquals.setText("TextEquals"); + AbstractInsertEventComposite compTextEquals = + new InsertTextEquals(tabFolder, SWT.NO_BACKGROUND, targets); + tbtmTextEquals.setControl(compTextEquals); + insertEventComposites.add(compTextEquals); + + TabItem tbtmFileEquals = new TabItem(tabFolder, SWT.NONE); + tbtmFileEquals.setText("FileEquals"); + AbstractInsertEventComposite compFileEquals = + new InsertFileEquals(tabFolder, SWT.NO_BACKGROUND, targets); + tbtmFileEquals.setControl(compFileEquals); + insertEventComposites.add(compFileEquals); + + Button btnInsert = new Button(shell, SWT.NONE); + btnInsert.setText("Insert"); + btnInsert.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + int index = tabFolder.getSelectionIndex(); + result = insertEventComposites.get(index).getEvent(); + shell.dispose(); + } + }); + + Button btnAbort = new Button(shell, SWT.NONE); + btnAbort.setText("Abort"); + btnAbort.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shell.dispose(); + } + }); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -20,64 +21,65 @@ public class InsertFileEquals extends AbstractInsertEventComposite { - private Text actualText; - private Text expectedText; + private Text actualText; + private Text expectedText; - public InsertFileEquals(Composite parent, int style) { - this(parent, style, null); - } - - /** - * Create the composite. - * @param parent - * @param style - */ - public InsertFileEquals(Composite parent, int style, SortedSet targets) { - super(parent, style, targets); - setLayout(new GridLayout(3, false)); - - - Label lblExpectedFile = new Label(this, SWT.NONE); - lblExpectedFile.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblExpectedFile.setText("Expected file:"); - - expectedText = new Text(this, SWT.BORDER); - expectedText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - - Button btnSearch = new Button(this, SWT.NONE); - btnSearch.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN); - String filename = fileDialog.open(); - if( filename!= null ) { - expectedText.setText(filename); - } - } - }); - btnSearch.setText("Search..."); - - Label lblActualFile = new Label(this, SWT.NONE); - - lblActualFile.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblActualFile.setText("Actual file:"); - - actualText = new Text(this, SWT.BORDER); - actualText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - new Label(this, SWT.NONE); + public InsertFileEquals(Composite parent, int style) { + this(parent, style, null); + } - } + /** + * Create the composite. + * + * @param parent + * @param style + */ + public InsertFileEquals(Composite parent, int style, SortedSet targets) { + super(parent, style, targets); + setLayout(new GridLayout(3, false)); - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } + Label lblExpectedFile = new Label(this, SWT.NONE); + lblExpectedFile.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + lblExpectedFile.setText("Expected file:"); - @Override - public Event getEvent() { - FileEqualsReplay replay = new FileEqualsReplay(expectedText.getText(), actualText.getText()); - Event event = new Event(new FileEqualsAssertEvent()); - event.addReplayable(replay); - return event; - } + expectedText = new Text(this, SWT.BORDER); + expectedText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + + Button btnSearch = new Button(this, SWT.NONE); + btnSearch.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN); + String filename = fileDialog.open(); + if (filename != null) { + expectedText.setText(filename); + } + } + }); + btnSearch.setText("Search..."); + + Label lblActualFile = new Label(this, SWT.NONE); + + lblActualFile.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + lblActualFile.setText("Actual file:"); + + actualText = new Text(this, SWT.BORDER); + actualText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + new Label(this, SWT.NONE); + + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + @Override + public Event getEvent() { + FileEqualsReplay replay = + new FileEqualsReplay(expectedText.getText(), actualText.getText()); + Event event = new Event(new FileEqualsAssertEvent()); + event.addReplayable(replay); + return event; + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -13,9 +14,6 @@ import org.eclipse.swt.widgets.TreeItem; -import de.ugoe.cs.quest.assertions.AssertEvent; import de.ugoe.cs.quest.assertions.TextEqualsAssertEventType; -import de.ugoe.cs.quest.assertions.TextEqualsReplay; import de.ugoe.cs.quest.eventcore.Event; -import de.ugoe.cs.quest.eventcore.IEventTarget; import de.ugoe.cs.util.ArrayTools; @@ -24,135 +22,141 @@ public class InsertTextEquals extends AbstractInsertEventComposite { - private Text expectedText; - private Tree targetTree; - private Text targetText; - - /** - * Create the composite. - * @param parent - * @param style - */ - public InsertTextEquals(Composite parent, int style, SortedSet targets) { - super(parent, style, targets); - setLayout(new GridLayout(3, false)); - - Label lblExpectedValue = new Label(this, SWT.NONE); - lblExpectedValue.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblExpectedValue.setText("Expected Value:"); - - expectedText = new Text(this, SWT.BORDER); - expectedText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - - Label lblTargetWidget = new Label(this, SWT.NONE); - lblTargetWidget.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); - lblTargetWidget.setText("Target Widget:"); - - targetText = new Text(this, SWT.BORDER); - targetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - new Label(this, SWT.NONE); - - targetTree = new Tree(this, SWT.BORDER); - targetTree.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - TreeItem[] selection = targetTree.getSelection(); - if( selection.length==1 ) { - TreeItem item = selection[0]; - String targetString = item.getText(); - item = item.getParentItem(); - while( item!=null ) { - // TODO the "." is hard coded for the JFCMonitor. should be flexible - targetString = item.getText()+"."+targetString; - item = item.getParentItem(); - } - targetText.setText(targetString); - } - } - }); - targetTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); - buildTargetTree(); - new Label(this, SWT.NONE); - - Button btnExpandAll = new Button(this, SWT.NONE); - btnExpandAll.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - expandAll(targetTree, true); - } - }); - btnExpandAll.setText("Expand all"); - - Button btnCollapseAll = new Button(this, SWT.NONE); - btnCollapseAll.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - expandAll(targetTree, false); - } - }); - btnCollapseAll.setText("Collapse all"); + private Text expectedText; + private Tree targetTree; + private Text targetText; - } + /** + * Create the composite. + * + * @param parent + * @param style + */ + public InsertTextEquals(Composite parent, int style, SortedSet targets) { + super(parent, style, targets); + setLayout(new GridLayout(3, false)); - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } + Label lblExpectedValue = new Label(this, SWT.NONE); + lblExpectedValue.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + lblExpectedValue.setText("Expected Value:"); - @Override - public Event getEvent() { - IEventTarget target = targetText.getText(); - TextEqualsReplay replay = new TextEqualsReplay(expectedText.getText(), target); - Event event = new Event(new TextEqualsAssertEventType()); - event.setTarget(target); - event.addReplayable(replay); - return event; - } - - private void buildTargetTree() { - for( String target : targets ) { - TreeItem currentParent = null; - TreeItem[] currentItems = targetTree.getItems(); - - //TODO needs rule for target splitting. currently its hard coded for JFCEvent targets. - String[] targetParts = target.split("\\.\\["); - for( String targetPart : targetParts) { - String[] currentTexts = new String[currentItems.length]; - for( int i=0; i= 0 ) { - currentParent = currentItems[index]; - } else { - if( currentParent==null ) { - currentParent = new TreeItem(targetTree, SWT.NULL); - currentParent.setText(targetPart); - } else { - currentParent = new TreeItem(currentParent, SWT.NULL); - currentParent.setText(targetPart); - } - } - currentItems = currentParent.getItems(); - } - } + expectedText = new Text(this, SWT.BORDER); + expectedText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - } - - private void expandAll(Tree tree, boolean expanded) { - for( TreeItem item : tree.getItems() ) { - expandAll(item, expanded); - } - } - - private void expandAll(TreeItem item, boolean expanded) { - item.setExpanded(expanded); - for( TreeItem childItem : item.getItems() ) { - expandAll(childItem, expanded); - } - } - - + Label lblTargetWidget = new Label(this, SWT.NONE); + lblTargetWidget.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + lblTargetWidget.setText("Target Widget:"); + + targetText = new Text(this, SWT.BORDER); + targetText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); + new Label(this, SWT.NONE); + + targetTree = new Tree(this, SWT.BORDER); + targetTree.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + TreeItem[] selection = targetTree.getSelection(); + if (selection.length == 1) { + TreeItem item = selection[0]; + String targetString = item.getText(); + item = item.getParentItem(); + while (item != null) { + // TODO the "." is hard coded for the JFCMonitor. should be flexible + targetString = item.getText() + "." + targetString; + item = item.getParentItem(); + } + targetText.setText(targetString); + } + } + }); + targetTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); + buildTargetTree(); + new Label(this, SWT.NONE); + + Button btnExpandAll = new Button(this, SWT.NONE); + btnExpandAll.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + expandAll(targetTree, true); + } + }); + btnExpandAll.setText("Expand all"); + + Button btnCollapseAll = new Button(this, SWT.NONE); + btnCollapseAll.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + expandAll(targetTree, false); + } + }); + btnCollapseAll.setText("Collapse all"); + + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + @Override + public Event getEvent() { + // TODO make compatible to new event core + /* + * IEventTarget target = targetText.getText(); TextEqualsReplay replay = new + * TextEqualsReplay(expectedText.getText(), target); + */ + Event event = new Event(new TextEqualsAssertEventType()); + /* + * event.setTarget(target); event.addReplayable(replay); + */ + return event; + } + + private void buildTargetTree() { + for (String target : targets) { + TreeItem currentParent = null; + TreeItem[] currentItems = targetTree.getItems(); + + // TODO needs rule for target splitting. currently its hard coded for JFCEvent targets. + String[] targetParts = target.split("\\.\\["); + for (String targetPart : targetParts) { + String[] currentTexts = new String[currentItems.length]; + for (int i = 0; i < currentItems.length; i++) { + currentTexts[i] = currentItems[i].getText(); + } + if (currentParent != null) { + targetPart = "[" + targetPart; + } + int index = ArrayTools.findIndex(currentTexts, targetPart); + if (index >= 0) { + currentParent = currentItems[index]; + } + else { + if (currentParent == null) { + currentParent = new TreeItem(targetTree, SWT.NULL); + currentParent.setText(targetPart); + } + else { + currentParent = new TreeItem(currentParent, SWT.NULL); + currentParent.setText(targetPart); + } + } + currentItems = currentParent.getItems(); + } + } + + } + + private void expandAll(Tree tree, boolean expanded) { + for (TreeItem item : tree.getItems()) { + expandAll(item, expanded); + } + } + + private void expandAll(TreeItem item, boolean expanded) { + item.setExpanded(expanded); + for (TreeItem childItem : item.getItems()) { + expandAll(childItem, expanded); + } + } + } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/MainWindow.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -27,211 +28,205 @@ */ public class MainWindow { - - private List startupCommands; - - protected Shell shlEventbenchConsole; - - protected TabItem consoleTab; - protected TabItem sequencesTab; - protected TabItem modelsTab; - protected TabItem dataTab; - protected ConsoleTabComposite consoleTabComposite; - protected SequencesTabComposite sequencesTabComposite; - protected ModelsTabComposite modelsTabComposite; - protected DataTabComposite dataTabComposite; - - protected CommandHistoryDialog historyDialog; - - public MainWindow(List startupCommands) { - this.startupCommands = startupCommands; - } - - /** - *

- * Open the window. - *

- * - * @wbp.parser.entryPoint - */ - public void open() { - Display display = Display.getDefault(); - createContents(); - new SWTConsole(consoleTabComposite.textConsoleOutput); - historyDialog = new CommandHistoryDialog(shlEventbenchConsole, SWT.NONE); - shlEventbenchConsole.open(); - shlEventbenchConsole.layout(); - for(String command : startupCommands ) { - CommandExecuter.getInstance().exec(command); - } - while (!shlEventbenchConsole.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } - - /** - *

- * Create contents of the window. - *

- */ - protected void createContents() { - shlEventbenchConsole = new Shell(); - shlEventbenchConsole.setSize(800, 600); - 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()) { - historyDialog.open(); - } - } - }); - 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(shlEventbenchConsole, - SWT.OPEN); - String filename = fileDialog.open(); - if (filename != null) { - String command = "exec '" + filename + "'"; - CommandExecuter.getInstance().exec(command); - } - } - }); - 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(shlEventbenchConsole, - SWT.OPEN); - String filename = fileDialog.open(); - if (filename != null) { - String command = "load '" + filename + "'"; - CommandExecuter.getInstance().exec(command); - } - } - }); - 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(shlEventbenchConsole, - SWT.SAVE); - String filename = fileDialog.open(); - if (filename != null) { - String command = "save '" + filename + "'"; - CommandExecuter.getInstance().exec(command); - } - } - }); - 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) { - 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(shlEventbenchConsole, - SWT.NONE); - aboutDialog.open(); - } - }); - mntmAbout.setText("About"); - } - - /** - *

- * 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) { - sequencesTabComposite.updateSequenceList(); - } else if (e.item == modelsTab) { - modelsTabComposite.updateModelList(); - } else if (e.item == dataTab) { - dataTabComposite.updateDataList(); - } - } - }); - 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); - consoleTab.setControl(consoleTabComposite); - - sequencesTab = new TabItem(tabFolder, SWT.NONE); - sequencesTab.setText("Sequences"); - - 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); - modelsTab.setControl(modelsTabComposite); - - dataTab = new TabItem(tabFolder, SWT.NONE); - dataTab.setText("Data"); - - dataTabComposite = new DataTabComposite(tabFolder, SWT.NO_BACKGROUND); - dataTab.setControl(dataTabComposite); - } + + private List startupCommands; + + protected Shell shlEventbenchConsole; + + protected TabItem consoleTab; + protected TabItem sequencesTab; + protected TabItem modelsTab; + protected TabItem dataTab; + protected ConsoleTabComposite consoleTabComposite; + protected SequencesTabComposite sequencesTabComposite; + protected ModelsTabComposite modelsTabComposite; + protected DataTabComposite dataTabComposite; + + protected CommandHistoryDialog historyDialog; + + public MainWindow(List startupCommands) { + this.startupCommands = startupCommands; + } + + /** + *

+ * Open the window. + *

+ * + * @wbp.parser.entryPoint + */ + public void open() { + Display display = Display.getDefault(); + createContents(); + new SWTConsole(consoleTabComposite.textConsoleOutput); + historyDialog = new CommandHistoryDialog(shlEventbenchConsole, SWT.NONE); + shlEventbenchConsole.open(); + shlEventbenchConsole.layout(); + for (String command : startupCommands) { + CommandExecuter.getInstance().exec(command); + } + while (!shlEventbenchConsole.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } + + /** + *

+ * Create contents of the window. + *

+ */ + protected void createContents() { + shlEventbenchConsole = new Shell(); + shlEventbenchConsole.setSize(800, 600); + 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()) { + historyDialog.open(); + } + } + }); + 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(shlEventbenchConsole, SWT.OPEN); + String filename = fileDialog.open(); + if (filename != null) { + String command = "exec '" + filename + "'"; + CommandExecuter.getInstance().exec(command); + } + } + }); + 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(shlEventbenchConsole, SWT.OPEN); + String filename = fileDialog.open(); + if (filename != null) { + String command = "load '" + filename + "'"; + CommandExecuter.getInstance().exec(command); + } + } + }); + 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(shlEventbenchConsole, SWT.SAVE); + String filename = fileDialog.open(); + if (filename != null) { + String command = "save '" + filename + "'"; + CommandExecuter.getInstance().exec(command); + } + } + }); + 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) { + 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(shlEventbenchConsole, SWT.NONE); + aboutDialog.open(); + } + }); + mntmAbout.setText("About"); + } + + /** + *

+ * 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) { + sequencesTabComposite.updateSequenceList(); + } + else if (e.item == modelsTab) { + modelsTabComposite.updateModelList(); + } + else if (e.item == dataTab) { + dataTabComposite.updateDataList(); + } + } + }); + 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); + consoleTab.setControl(consoleTabComposite); + + sequencesTab = new TabItem(tabFolder, SWT.NONE); + sequencesTab.setText("Sequences"); + + 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); + modelsTab.setControl(modelsTabComposite); + + dataTab = new TabItem(tabFolder, SWT.NONE); + dataTab.setText("Data"); + + dataTabComposite = new DataTabComposite(tabFolder, SWT.NO_BACKGROUND); + dataTab.setControl(dataTabComposite); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelPropertiesDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelPropertiesDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelPropertiesDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -22,117 +23,121 @@ public class ModelPropertiesDialog extends Dialog { - private IStochasticProcess process; - - protected Shell shlModelProperties; + private IStochasticProcess process; - /** - * Create the dialog. - * @param parent - * @param style - */ - public ModelPropertiesDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } + protected Shell shlModelProperties; - /** - * Open the dialog. - */ - public void open() { - createContents(); - shlModelProperties.open(); - shlModelProperties.layout(); - Display display = getParent().getDisplay(); - while (!shlModelProperties.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public ModelPropertiesDialog(Shell parent, int style) { + super(parent, style); + setText("SWT Dialog"); + } - /** - * Create contents of the dialog. - */ - private void createContents() { - shlModelProperties = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.RESIZE); - shlModelProperties.setSize(230, 318); - shlModelProperties.setText("Model Properties"); - shlModelProperties.setLayout(new GridLayout(2, false)); - - Group grpEvents = new Group(shlModelProperties, SWT.NONE); - FillLayout fl_grpEvents = new FillLayout(SWT.HORIZONTAL); - fl_grpEvents.marginHeight = 5; - fl_grpEvents.marginWidth = 5; - grpEvents.setLayout(fl_grpEvents); - grpEvents.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); - grpEvents.setText("Events"); - - List list = new List(grpEvents, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); - for( String symbol : process.getSymbolStrings() ) { - if( symbol==null ) { - list.add("null"); - } else { - list.add(symbol); - } - } - - Group grpStatistics = new Group(shlModelProperties, SWT.NONE); - grpStatistics.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); - grpStatistics.setText("Statistics"); - grpStatistics.setLayout(new GridLayout(2, false)); - - Label lblNumEvents = new Label(grpStatistics, SWT.NONE); - lblNumEvents.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); - lblNumEvents.setText("Num. Events"); - - Label label = new Label(grpStatistics, SWT.RIGHT); - label.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false, 1, 1)); - label.setText(""+process.getNumSymbols()); - - Label lblNumTrieLeafs = new Label(grpStatistics, SWT.NONE); - lblNumTrieLeafs.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); - lblNumTrieLeafs.setText("Size (Flattend FOM)"); - - Label label_1 = new Label(grpStatistics, SWT.RIGHT); - label_1.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false, 1, 1)); - label_1.setText(""+process.getNumFOMStates()); - - Label lblEntropy = new Label(grpStatistics, SWT.NONE); - lblEntropy.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); - lblEntropy.setText("Entropy"); - - final Label label_2 = new Label(grpStatistics, SWT.RIGHT); - label_2.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); - label_2.setText("####"); - - Button btnCalculateEntropy = new Button(shlModelProperties, SWT.NONE); - btnCalculateEntropy.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if( process instanceof FirstOrderMarkovModel) { - label_2.setText(""+((FirstOrderMarkovModel) process).calcEntropy()); - } else { - MessageBox messageBox = new MessageBox(shlModelProperties, SWT.NONE); - messageBox.setText("Feature Not Available"); - messageBox.setMessage("The feature is currently only available for first-order Markov models."); - messageBox.open(); - } - } - }); - btnCalculateEntropy.setText("Calculate Entropy"); - - Button btnClose = new Button(shlModelProperties, SWT.NONE); - btnClose.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shlModelProperties.dispose(); - } - }); - btnClose.setText("Close"); + /** + * Open the dialog. + */ + public void open() { + createContents(); + shlModelProperties.open(); + shlModelProperties.layout(); + Display display = getParent().getDisplay(); + while (!shlModelProperties.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } - } - - public void setStochasticProcess(IStochasticProcess process) { - this.process = process; - } + /** + * Create contents of the dialog. + */ + private void createContents() { + shlModelProperties = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.RESIZE); + shlModelProperties.setSize(230, 318); + shlModelProperties.setText("Model Properties"); + shlModelProperties.setLayout(new GridLayout(2, false)); + + Group grpEvents = new Group(shlModelProperties, SWT.NONE); + FillLayout fl_grpEvents = new FillLayout(SWT.HORIZONTAL); + fl_grpEvents.marginHeight = 5; + fl_grpEvents.marginWidth = 5; + grpEvents.setLayout(fl_grpEvents); + grpEvents.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); + grpEvents.setText("Events"); + + List list = new List(grpEvents, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL); + for (String symbol : process.getSymbolStrings()) { + if (symbol == null) { + list.add("null"); + } + else { + list.add(symbol); + } + } + + Group grpStatistics = new Group(shlModelProperties, SWT.NONE); + grpStatistics.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1)); + grpStatistics.setText("Statistics"); + grpStatistics.setLayout(new GridLayout(2, false)); + + Label lblNumEvents = new Label(grpStatistics, SWT.NONE); + lblNumEvents.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + lblNumEvents.setText("Num. Events"); + + Label label = new Label(grpStatistics, SWT.RIGHT); + label.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false, 1, 1)); + label.setText("" + process.getNumSymbols()); + + Label lblNumTrieLeafs = new Label(grpStatistics, SWT.NONE); + lblNumTrieLeafs.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + lblNumTrieLeafs.setText("Size (Flattend FOM)"); + + Label label_1 = new Label(grpStatistics, SWT.RIGHT); + label_1.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, false, false, 1, 1)); + label_1.setText("" + process.getNumFOMStates()); + + Label lblEntropy = new Label(grpStatistics, SWT.NONE); + lblEntropy.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + lblEntropy.setText("Entropy"); + + final Label label_2 = new Label(grpStatistics, SWT.RIGHT); + label_2.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); + label_2.setText("####"); + + Button btnCalculateEntropy = new Button(shlModelProperties, SWT.NONE); + btnCalculateEntropy.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (process instanceof FirstOrderMarkovModel) { + label_2.setText("" + ((FirstOrderMarkovModel) process).calcEntropy()); + } + else { + MessageBox messageBox = new MessageBox(shlModelProperties, SWT.NONE); + messageBox.setText("Feature Not Available"); + messageBox + .setMessage("The feature is currently only available for first-order Markov models."); + messageBox.open(); + } + } + }); + btnCalculateEntropy.setText("Calculate Entropy"); + + Button btnClose = new Button(shlModelProperties, SWT.NONE); + btnClose.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shlModelProperties.dispose(); + } + }); + btnClose.setText("Close"); + + } + + public void setStochasticProcess(IStochasticProcess process) { + this.process = process; + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/ModelsTabComposite.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -20,125 +21,138 @@ public class ModelsTabComposite extends Composite { - List modelList; - - /** - * Create the composite. - * @param parent - * @param style - */ - public ModelsTabComposite(Composite parent, int style) { - super(parent, style); - createContents(); - } - - private void createContents() { - setLayout(new GridLayout(5, false)); - - modelList = new List(this, SWT.BORDER | SWT.V_SCROLL); - modelList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1)); - - Button btnShow = new Button(this, SWT.NONE); - btnShow.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedStrings = modelList.getSelection(); - if( selectedStrings.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - return; - } - IStochasticProcess process = (IStochasticProcess) GlobalDataContainer.getInstance().getData(selectedStrings[0]); - if( process instanceof FirstOrderMarkovModel ) { - String command = "showMarkovModel " + selectedStrings[0]; - CommandExecuter.getInstance().exec(command); - } else { - MessageBox messageBox = new MessageBox(getShell(), SWT.NONE); - messageBox.setText("Feature Not Available"); - messageBox.setMessage("The feature is currently only available for first-order Markov models."); - messageBox.open(); - } - } - }); - btnShow.setText("Visualize"); - - Button btnDelete_1 = new Button(this, SWT.NONE); - btnDelete_1.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if( SWTHelpers.deleteSelectedFromStorage(modelList) ) { - updateModelList(); - } else { - SWTHelpers.noSelectionError(getShell()); - } - } - }); - btnDelete_1.setText("Delete"); - - Button btnGenSequences = new Button(this, SWT.NONE); - btnGenSequences.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedStrings = modelList.getSelection(); - if( selectedStrings.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - return; - } - GenerateSequencesDialog generateSequencesDialog = new GenerateSequencesDialog(getShell(), SWT.NONE); - generateSequencesDialog.setProcessName(selectedStrings[0]); - generateSequencesDialog.open(); - } - }); - btnGenSequences.setText("Gen. Sequences"); - - Button btnProperties = new Button(this, SWT.NONE); - btnProperties.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedStrings = modelList.getSelection(); - if( selectedStrings.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - return; - } - IStochasticProcess process = (IStochasticProcess) GlobalDataContainer.getInstance().getData(selectedStrings[0]); - ModelPropertiesDialog modelPropertiesDialog = new ModelPropertiesDialog(getShell(), SWT.NONE); - modelPropertiesDialog.setStochasticProcess(process); - modelPropertiesDialog.open(); - } - }); - btnProperties.setText("Properties"); - - Button btnCreateDot = new Button(this, SWT.NONE); - btnCreateDot.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedStrings = modelList.getSelection(); - if( selectedStrings.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - return; - } - IStochasticProcess process = (IStochasticProcess) GlobalDataContainer.getInstance().getData(selectedStrings[0]); - String command = ""; - if( process instanceof IDotCompatible ) { - command = "printDot "; - } else { - command = "printTrieDot "; - } - command += selectedStrings[0]; - CommandExecuter.getInstance().exec(command); - } - }); - btnCreateDot.setText("Create DOT"); - } + List modelList; - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - - public void updateModelList() { - modelList.removeAll(); - for( String sequencesName : GlobalDataContainer.getInstance().getAllModelNames() ) { - modelList.add(sequencesName); - } - } + /** + * Create the composite. + * + * @param parent + * @param style + */ + public ModelsTabComposite(Composite parent, int style) { + super(parent, style); + createContents(); + } + + private void createContents() { + setLayout(new GridLayout(5, false)); + + modelList = new List(this, SWT.BORDER | SWT.V_SCROLL); + modelList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1)); + + Button btnShow = new Button(this, SWT.NONE); + btnShow.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedStrings = modelList.getSelection(); + if (selectedStrings.length == 0) { + SWTHelpers.noSelectionError(getShell()); + return; + } + IStochasticProcess process = + (IStochasticProcess) GlobalDataContainer.getInstance() + .getData(selectedStrings[0]); + if (process instanceof FirstOrderMarkovModel) { + String command = "showMarkovModel " + selectedStrings[0]; + CommandExecuter.getInstance().exec(command); + } + else { + MessageBox messageBox = new MessageBox(getShell(), SWT.NONE); + messageBox.setText("Feature Not Available"); + messageBox + .setMessage("The feature is currently only available for first-order Markov models."); + messageBox.open(); + } + } + }); + btnShow.setText("Visualize"); + + Button btnDelete_1 = new Button(this, SWT.NONE); + btnDelete_1.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (SWTHelpers.deleteSelectedFromStorage(modelList)) { + updateModelList(); + } + else { + SWTHelpers.noSelectionError(getShell()); + } + } + }); + btnDelete_1.setText("Delete"); + + Button btnGenSequences = new Button(this, SWT.NONE); + btnGenSequences.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedStrings = modelList.getSelection(); + if (selectedStrings.length == 0) { + SWTHelpers.noSelectionError(getShell()); + return; + } + GenerateSequencesDialog generateSequencesDialog = + new GenerateSequencesDialog(getShell(), SWT.NONE); + generateSequencesDialog.setProcessName(selectedStrings[0]); + generateSequencesDialog.open(); + } + }); + btnGenSequences.setText("Gen. Sequences"); + + Button btnProperties = new Button(this, SWT.NONE); + btnProperties.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedStrings = modelList.getSelection(); + if (selectedStrings.length == 0) { + SWTHelpers.noSelectionError(getShell()); + return; + } + IStochasticProcess process = + (IStochasticProcess) GlobalDataContainer.getInstance() + .getData(selectedStrings[0]); + ModelPropertiesDialog modelPropertiesDialog = + new ModelPropertiesDialog(getShell(), SWT.NONE); + modelPropertiesDialog.setStochasticProcess(process); + modelPropertiesDialog.open(); + } + }); + btnProperties.setText("Properties"); + + Button btnCreateDot = new Button(this, SWT.NONE); + btnCreateDot.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedStrings = modelList.getSelection(); + if (selectedStrings.length == 0) { + SWTHelpers.noSelectionError(getShell()); + return; + } + IStochasticProcess process = + (IStochasticProcess) GlobalDataContainer.getInstance() + .getData(selectedStrings[0]); + String command = ""; + if (process instanceof IDotCompatible) { + command = "printDot "; + } + else { + command = "printTrieDot "; + } + command += selectedStrings[0]; + CommandExecuter.getInstance().exec(command); + } + }); + btnCreateDot.setText("Create DOT"); + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } + + public void updateModelList() { + modelList.removeAll(); + for (String sequencesName : GlobalDataContainer.getInstance().getAllModelNames()) { + modelList.add(sequencesName); + } + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTConsole.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -12,43 +13,45 @@ import de.ugoe.cs.util.console.listener.ITraceListener; -public class SWTConsole implements IOutputListener, IErrorListener, ITraceListener, ICommandListener { +public class SWTConsole implements IOutputListener, IErrorListener, ITraceListener, + ICommandListener +{ - StyledText output; - - public SWTConsole(StyledText styledText) { - Console.getInstance().registerOutputListener(this); - Console.getInstance().registerErrorListener(this); - Console.getInstance().registerTraceListener(this); - Console.getInstance().registerCommandListener(this); - this.output = styledText; - } - - @Override - public void outputMsg(String newMessage) { - output.append(newMessage); - } + StyledText output; - @Override - public void errorMsg(String errMessage) { - appendColored(errMessage, SWT.COLOR_RED); - } + public SWTConsole(StyledText styledText) { + Console.getInstance().registerOutputListener(this); + Console.getInstance().registerErrorListener(this); + Console.getInstance().registerTraceListener(this); + Console.getInstance().registerCommandListener(this); + this.output = styledText; + } - @Override - public void traceMsg(String traceMessage) { - appendColored(traceMessage, SWT.COLOR_BLUE); - } - - @Override - public void commandNotification(String command) { - 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); - } + @Override + public void outputMsg(String newMessage) { + output.append(newMessage); + } + + @Override + public void errorMsg(String errMessage) { + appendColored(errMessage, SWT.COLOR_RED); + } + + @Override + public void traceMsg(String traceMessage) { + appendColored(traceMessage, SWT.COLOR_BLUE); + } + + @Override + public void commandNotification(String command) { + 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); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTHelpers.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTHelpers.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SWTHelpers.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -9,24 +10,25 @@ public class SWTHelpers { - - public static boolean deleteSelectedFromStorage(final List list) { - String[] selectedStrings = list.getSelection(); - if( selectedStrings.length==0 ) { - return false; - } else { - for( String selected : selectedStrings) { - String command = "deleteObject " + selected; - CommandExecuter.getInstance().exec(command); - } - return true; - } - } - - public static void noSelectionError(final Shell shell) { - MessageBox messageBox = new MessageBox(shell, SWT.ERROR); - messageBox.setMessage("No objects selected!"); - messageBox.setText("Error"); - messageBox.open(); - } + + public static boolean deleteSelectedFromStorage(final List list) { + String[] selectedStrings = list.getSelection(); + if (selectedStrings.length == 0) { + return false; + } + else { + for (String selected : selectedStrings) { + String command = "deleteObject " + selected; + CommandExecuter.getInstance().exec(command); + } + return true; + } + } + + public static void noSelectionError(final Shell shell) { + MessageBox messageBox = new MessageBox(shell, SWT.ERROR); + messageBox.setMessage("No objects selected!"); + messageBox.setText("Error"); + messageBox.open(); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -24,131 +25,138 @@ public class SequencesDialog extends Dialog { - private String sequencesName; - - private List sequenceList; - private Collection> sequences; - private SortedSet targets; - - protected Shell shell; + private String sequencesName; - /** - * Create the dialog. - * @param parent - * @param style - */ - public SequencesDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } + private List sequenceList; + private Collection> sequences; + private SortedSet targets; - /** - * Open the dialog. - */ - public void open(String sequencesName) { - this.sequencesName = sequencesName; - sequences = null; - createContents(); - shell.open(); - shell.layout(); - Display display = getParent().getDisplay(); - while (!shell.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } + protected Shell shell; - /** - * Create contents of the dialog. - */ - private void createContents() { - shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER | SWT.APPLICATION_MODAL); - shell.setSize(248, 299); - shell.setText(getText()); - shell.setLayout(new GridLayout(2, false)); - - sequenceList = new List(shell, SWT.BORDER | SWT.V_SCROLL); - sequenceList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); - updateSequenceList(); - - Button btnShow = new Button(shell, SWT.NONE); - btnShow.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - int index = sequenceList.getSelectionIndex(); - if( index==-1 ) { - MessageBox messageBox = new MessageBox(shell, SWT.ERROR); - messageBox.setMessage("No sequence selected!"); - messageBox.setText("Error"); - messageBox.open(); - } else { - EditSequenceDialog editSequenceDialog = new EditSequenceDialog(shell, SWT.NONE, targets); - int counter = 0; - java.util.List selectedSequence = null; - for( java.util.List sequence : sequences ) { - if( counter==index ) { - selectedSequence = sequence; - break; - } - counter++; - } - editSequenceDialog.open(selectedSequence); - updateSequenceList(); - } - } - }); - btnShow.setText("Show"); - - Button btnClose = new Button(shell, SWT.NONE); - btnClose.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - shell.dispose(); - } - }); - btnClose.setText("Close"); + /** + * Create the dialog. + * + * @param parent + * @param style + */ + public SequencesDialog(Shell parent, int style) { + super(parent, style); + setText("SWT Dialog"); + } - } - - @SuppressWarnings("unchecked") - private void updateSequenceList() { - sequenceList.removeAll(); - Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName); - if( SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - sequences = (Collection>) dataObject; - int seqDigits = Integer.toString(sequences.size()).length(); - int counter = 1; - for( java.util.List sequence : sequences ) { - String seqName = "#"+String.format("%0"+seqDigits+"d", counter)+": "+sequence.size(); - sequenceList.add(seqName); - counter++; - } - Object targetObject = GlobalDataContainer.getInstance().getData(sequencesName+"_targets"); - targets = null; - if( targetObject instanceof SortedSet ) { - if( !((SortedSet) targetObject).isEmpty() ) { - if( ((SortedSet) targetObject).first() instanceof String ) { - targets = (SortedSet) targetObject; - } - } - } - if( targets==null ) { - targets = new TreeSet(); - for( java.util.List sequence : sequences ) { - for( Event event : sequence ) { - String target = event.getTarget(); - if( target!=null ) { - targets.add(target); - } - } - } - } - } else { - MessageBox messageBox = new MessageBox(shell, SWT.ERROR); - messageBox.setMessage("Internal error. Sequences object not of expected type!"); - messageBox.setText("Error"); - messageBox.open(); - } - } + /** + * Open the dialog. + */ + public void open(String sequencesName) { + this.sequencesName = sequencesName; + sequences = null; + createContents(); + shell.open(); + shell.layout(); + Display display = getParent().getDisplay(); + while (!shell.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + } + + /** + * Create contents of the dialog. + */ + private void createContents() { + shell = new Shell(getParent(), SWT.SHELL_TRIM | SWT.BORDER | SWT.APPLICATION_MODAL); + shell.setSize(248, 299); + shell.setText(getText()); + shell.setLayout(new GridLayout(2, false)); + + sequenceList = new List(shell, SWT.BORDER | SWT.V_SCROLL); + sequenceList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); + updateSequenceList(); + + Button btnShow = new Button(shell, SWT.NONE); + btnShow.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + int index = sequenceList.getSelectionIndex(); + if (index == -1) { + MessageBox messageBox = new MessageBox(shell, SWT.ERROR); + messageBox.setMessage("No sequence selected!"); + messageBox.setText("Error"); + messageBox.open(); + } + else { + EditSequenceDialog editSequenceDialog = + new EditSequenceDialog(shell, SWT.NONE, targets); + int counter = 0; + java.util.List selectedSequence = null; + for (java.util.List sequence : sequences) { + if (counter == index) { + selectedSequence = sequence; + break; + } + counter++; + } + editSequenceDialog.open(selectedSequence); + updateSequenceList(); + } + } + }); + btnShow.setText("Show"); + + Button btnClose = new Button(shell, SWT.NONE); + btnClose.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shell.dispose(); + } + }); + btnClose.setText("Close"); + + } + + @SuppressWarnings("unchecked") + private void updateSequenceList() { + sequenceList.removeAll(); + Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName); + if (SequenceInstanceOf.isCollectionOfSequences(dataObject)) { + sequences = (Collection>) dataObject; + int seqDigits = Integer.toString(sequences.size()).length(); + int counter = 1; + for (java.util.List sequence : sequences) { + String seqName = + "#" + String.format("%0" + seqDigits + "d", counter) + ": " + sequence.size(); + sequenceList.add(seqName); + counter++; + } + Object targetObject = + GlobalDataContainer.getInstance().getData(sequencesName + "_targets"); + targets = null; + if (targetObject instanceof SortedSet) { + if (!((SortedSet) targetObject).isEmpty()) { + if (((SortedSet) targetObject).first() instanceof String) { + targets = (SortedSet) targetObject; + } + } + } + if (targets == null) { + targets = new TreeSet(); + for (java.util.List sequence : sequences) { + for (Event event : sequence) { + // TODO check if toString() is sufficient + String target = event.getTarget().toString(); + if (target != null) { + targets.add(target); + } + } + } + } + } + else { + MessageBox messageBox = new MessageBox(shell, SWT.ERROR); + messageBox.setMessage("Internal error. Sequences object not of expected type!"); + messageBox.setText("Error"); + messageBox.open(); + } + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesTabComposite.java (revision 570) @@ -1,6 +1,6 @@ + package de.ugoe.cs.quest.ui.swt; import org.eclipse.swt.widgets.Composite; - import org.eclipse.swt.SWT; @@ -18,120 +18,125 @@ public class SequencesTabComposite extends Composite { - - protected List sequenceList; - - /** - * Create the composite. - * @param parent - * @param style - */ - public SequencesTabComposite(Composite parent, int style) { - super(parent, style); - createContents(); - } - private void createContents() { - setLayout(new GridLayout(5, false)); - - sequenceList = new List(this, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI); - sequenceList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1)); - sequenceList.setItems(new String[] {}); - - Button btnEdit = new Button(this, SWT.NONE); - btnEdit.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedSequences = sequenceList.getSelection(); - if( selectedSequences.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - } - else if(selectedSequences.length>1) { - MessageBox messageBox = new MessageBox(getShell(), SWT.ERROR); - messageBox.setMessage("Only one sequence can be edited at a time!"); - messageBox.setText("Error"); - messageBox.open(); - } else { - SequencesDialog sequencesDialog = new SequencesDialog(getShell(), SWT.NONE); - sequencesDialog.open(selectedSequences[0]); - } - } - }); - btnEdit.setText("Edit"); - - Button btnDelete = new Button(this, SWT.NONE); - btnDelete.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - if( SWTHelpers.deleteSelectedFromStorage(sequenceList)) { - updateSequenceList(); - } else { - SWTHelpers.noSelectionError(getShell()); - } - } - }); - btnDelete.setText("Delete"); - - Button btnReplay = new Button(this, SWT.NONE); - btnReplay.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedSequences = sequenceList.getSelection(); - if( selectedSequences.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - } else { - StringBuilder commandString = new StringBuilder("generateReplayfile "); - FileDialog fileDialog = new FileDialog(getShell()); - String filename = fileDialog.open(); - commandString.append(filename + " "); - for( String selected : selectedSequences ) { - commandString.append(selected + " "); - } - CommandExecuter.getInstance().exec(commandString.toString().trim()); - } - } - }); - btnReplay.setText("Replay"); - - Button btnTrainModel = new Button(this, SWT.NONE); - btnTrainModel.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String[] selectedSequences = sequenceList.getSelection(); - if( selectedSequences.length==0 ) { - SWTHelpers.noSelectionError(getShell()); - } else { - TrainModelDialog trainDialog = new TrainModelDialog(getShell(), SWT.NONE); - trainDialog.setSequenceNames(selectedSequences); - trainDialog.open(); - } - } - }); - btnTrainModel.setText("Train Model"); - - Button btnParse = new Button(this, SWT.NONE); - btnParse.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - // TODO implement parsing of sequences - MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_INFORMATION); - messageBox.setText("Not implemented!"); - messageBox.setMessage("Sorry! This functionality has not been implemented yet!"); - messageBox.open(); - } - }); - btnParse.setText("Parse"); - } - - public void updateSequenceList() { - sequenceList.removeAll(); - for( String sequencesName : GlobalDataContainer.getInstance().getAllSequencesNames() ) { - sequenceList.add(sequencesName); - } - } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } + protected List sequenceList; + + /** + * Create the composite. + * + * @param parent + * @param style + */ + public SequencesTabComposite(Composite parent, int style) { + super(parent, style); + createContents(); + } + + private void createContents() { + setLayout(new GridLayout(5, false)); + + sequenceList = new List(this, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI); + sequenceList.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1)); + sequenceList.setItems(new String[] { }); + + Button btnEdit = new Button(this, SWT.NONE); + btnEdit.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedSequences = sequenceList.getSelection(); + if (selectedSequences.length == 0) { + SWTHelpers.noSelectionError(getShell()); + } + else if (selectedSequences.length > 1) { + MessageBox messageBox = new MessageBox(getShell(), SWT.ERROR); + messageBox.setMessage("Only one sequence can be edited at a time!"); + messageBox.setText("Error"); + messageBox.open(); + } + else { + SequencesDialog sequencesDialog = new SequencesDialog(getShell(), SWT.NONE); + sequencesDialog.open(selectedSequences[0]); + } + } + }); + btnEdit.setText("Edit"); + + Button btnDelete = new Button(this, SWT.NONE); + btnDelete.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + if (SWTHelpers.deleteSelectedFromStorage(sequenceList)) { + updateSequenceList(); + } + else { + SWTHelpers.noSelectionError(getShell()); + } + } + }); + btnDelete.setText("Delete"); + + Button btnReplay = new Button(this, SWT.NONE); + btnReplay.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedSequences = sequenceList.getSelection(); + if (selectedSequences.length == 0) { + SWTHelpers.noSelectionError(getShell()); + } + else { + StringBuilder commandString = new StringBuilder("generateReplayfile "); + FileDialog fileDialog = new FileDialog(getShell()); + String filename = fileDialog.open(); + commandString.append(filename + " "); + for (String selected : selectedSequences) { + commandString.append(selected + " "); + } + CommandExecuter.getInstance().exec(commandString.toString().trim()); + } + } + }); + btnReplay.setText("Replay"); + + Button btnTrainModel = new Button(this, SWT.NONE); + btnTrainModel.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String[] selectedSequences = sequenceList.getSelection(); + if (selectedSequences.length == 0) { + SWTHelpers.noSelectionError(getShell()); + } + else { + TrainModelDialog trainDialog = new TrainModelDialog(getShell(), SWT.NONE); + trainDialog.setSequenceNames(selectedSequences); + trainDialog.open(); + } + } + }); + btnTrainModel.setText("Train Model"); + + Button btnParse = new Button(this, SWT.NONE); + btnParse.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + // TODO implement parsing of sequences + MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_INFORMATION); + messageBox.setText("Not implemented!"); + messageBox.setMessage("Sorry! This functionality has not been implemented yet!"); + messageBox.open(); + } + }); + btnParse.setText("Parse"); + } + + public void updateSequenceList() { + sequenceList.removeAll(); + for (String sequencesName : GlobalDataContainer.getInstance().getAllSequencesNames()) { + sequenceList.add(sequencesName); + } + } + + @Override + protected void checkSubclass() { + // Disable the check that prevents subclassing of SWT components + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/TrainModelDialog.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/TrainModelDialog.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/TrainModelDialog.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt; @@ -22,209 +23,217 @@ public class TrainModelDialog extends Dialog { - protected Shell shlTrainUsageModel; - - private Button btnFirstorderMarkovModel; - private Button btnHighorderMarkovModel; - private Button btnPredictionByPartial; - private Button btnDeterministicFiniteAutomaton; - - private Spinner minOrderSpinner; - private Spinner maxOrderSpinner; - private Text modelnameText; - - private String[] sequenceNames; - private Text probEscapeText; - private Label lblEscapeProbability; - - /** - * Create the dialog. - * @param parent - * @param style - */ - public TrainModelDialog(Shell parent, int style) { - super(parent, style); - setText("SWT Dialog"); - } - - /** - * Open the dialog. - */ - public void open() { - createContents(); - shlTrainUsageModel.open(); - shlTrainUsageModel.layout(); - Display display = getParent().getDisplay(); - while (!shlTrainUsageModel.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } - - /** - * Create contents of the dialog. - */ - private void createContents() { - shlTrainUsageModel = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.MIN | SWT.APPLICATION_MODAL); - shlTrainUsageModel.setSize(219, 330); - shlTrainUsageModel.setText("Train Usage Model"); - shlTrainUsageModel.setLayout(new GridLayout(2, false)); - - Group grpGeneralInformation = new Group(shlTrainUsageModel, SWT.NONE); - grpGeneralInformation.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1)); - grpGeneralInformation.setText("Name"); - grpGeneralInformation.setLayout(new GridLayout(1, false)); - - modelnameText = new Text(grpGeneralInformation, SWT.BORDER); - modelnameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1)); - - Group grpType = new Group(shlTrainUsageModel, SWT.NONE); - grpType.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1)); - grpType.setText("Type"); - grpType.setLayout(new GridLayout(2, false)); - - btnFirstorderMarkovModel = new Button(grpType, SWT.RADIO); - btnFirstorderMarkovModel.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - minOrderSpinner.setEnabled(false); - maxOrderSpinner.setEnabled(false); - probEscapeText.setEnabled(false); - } - }); - btnFirstorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1)); - btnFirstorderMarkovModel.setText("First-Order Markov Model"); - btnFirstorderMarkovModel.setSelection(true); - - btnHighorderMarkovModel = new Button(grpType, SWT.RADIO); - btnHighorderMarkovModel.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - minOrderSpinner.setEnabled(false); - maxOrderSpinner.setEnabled(true); - probEscapeText.setEnabled(false); - } - }); - btnHighorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1)); - btnHighorderMarkovModel.setText("High-Order Markov Model"); - - btnPredictionByPartial = new Button(grpType, SWT.RADIO); - btnPredictionByPartial.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - minOrderSpinner.setEnabled(true); - maxOrderSpinner.setEnabled(true); - probEscapeText.setEnabled(true); - } - }); - btnPredictionByPartial.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, true, false, 2, 1)); - btnPredictionByPartial.setText("Prediction by Partial Match"); - - lblEscapeProbability = new Label(grpType, SWT.NONE); - lblEscapeProbability.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1)); - lblEscapeProbability.setText("Escape Probability:"); - - probEscapeText = new Text(grpType, SWT.BORDER); - probEscapeText.setText("0.1"); - probEscapeText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); - probEscapeText.setEnabled(false); - - btnDeterministicFiniteAutomaton = new Button(grpType, SWT.RADIO); - btnDeterministicFiniteAutomaton.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - minOrderSpinner.setEnabled(false); - maxOrderSpinner.setEnabled(false); - probEscapeText.setEnabled(false); - } - }); - btnDeterministicFiniteAutomaton.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1)); - btnDeterministicFiniteAutomaton.setText("Deterministic Finite Automaton"); - - Group grpModelProperties = new Group(shlTrainUsageModel, SWT.NONE); - grpModelProperties.setLayout(new GridLayout(4, false)); - grpModelProperties.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true, 2, 1)); - grpModelProperties.setText("Order"); - - Label lblMin = new Label(grpModelProperties, SWT.NONE); - lblMin.setText("Min."); - - minOrderSpinner = new Spinner(grpModelProperties, SWT.BORDER); - minOrderSpinner.setEnabled(false); - - Label lblMax = new Label(grpModelProperties, SWT.NONE); - lblMax.setText("Max."); - - maxOrderSpinner = new Spinner(grpModelProperties, SWT.BORDER); - maxOrderSpinner.setEnabled(false); - maxOrderSpinner.setMinimum(2); - - Button btnTrain = new Button(shlTrainUsageModel, SWT.NONE); - btnTrain.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - String command = ""; - String modelname = modelnameText.getText(); - if( modelname.equals("")) { - MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("No modelname defined!"); - messageBox.open(); - return; - } - if( btnFirstorderMarkovModel.getSelection() ) { - command = "trainMarkovModel " + modelname + " " + sequenceNames[0]; - - } - else if( btnHighorderMarkovModel.getSelection() ) { - int modelOrder = maxOrderSpinner.getSelection(); - command = "trainMarkovModel " + modelname + " " + sequenceNames[0] + " " + modelOrder; - } - else if( btnPredictionByPartial.getSelection() ) { - int minOrder = minOrderSpinner.getSelection(); - int maxOrder = maxOrderSpinner.getSelection(); - if( minOrder>maxOrder ) { - MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Min. Order must be smaller than or equal to max. order!"); - messageBox.open(); - return; - } - double probEscape = Double.parseDouble(probEscapeText.getText()); - if( probEscape<0.0 || probEscape>1.0) { - MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR); - messageBox.setText("Error"); - messageBox.setMessage("Escape probability must be in [0,1]!"); - messageBox.open(); - return; - } - command = "trainPPM " + modelname + " " + sequenceNames[0] + " " + probEscape + " " + maxOrder + " " + minOrder; - } - else if( btnDeterministicFiniteAutomaton.getSelection() ) { - command = "trainDFA " + modelname + " " + sequenceNames[0]; - } - CommandExecuter.getInstance().exec(command); - for( int i=1; i maxOrder) { + MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR); + messageBox.setText("Error"); + messageBox + .setMessage("Min. Order must be smaller than or equal to max. order!"); + messageBox.open(); + return; + } + double probEscape = Double.parseDouble(probEscapeText.getText()); + if (probEscape < 0.0 || probEscape > 1.0) { + MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR); + messageBox.setText("Error"); + messageBox.setMessage("Escape probability must be in [0,1]!"); + messageBox.open(); + return; + } + command = + "trainPPM " + modelname + " " + sequenceNames[0] + " " + probEscape + " " + + maxOrder + " " + minOrder; + } + else if (btnDeterministicFiniteAutomaton.getSelection()) { + command = "trainDFA " + modelname + " " + sequenceNames[0]; + } + CommandExecuter.getInstance().exec(command); + for (int i = 1; i < sequenceNames.length; i++) { + command = "updateModel " + sequenceNames[i]; + CommandExecuter.getInstance().exec(command); + } + shlTrainUsageModel.dispose(); + } + }); + btnTrain.setText("Train!"); + + Button btnAbort = new Button(shlTrainUsageModel, SWT.NONE); + btnAbort.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + shlTrainUsageModel.dispose(); + } + }); + btnAbort.setText("Abort"); + + } + + public void setSequenceNames(String[] sequenceNames) { + this.sequenceNames = Arrays.copyOf(sequenceNames, sequenceNames.length); + } } Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java =================================================================== --- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java (revision 548) +++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/commands/CMDshowSequences.java (revision 570) @@ -1,2 +1,3 @@ + package de.ugoe.cs.quest.ui.swt.commands; @@ -23,47 +24,46 @@ public class CMDshowSequences implements Command { - /* - * (non-Javadoc) - * - * @see de.ugoe.cs.util.console.Command#help() - */ - @Override - public void help() { - Console.println("Usage: showSequences "); - } + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.util.console.Command#help() + */ + @Override + public void help() { + Console.println("Usage: showSequences "); + } - /* - * (non-Javadoc) - * - * @see de.ugoe.cs.util.console.Command#run(java.util.List) - */ - @Override - public void run(List parameters) { - String sequencesName; - try { - sequencesName = (String) parameters.get(0); - } catch (Exception e) { - throw new InvalidParameterException(); - } + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.util.console.Command#run(java.util.List) + */ + @Override + public void run(List parameters) { + String sequencesName; + try { + sequencesName = (String) parameters.get(0); + } + catch (Exception e) { + throw new InvalidParameterException(); + } - Object dataObject = GlobalDataContainer.getInstance().getData( - sequencesName); - if (dataObject == null) { - CommandHelpers.objectNotFoundMessage(sequencesName); - return; - } - if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { - CommandHelpers.objectNotType(sequencesName, - "Collection>>"); - return; - } + Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName); + if (dataObject == null) { + CommandHelpers.objectNotFoundMessage(sequencesName); + return; + } + if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) { + CommandHelpers.objectNotType(sequencesName, "Collection>>"); + return; + } - Shell shell = new Shell(SWT.NONE); - shell.open(); - shell.layout(); - shell.setSize(0, 0); - SequencesDialog sequencesDialog = new SequencesDialog(shell, SWT.NONE); - sequencesDialog.open(sequencesName); - shell.dispose(); - } + Shell shell = new Shell(SWT.NONE); + shell.open(); + shell.layout(); + shell.setSize(0, 0); + SequencesDialog sequencesDialog = new SequencesDialog(shell, SWT.NONE); + sequencesDialog.open(sequencesName); + shell.dispose(); + } }