Changeset 359

Timestamp:

01/27/12 11:19:08 (13 years ago)

Author:

sherbold

Message:

• adapted de.ugoe.cs.eventbench.jfc.data.JFCEvent and de.ugoe.cs.eventbench.jfc.JFCLogParser create JFCEvents with more detailed information about the message target

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc

Files:

• JFCLogParser.java (modified) (5 diffs)
• data/JFCEvent.java (modified) (3 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/JFCLogParser.java

@@ -58 +58 @@
          */
         private List<JFCEvent> currentSequence = null;
+        
+        /**
+         * <p>
+         * Internally used string to build a string representing a component-node.
+         * </p>
+         */
+        private String componentString;
 
         /**
@@ -69 +76 @@
          */
         private enum ParamSource {
-                EVENT, SOURCE, PARENT
+                EVENT, SOURCE, PARENT, COMPONENT
         };
 
@@ -132 +139 @@
                                 currentEvent.addParentInformation(atts.getValue("name"),
                                                 atts.getValue("value"));
+                        } else if (paramSource == ParamSource.COMPONENT) {
+                                componentString += "'" + atts.getValue("value") + "',";
                         }
                 } else if (qName.equals("source")) {
@@ -137 +146 @@
                 } else if (qName.equals("parent")) {
                         paramSource = ParamSource.PARENT;
+                } else if (qName.equals("component")) {
+                        paramSource = ParamSource.COMPONENT;
+                        componentString = "[";
                 }
         }
@@ -160 +172 @@
                         }
                         currentSequence = null;
+                } else if (qName.equals("component")) {
+                        paramSource.equals(ParamSource.SOURCE);
+                        currentEvent.extendTarget(componentString.substring(0, componentString.length()-1)+"]");
                 }
         }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/data/JFCEvent.java

@@ -6 +6 @@
 import de.ugoe.cs.eventbench.data.IReplayable;
 import de.ugoe.cs.eventbench.data.ReplayableEvent;
+import de.ugoe.cs.eventbench.jfc.JFCLogParser;
 
 /**
@@ -98 +99 @@
          */
         public void addSourceInformation(String name, String value) {
-                if( "toString".equals(name) ) {
-                        setTarget(value);
-                }
                 sourceParameters.put(name, value);
         }
@@ -129 +127 @@
         public void addParentInformation(String name, String value) {
                 parentParameters.put(name, value);
+        }
+
+        /**
+         * <p>
+         * Used by the {@link JFCLogParser} to extend the target string of the
+         * current event with a further ancestor. The resulting target string will
+         * have the structure {@code etc.grandparent.parent.eventtarget}.
+         * </p>
+         * 
+         * @param extension
+         *            extension for the target.
+         */
+        public void extendTarget(String extension) {
+                if (target == null || "".equals(target)) {
+                        target = extension;
+                } else {
+                        target += "." + extension;
+                }
         }