Changeset 553 for trunk/quest-core-events

Timestamp:

08/16/12 16:08:48 (12 years ago)

Author:

sherbold

Message:

• countless adaptations throughout nearly all components to remove errors introduced due to the refactoring of the event core
• added StringEventType? as a simple-to-use event type instead of DummyEventType?

Location:

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore

Files:

• Event.java (modified) (3 diffs)
• StringEventType.java (copied) (copied from trunk/quest-core-usageprofiles-test/src/test/java/de/ugoe/cs/quest/usageprofiles/mock/StringEventType.java) (1 diff)

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/Event.java

@@ -30 +30 @@
      * </p>
      */
-    public static final Event STARTEVENT = new Event(new DummyEventType());
+    public static final Event STARTEVENT = new Event(new StringEventType("START"));
 
     /**
@@ -36 +36 @@
      * Global end event that can be used to indicate the end of a sequence.
      */
-    public static final Event ENDEVENT = new Event(new DummyEventType());
+    public static final Event ENDEVENT = new Event(new StringEventType("END"));
 
     /**
@@ -160 +160 @@
      */
     public String getId() {
-        return "(" + type.toString() + ";" + target.toString() + ")";
+        String id = type.toString();
+        if( target!=null ) {
+            id += "." + target.toString();
+        }
+        return id;
     }
 

trunk/quest-core-events/src/main/java/de/ugoe/cs/quest/eventcore/StringEventType.java

@@ -1 @@
-package de.ugoe.cs.quest.usageprofiles.mock;
 
-import de.ugoe.cs.quest.eventcore.IEventType;
+package de.ugoe.cs.quest.eventcore;
 
+import java.security.InvalidParameterException;
+
+/**
+ * <p>
+ * A simple event type that is identified by a string.
+ * </p>
+ * 
+ * @version $Revision: $ $Date: Aug 16, 2012$
+ * @author 2012, last modified by $Author: sherbold$
+ */
 public class StringEventType implements IEventType {
-    /**  */
+
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
     private static final long serialVersionUID = 1L;
-    String str;
 
-    public StringEventType(String str) {
+    /**
+     * <p>
+     * String that identifies the event type.
+     * </p>
+     */
+    private String str;
+
+    /**
+     * <p>
+     * Constructor. Creates a new StringEventType. str must not be null.
+     * </p>
+     * 
+     * @param str
+     *            string that identifies the event type
+     * @throws InvalidParameterException
+     *             thrown if str is null
+     */
+    public StringEventType(String str) throws InvalidParameterException {
         if (str == null) {
-            throw new AssertionError(
-                                     "illegal use of mock StringEventType: str must nut be null");
+            throw new InvalidParameterException("str must not be null");
         }
         this.str = str;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.quest.eventcore.IEventType#getName()
+     */
+    @Override
     public String getName() {
         return "StringEventType";
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return str;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return str.hashCode();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
     @Override
     public boolean equals(Object other) {