Changeset 1357 for trunk/autoquest-core-tasktrees/src/main

Timestamp:

02/07/14 18:08:10 (11 years ago)

Author:

pharms

Message:

• improved logging

Location:

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

Files:

• treeifc/ITask.java (modified) (1 diff)
• treeimpl/EventTask.java (modified) (1 diff)
• treeimpl/MarkingTemporalRelationship.java (modified) (3 diffs)
• treeimpl/StructuringTemporalRelationship.java (modified) (1 diff)
• treeimpl/Task.java (modified) (5 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeifc/ITask.java

@@ -44 +44 @@
     /**
      * <p>
-     * returns a human readable description for task. 
+     * returns a human readable type for the task. 
+     * </p>
+     * 
+     * @return as described
+     */
+    public String getType();
+
+    /**
+     * <p>
+     * returns a human readable description for the task. 
      * </p>
      * 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/EventTask.java

@@ -43 +43 @@
      */
     EventTask(String description) {
-        super.setDescription(description);
+        super(description);
     }
 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/MarkingTemporalRelationship.java

@@ -46 +46 @@
     /**
      * <p>
-     * a human readable name for this temporal relationship
-     * </p>
-     */
-    private String relationshipType;
-    
-    /**
-     * <p>
      * initializes this temporal relationship with a human readable name
      * </p>
@@ -59 +52 @@
      */
     MarkingTemporalRelationship(String relationshipType) {
+        super(relationshipType);
+        
         if ((relationshipType == null) || ("".equals(relationshipType))) {
             throw new IllegalArgumentException
                 ("the relationship type must be something meaningful");
         }
-        
-        this.relationshipType = relationshipType;
-        super.setDescription(this.relationshipType);
     }
 
@@ -101 +93 @@
         this.markedTask = markedTask;
         
-        super.setDescription(relationshipType + " of " + markedTask);
+        super.setDescription(markedTask.toString());
     }
 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/StructuringTemporalRelationship.java

@@ -55 +55 @@
      */
     StructuringTemporalRelationship(String relationshipType) {
+        super(relationshipType);
+        
         if ((relationshipType == null) || ("".equals(relationshipType))) {
             throw new IllegalArgumentException
                 ("the relationship type must be something meaningful");
         }
-        
-        super.setDescription(relationshipType);
     }
 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/Task.java

@@ -54 +54 @@
      */
     private int id;
+    
+    /**
+     * <p>
+     * a human readable type of the task (used for visualization purposes)
+     * </p>
+     */
+    private String type;
 
     /**
@@ -72 +79 @@
      * <p>
      * constructs a new task with a new id. The id is generated using the {@link #getNewId()}
-     * methdod
-     * </p>
-     */
-    Task() {
-        id = getNewId();
+     * method
+     * </p>
+     * 
+     * @param type the human readable type of the task
+     * 
+     * @throws IllegalArgumentException in the case the provided type is null
+     */
+    Task(String type) {
+        this.id = getNewId();
+        this.type = type;
+        
+        if (type == null) {
+            throw new IllegalArgumentException("type must not be null");
+        }
     }
 
@@ -101 +117 @@
     public int getId() {
         return id;
+    }
+
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITask#getType()
+     */
+    @Override
+    public String getType() {
+        return type;
     }
 
@@ -143 +167 @@
     public synchronized String toString() {
         StringBuffer result = new StringBuffer();
-        result.append("task ");
+        result.append(type);
+        result.append(" #");
         result.append(id);
         
@@ -185 +210 @@
     /**
      * <p>
+     * internally used to remove an instance from this task
+     * </p>
+     * 
+     * @param instance the instance to be removed from this task
+     */
+    void removeInstance(ITaskInstance instance) {
+        this.instances.remove(instance);
+    }
+
+    /**
+     * <p>
      * internally used to add an instance to this task
      * </p>