Changeset 750


Ignore:
Timestamp:
09/03/12 10:57:43 (12 years ago)
Author:
sherbold
Message:
  • added command cleanupKeyInteractions to handle invalid KeyPressed/KeyReleased? pairs
  • fixed minor bug in command condenseMouseClicks
  • fixed minor bug in command correctKeyInteractionTargets
  • fixed minor bug in command detectTextInputEvents
  • fixed minor bug in command sortKeyInteractions
  • beautified showing of sequences in SWT GUI
  • updated ArgoUML GUI Mappings
Location:
trunk
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/quest-plugin-jfc/data/guimappings/guimapping-argouml.txt

    r741 r750  
    4141org.tigris.toolbar.toolbutton.ModalButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCButton 
    4242org.tigris.toolbar.toolbutton.PopupToolBoxButton = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCMenuButton 
     43org.argouml.core.propertypanels.ui.UMLExpressionLanguageField = de.ugoe.cs.quest.plugin.jfc.guimodel.JFCGUIElement 

  • trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcondenseMouseClicks.java

    r733 r750  
    8080 
    8181        if (GlobalDataContainer.getInstance().addData(newSequencesName, newSequences)) { 
    82             CommandHelpers.dataOverwritten(sequencesName); 
     82            CommandHelpers.dataOverwritten(newSequencesName); 
    8383        } 
    8484         

  • trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDcorrectKeyInteractionTargets.java

    r733 r750  
    8181 
    8282        if (GlobalDataContainer.getInstance().addData(newSequencesName, newSequences)) { 
    83             CommandHelpers.dataOverwritten(sequencesName); 
     83            CommandHelpers.dataOverwritten(newSequencesName); 
    8484        } 
    8585         

  • trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDdetectTextInputEvents.java

    r733 r750  
    7777 
    7878        if (GlobalDataContainer.getInstance().addData(newSequencesName, newSequences)) { 
    79             CommandHelpers.dataOverwritten(sequencesName); 
     79            CommandHelpers.dataOverwritten(newSequencesName); 
    8080        } 
    8181         

  • trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/commands/sequences/CMDsortKeyInteractions.java

    r733 r750  
    104104 
    105105        if (GlobalDataContainer.getInstance().addData(newSequencesName, newSequences)) { 
    106             CommandHelpers.dataOverwritten(sequencesName); 
     106            CommandHelpers.dataOverwritten(newSequencesName); 
    107107        } 
    108108         

  • trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java

    r659 r750  
    2424    protected Shell shell; 
    2525    private Table table; 
     26    private TableColumn tblclmnEventIndex; 
    2627    private TableColumn tblclmnEventType; 
    2728    private TableColumn tblclmnEventTarget; 
    … …  
    7172        table.setHeaderVisible(true); 
    7273        table.setLinesVisible(true); 
     74         
     75        tblclmnEventIndex = new TableColumn(table, SWT.NONE); 
     76        tblclmnEventIndex.setAlignment(20); 
     77         
    7378 
    7479        tblclmnEventType = new TableColumn(table, SWT.NONE); 
    … …  
    166171    private void updateTableContents() { 
    167172        table.removeAll(); 
     173        int index = 1; 
    168174        for (Event event : sequence) { 
    169175            TableItem tableItem = new TableItem(table, SWT.NONE); 
    … …  
    178184            } 
    179185            tableItem.setText(new String[] 
    180                 { event.getType().toString(), target }); 
     186                { ""+(index++), event.getType().toString(), target }); 
    181187        } 
    182188        for (int i = 0; i < table.getColumnCount(); i++) { 
    … …  
    186192 
    187193    private void openInsertDialog(int position) { 
    188         InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, SWT.NONE, guiModel); 
    189         Event event = insertDialog.open(); 
    190         if (event != null) { 
    191             sequence.add(position, event); 
    192             updateTableContents(); 
     194        if (guiModel == null) { 
     195            MessageBox messageBox = new MessageBox(shell, SWT.ERROR); 
     196            messageBox.setMessage("Operation not supported!\nOnly works for GUI sequences."); 
     197            messageBox.setText("Error"); 
     198            messageBox.open(); 
     199        } else { 
     200            InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell, SWT.NONE, guiModel); 
     201            Event event = insertDialog.open(); 
     202            if (event != null) { 
     203                sequence.add(position, event); 
     204                updateTableContents(); 
     205            } 
    193206        } 
    194207    } 

  • trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java

    r667 r750  
    133133                guiModel = (GUIModel) targetObject; 
    134134            } 
    135             if (guiModel == null) { 
    136                 MessageBox messageBox = new MessageBox(shell, SWT.ERROR); 
    137                 messageBox.setMessage("Operation not supported!\nOnly works for GUI sequences."); 
    138                 messageBox.setText("Error"); 
    139                 messageBox.open(); 
    140             } 
    141135        } 
    142136        else { 
Note: See TracChangeset for help on using the changeset viewer.