Changeset 1853 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolIdentityMap.java

Timestamp:

12/23/14 11:39:42 (10 years ago)

Author:

pharms

Message:

• rename of task instance comparator to task comparator as it actually compares tasks

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolIdentityMap.java (modified) (11 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TaskSymbolIdentityMap.java

@@ -20 +20 @@
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.usageprofiles.SymbolMap;
 
@@ -31 +30 @@
  * @author Patrick Harms
  */
-public class TaskSymbolIdentityMap<V> implements SymbolMap<ITaskInstance, V> {
+public class TaskSymbolIdentityMap<V> implements SymbolMap<ITask, V> {
 
     /**  */
@@ -48 +47 @@
      * </p>
      */
-    private Map<ITask, ITaskInstance> symbols;
+    private Map<ITask, ITask> symbols;
 
     /**
@@ -57 +56 @@
     public TaskSymbolIdentityMap() {
         delegate = new HashMap<ITask, V>();
-        symbols = new HashMap<ITask, ITaskInstance>();
+        symbols = new HashMap<ITask, ITask>();
     }
 
@@ -67 +66 @@
      * @param other the map to be copied
      */
-    public TaskSymbolIdentityMap(SymbolMap<ITaskInstance, V> other) {
+    public TaskSymbolIdentityMap(SymbolMap<ITask, V> other) {
         if (other == null) {
             throw new IllegalArgumentException("other map must not be null");
@@ -73 +72 @@
         
         delegate = new HashMap<ITask, V>();
-        symbols = new HashMap<ITask, ITaskInstance>();
+        symbols = new HashMap<ITask, ITask>();
         
-        for (ITaskInstance symbol : other.getSymbols()) {
-            delegate.put(symbol.getTask(), other.getValue(symbol));
-            symbols.put(symbol.getTask(), symbol);
+        for (ITask symbol : other.getSymbols()) {
+            delegate.put(symbol, other.getValue(symbol));
+            symbols.put(symbol, symbol);
         }
     }
@@ -101 +100 @@
      */
     @Override
-    public boolean containsSymbol(ITaskInstance symbol) {
+    public boolean containsSymbol(ITask symbol) {
         if (symbol == null) {
             throw new IllegalArgumentException("symbol must not be null");
         }
         
-        return delegate.containsKey(symbol.getTask());
+        return delegate.containsKey(symbol);
     }
 
@@ -113 +112 @@
      */
     @Override
-    public V getValue(ITaskInstance symbol) {
+    public V getValue(ITask symbol) {
         if (symbol == null) {
             throw new IllegalArgumentException("symbol must not be null");
         }
         
-        return delegate.get(symbol.getTask());
+        return delegate.get(symbol);
     }
 
@@ -125 +124 @@
      */
     @Override
-    public void addSymbol(ITaskInstance symbol, V value) {
+    public void addSymbol(ITask symbol, V value) {
         if (symbol == null) {
             throw new IllegalArgumentException("symbol must not be null");
         }
         
-        delegate.put(symbol.getTask(), value);
-        symbols.put(symbol.getTask(), symbol);
+        delegate.put(symbol, value);
+        symbols.put(symbol, symbol);
     }
 
@@ -138 +137 @@
      */
     @Override
-    public V removeSymbol(ITaskInstance symbol) {
+    public V removeSymbol(ITask symbol) {
         if (symbol == null) {
             throw new IllegalArgumentException("symbol must not be null");
         }
         
-        symbols.remove(symbol.getTask());
-        return delegate.remove(symbol.getTask());
+        symbols.remove(symbol);
+        return delegate.remove(symbol);
     }
 
@@ -151 +150 @@
      */
     @Override
-    public Collection<ITaskInstance> getSymbols() {
+    public Collection<ITask> getSymbols() {
         return symbols.values();
     }