Changeset 451 for trunk


Ignore:
Timestamp:
07/24/12 12:08:42 (12 years ago)
Author:
pharms
Message:

refactored to integrate it into QUEST

Location:
trunk/quest-core-tasktrees
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/quest-core-tasktrees/pom.xml

    r439 r451  
    1010  <dependencies> 
    1111    <dependency> 
    12       <groupId>de.ugoe.cs.tasktree</groupId> 
    13       <artifactId>userinteraction</artifactId> 
     12      <groupId>de.ugoe.cs.quest</groupId> 
     13      <artifactId>quest-core-events-patrick</artifactId> 
    1414      <version>0.0.1-SNAPSHOT</version> 
    15     </dependency> 
    16     <dependency> 
    17         <groupId>junit</groupId> 
    18         <artifactId>junit</artifactId> 
    19         <version>4.8.1</version> 
    20         <scope>test</scope> 
    2115    </dependency> 
    2216  </dependencies> 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java

    r439 r451  
    1313import java.util.logging.Logger; 
    1414 
     15import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     16import de.ugoe.cs.quest.eventcore.userinteraction.InteractionEvent; 
     17import de.ugoe.cs.quest.eventcore.userinteraction.KeyInteraction; 
     18import de.ugoe.cs.quest.eventcore.userinteraction.KeyboardFocusChange; 
     19import de.ugoe.cs.quest.eventcore.userinteraction.UserInteractionProvider; 
    1520import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1621import de.ugoe.cs.quest.tasktrees.treeifc.Sequence; 
    … …  
    1924import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    2025import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    21 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    22 import de.ugoe.cs.tasktree.userinteraction.InteractionEvent; 
    23 import de.ugoe.cs.tasktree.userinteraction.KeyInteraction; 
    24 import de.ugoe.cs.tasktree.userinteraction.KeyboardFocusChange; 
    25 import de.ugoe.cs.tasktree.userinteraction.UserInteractionProvider; 
    2626 
    2727//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultGUIElementSequenceDetectionRule.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.temporalrelation; 
    99 
     10import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
    1011import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1112import de.ugoe.cs.quest.tasktrees.treeifc.Sequence; 
    … …  
    1314import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    1415import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    15 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    1616 
    1717//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultMouseClickReductionRule.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.temporalrelation; 
    99 
     10import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     11import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonDown; 
     12import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonInteraction; 
     13import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonUp; 
     14import de.ugoe.cs.quest.eventcore.userinteraction.MouseClick; 
    1015import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1116import de.ugoe.cs.quest.tasktrees.treeifc.Sequence; 
    … …  
    1318import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    1419import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    15 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    16 import de.ugoe.cs.tasktree.userinteraction.MouseButtonDown; 
    17 import de.ugoe.cs.tasktree.userinteraction.MouseButtonInteraction; 
    18 import de.ugoe.cs.tasktree.userinteraction.MouseButtonUp; 
    19 import de.ugoe.cs.tasktree.userinteraction.MouseClick; 
    2020 
    2121//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultTextInputReductionRule.java

    r439 r451  
    1212import java.util.Locale; 
    1313 
     14import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     15import de.ugoe.cs.quest.eventcore.guimodel.TextArea; 
     16import de.ugoe.cs.quest.eventcore.guimodel.TextField; 
     17import de.ugoe.cs.quest.eventcore.userinteraction.KeyInteraction; 
     18import de.ugoe.cs.quest.eventcore.userinteraction.KeyPressed; 
     19import de.ugoe.cs.quest.eventcore.userinteraction.KeyReleased; 
    1420import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1521import de.ugoe.cs.quest.tasktrees.treeifc.Sequence; 
    … …  
    1824import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    1925import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask; 
    20 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    21 import de.ugoe.cs.tasktree.guimodel.TextArea; 
    22 import de.ugoe.cs.tasktree.guimodel.TextField; 
    2326import de.ugoe.cs.tasktree.keyboardmaps.KeyboardMap; 
    2427import de.ugoe.cs.tasktree.keyboardmaps.KeyboardMapFactory; 
    2528import de.ugoe.cs.tasktree.keyboardmaps.VirtualKey; 
    26 import de.ugoe.cs.tasktree.userinteraction.KeyInteraction; 
    27 import de.ugoe.cs.tasktree.userinteraction.KeyPressed; 
    28 import de.ugoe.cs.tasktree.userinteraction.KeyReleased; 
    2929 
    3030//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.temporalrelation; 
    99 
     10import de.ugoe.cs.quest.eventcore.guimodel.TrackBar; 
     11import de.ugoe.cs.quest.eventcore.userinteraction.ValueSelection; 
    1012import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEquality; 
    1113import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEqualityRuleManager; 
    … …  
    1719import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    1820import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    19 import de.ugoe.cs.tasktree.guimodel.TrackBar; 
    20 import de.ugoe.cs.tasktree.userinteraction.ValueSelection; 
    2121 
    2222//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/InteractionTask.java

    r439 r451  
    99package de.ugoe.cs.quest.tasktrees.treeifc; 
    1010 
    11 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    12 import de.ugoe.cs.tasktree.userinteraction.Interaction; 
    13  
     11import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     12import de.ugoe.cs.quest.eventcore.userinteraction.Interaction; 
    1413 
    1514//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/TaskTreeNodeFactory.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.treeifc; 
    99 
    10 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    11 import de.ugoe.cs.tasktree.userinteraction.Interaction; 
     10import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     11import de.ugoe.cs.quest.eventcore.userinteraction.Interaction; 
    1212 
    1313//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/InteractionTaskImpl.java

    r439 r451  
    99package de.ugoe.cs.quest.tasktrees.treeimpl; 
    1010 
     11import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     12import de.ugoe.cs.quest.eventcore.userinteraction.Interaction; 
    1113import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1214import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    13 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    14 import de.ugoe.cs.tasktree.userinteraction.Interaction; 
    1515 
    1616//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeFactoryImpl.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.treeimpl; 
    99 
     10import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     11import de.ugoe.cs.quest.eventcore.userinteraction.Interaction; 
    1012import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask; 
    1113import de.ugoe.cs.quest.tasktrees.treeifc.Iteration; 
    … …  
    1618import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory; 
    1719import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask; 
    18 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    19 import de.ugoe.cs.tasktree.userinteraction.Interaction; 
    2020 
    2121//------------------------------------------------------------------------------------------------- 

  • trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TextInputInteractionTaskImpl.java

    r439 r451  
    88package de.ugoe.cs.quest.tasktrees.treeimpl; 
    99 
     10import de.ugoe.cs.quest.eventcore.guimodel.GUIElement; 
     11import de.ugoe.cs.quest.eventcore.userinteraction.TextInput; 
    1012import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode; 
    1113import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask; 
    12 import de.ugoe.cs.tasktree.guimodel.GUIElement; 
    13 import de.ugoe.cs.tasktree.userinteraction.TextInput; 
    1414 
    1515//------------------------------------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.