Changeset 566 for trunk/quest-ui-core/src

Timestamp:

08/17/12 10:22:43 (12 years ago)

Author:

sherbold

Message:

• adapted MFC plugin to new event core

Location:

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc

Files:

• EventGenerator.java (modified) (10 diffs)
• MFCLogParser.java (modified) (5 diffs)
• SequenceSplitter.java (modified) (6 diffs)
• commands/CMDparseXML.java (modified) (2 diffs)
• eventcore/MFCEventTarget.java (added)
• eventcore/MFCEventType.java (added)
• eventcore/WindowsEvent.java (modified) (3 diffs)
• eventcore/WindowsMessage.java (modified) (2 diffs)

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java

@@ -18 +18 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.plugin.mfc.eventcore.MFCEventTarget;
+import de.ugoe.cs.quest.plugin.mfc.eventcore.MFCEventType;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowTree;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowTreeNode;
-import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsEvent;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsMessage;
 import de.ugoe.cs.util.console.Console;
@@ -81 +82 @@
          * </p>
          */
-        private WindowsEvent currentToken;
+        private Event currentToken;
+        
+        /**
+         * <p>
+         * Event type of the current token. Stored as a member to be able to update it during the parsing of the idinfo tag.
+         * </p>
+         */
+        private MFCEventType currentType;
 
         /**
@@ -132 +140 @@
          */
         @SuppressWarnings("unchecked")
-        public WindowsEvent generateEvent(List<WindowsMessage> sequence) {
+        public Event generateEvent(List<WindowsMessage> sequence) {
                 Document rulesDoc = getDocument(rulesFile);
                 Element rulesRoot = rulesDoc.getRootElement();
@@ -144 +152 @@
                         Element currentRule = ruleElements.get(ruleIndex);
                         currentRuleName = currentRule.getAttributeValue("name");
-                        currentToken = new WindowsEvent(currentRuleName);
-                        currentToken.setDecorator(MFCReplayDecorator.getInstance());
+                        currentType = new MFCEventType(currentRuleName);
+                        currentToken = new Event(currentType);
+                        
                         isMatch = true;
                         messageStorage = new HashMap<String, Object>();
@@ -183 +192 @@
                                                 } catch (InvalidParameterException e) {
                                                         Console.printerrln(e.getMessage());
-                                                        currentToken.invalidateReplay();
+                                                        // TODO currentToken.invalidateReplay();
                                                 }
                                         } else if (genMsgElement.getName().equals("genMsgSeq")) {
                                                 try {
                                                         generateReplaySequence(genMsgElement);
-                                                        currentToken.invalidateReplay();
+                                                        // TODO currentToken.invalidateReplay();
                                                 } catch (InvalidParameterException e) {
                                                         Console.printerrln(e.getMessage());
-                                                        currentToken.invalidateReplay();
+                                                        // TODO currentToken.invalidateReplay();
                                                 }
                                         }
@@ -200 +209 @@
                                         // cannot be empty if document is valid
                                         List<Element> valueElements = idinfoElement.getChildren();
-                                        currentToken.setIdInfo(getTermValue(null,
+                                        currentType.setInfo(getTermValue(null,
                                                         valueElements.get(0)));
                                 }
-                                Console.traceln(currentRule.getAttributeValue("name")
-                                                + currentToken.getIdInfo() + " matched");
+                                Console.traceln(currentToken.getType().toString() + " matched");
                         } else {
                                 currentToken = null;
@@ -249 +257 @@
                                 if (isMatch) {
                                         handleStorage(messageElement, currentMessage);
-                                        currentToken.setTarget(currentMessage
-                                                        .getXmlWindowDescription());
-                                        currentToken
-                                                        .setTargetShort(currentMessage.getParentNames());
+                                        currentToken.setTarget(new MFCEventTarget(currentMessage
+                                                        .getXmlWindowDescription()));
+                                        // TODO currentToken.setTargetShort(currentMessage.getParentNames());
                                 }
                         }
@@ -298 +305 @@
                                 if (isCurrentMatch) {
                                         handleStorage(messageElement, currentMessage);
-                                        currentToken.setTarget(currentMessage
-                                                        .getXmlWindowDescription());
-                                        currentToken
-                                                        .setTargetShort(currentMessage.getParentNames());
+                                        currentToken.setTarget(new MFCEventTarget(currentMessage
+                                                        .getXmlWindowDescription()));
+                                        // TODO currentToken.setTargetShort(currentMessage.getParentNames());
                                 }
                         }
@@ -516 +522 @@
                         generatedMessage.setDelay(delay);
                 } else {
-                        currentToken.invalidateReplay();
-                }
-                currentToken.addReplayEvent(generatedMessage);
+                        // TODO currentToken.invalidateReplay();
+                }
+                currentToken.addReplayable(generatedMessage);
         }
 
@@ -568 +574 @@
                         }
                 }
-                currentToken.addReplaySequence(generatedMessageSeq);
+                currentToken.addReplayableSequence(generatedMessageSeq);
         }
 

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/MFCLogParser.java

@@ -23 +23 @@
 import org.xml.sax.helpers.DefaultHandler;
 
+import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowTree;
-import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsEvent;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsMessage;
 import de.ugoe.cs.util.StringTools;
@@ -71 +71 @@
          * </p>
          */
-        private Collection<List<WindowsEvent>> sequences;
+        private Collection<List<Event>> sequences;
 
         /**
@@ -110 +110 @@
         public MFCLogParser(boolean countMessageOccurences) {
                 sequenceSplitter = new SequenceSplitter();
-                sequences = new LinkedList<List<WindowsEvent>>();
+                sequences = new LinkedList<List<Event>>();
                 currentHandler = null;
                 this.countMessageOccurences = countMessageOccurences;
@@ -127 +127 @@
          * @return collection of event sequences
          */
-        public Collection<List<WindowsEvent>> getSequences() {
+        public Collection<List<Event>> getSequences() {
                 return sequences;
         }
@@ -209 +209 @@
                 } else if (qName.equals("session")) {
                         sequenceSplitter.endSession();
-                        List<WindowsEvent> seq = sequenceSplitter.getSequence();
+                        List<Event> seq = sequenceSplitter.getSequence();
                         if( seq!=null && !seq.isEmpty() ) {
                                 sequences.add(seq);

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/SequenceSplitter.java

@@ -5 +5 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsEvent;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsMessage;
 import de.ugoe.cs.util.console.Console;
@@ -57 +56 @@
          * </p>
          */
-        private List<WindowsEvent> actionSequence;
+        private List<Event> actionSequence;
 
         /**
@@ -76 +75 @@
                 initMessages = true;
                 tokenGenerator = new EventGenerator();
-                actionSequence = new LinkedList<WindowsEvent>();
+                actionSequence = new LinkedList<Event>();
                 prevMsg = 0;
         }
@@ -91 +90 @@
                 if (startOfSequence(msg)) {
                         if (!initMessages) {
-                                WindowsEvent currentAction = tokenGenerator
+                                Event currentAction = tokenGenerator
                                                 .generateEvent(currentSequence);
                                 if (currentAction != null) {
@@ -129 +128 @@
          * @return generated event sequence
          */
-        public List<WindowsEvent> getSequence() {
+        public List<Event> getSequence() {
                 return actionSequence;
         }
@@ -140 +139 @@
          */
         public void endSession() {
-                WindowsEvent currentAction = tokenGenerator
+                Event currentAction = tokenGenerator
                                 .generateEvent(currentSequence);
                 if (currentAction != null) {

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/commands/CMDparseXML.java

@@ -7 +7 @@
 
 import de.ugoe.cs.quest.CommandHelpers;
+import de.ugoe.cs.quest.eventcore.Event;
 import de.ugoe.cs.quest.plugin.mfc.MFCLogParser;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.MFCTargetComparator;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowTree;
-import de.ugoe.cs.quest.plugin.mfc.eventcore.WindowsEvent;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.util.console.Command;
@@ -63 +63 @@
                 parser.parseFile(filename);
 
-                Collection<List<WindowsEvent>> sequences = parser.getSequences();
+                Collection<List<Event>> sequences = parser.getSequences();
                 
                 Console.traceln("Pre-computing event target equalities.");
                 // compare all Events to a dummy event to make sure they are known by
                 // the MFCTargetComparator
-                WindowsEvent dummyEvent = new WindowsEvent("dummy");
-                for (List<WindowsEvent> sequence : sequences) {
-                        for (WindowsEvent event : sequence) {
+                Event dummyEvent = Event.STARTEVENT;
+                for (List<Event> sequence : sequences) {
+                        for (Event event : sequence) {
                                 event.equals(dummyEvent);
                         }

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/eventcore/WindowsEvent.java

@@ -10 +10 @@
 import org.w3c.dom.NodeList;
 
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
+import de.ugoe.cs.quest.eventcore.Event;
+
 
 /**
@@ -19 +20 @@
  * @author Steffen Herbold
  * @version 1.0
+ * @deprecated This class is deprecated and only kept for now for documentation - some features still need to be extracted and reconstructed elsewhere
  */
-public class WindowsEvent extends ReplayableEvent<WindowsMessage> {
+public class WindowsEvent extends Event {
 
         /**
@@ -39 +41 @@
          */
         public WindowsEvent(String type) {
-                super(type);
+                super(new MFCEventType("foo"));
         }
 
-        @Override
+        //@Override
         protected boolean targetEquals(String otherTarget) {
-                return MFCTargetComparator.compare(target, otherTarget);
+                return MFCTargetComparator.compare(target.toString(), otherTarget);
         }
         
         int targetHash = 0;
         
-        @Override
+        //@Override
         protected int targetHashCode() {
                 if( targetHash==0 ) {

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/mfc/eventcore/WindowsMessage.java

@@ -5 +5 @@
 import java.util.Map;
 
+import de.ugoe.cs.quest.IReplayDecorator;
 import de.ugoe.cs.quest.eventcore.IReplayable;
+import de.ugoe.cs.quest.plugin.mfc.MFCReplayDecorator;
 import de.ugoe.cs.util.StringTools;
 
@@ -509 +511 @@
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget()
-         */
-        @Override
-        public String getTarget() {
-                return xmlWindowDescription;
-        }
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.quest.eventcore.IReplayable#getDecorator()
+     */
+    @Override
+    public IReplayDecorator getDecorator() {
+        return MFCReplayDecorator.getInstance();
+    }
 }