Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/EFGModelGenerator.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/EFGModelGenerator.java (revision 555) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/EFGModelGenerator.java (revision 556) @@ -8,5 +8,7 @@ import de.ugoe.cs.quest.eventcore.Event; -import de.ugoe.cs.quest.plugin.guitar.eventcore.EFGEvent; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventTarget; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventType; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITARReplayable; import de.ugoe.cs.quest.ui.commands.CMDupdateModel; import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton; @@ -44,5 +46,5 @@ EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class); - Collection>> subsequences = generateEdgeSequences(efg); + Collection> subsequences = generateEdgeSequences(efg); FirstOrderMarkovModel model = new FirstOrderMarkovModel(new Random()); model.train(subsequences); @@ -63,5 +65,5 @@ EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class); - Collection>> subsequences = generateEdgeSequences(efg); + Collection> subsequences = generateEdgeSequences(efg); DeterministicFiniteAutomaton model = new DeterministicFiniteAutomaton( new Random()); @@ -81,6 +83,6 @@ * @return edge sequence set */ - private Collection>> generateEdgeSequences(EFG efg) { - List> events = createEvents(efg); + private Collection> generateEdgeSequences(EFG efg) { + List events = createEvents(efg); /* * getEventGraph returns an adjacency matrix, i.e., a square matrix of @@ -89,5 +91,5 @@ */ EventGraphType efgGraph = efg.getEventGraph(); - Collection>> subsequences = new LinkedList>>(); + Collection> subsequences = new LinkedList>(); int efgSize = events.size(); @@ -97,5 +99,5 @@ // otherEvent is followed by currentEvent if (relation != GUITARConstants.NO_EDGE) { - List> edge = new LinkedList>(); + List edge = new LinkedList(); edge.add(events.get(row)); edge.add(events.get(col)); @@ -116,7 +118,7 @@ * @return list of events */ - private List> createEvents(EFG efg) { + private List createEvents(EFG efg) { List efgEvents = efg.getEvents().getEvent(); - List> myEvents = new ArrayList>(efgEvents.size()); + List myEvents = new ArrayList(efgEvents.size()); for (EventType event : efgEvents) { /* @@ -124,7 +126,8 @@ * "interpretation" is found in the GUI file. */ - Event myEvent = new EFGEvent(event.getEventId()); - myEvent.setTarget(event.getWidgetId()); - myEvents.add(myEvent); + GUITAREventType type = new GUITAREventType(event.getEventId()); + GUITAREventTarget target = new GUITAREventTarget(event.getWidgetId()); + Event myEvent = new Event(type, target); + myEvent.addReplayable(new GUITARReplayable(event.getEventId())); } return myEvents; Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/GUITARTestCaseParser.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/GUITARTestCaseParser.java (revision 555) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/GUITARTestCaseParser.java (revision 556) @@ -6,5 +6,7 @@ import de.ugoe.cs.quest.eventcore.Event; -import de.ugoe.cs.quest.plugin.guitar.eventcore.EFGEvent; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventTarget; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventType; +import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITARReplayable; import edu.umd.cs.guitar.model.IO; import edu.umd.cs.guitar.model.data.EFG; @@ -70,13 +72,15 @@ * @return event sequence describing the test case */ - public List> parseTestCaseFile(File testcaseFile) { + public List parseTestCaseFile(File testcaseFile) { TestCase testcase = (TestCase) IO.readObjFromFile( testcaseFile.getAbsolutePath(), TestCase.class); List steps = testcase.getStep(); - List> sequence = new LinkedList>(); + List sequence = new LinkedList(); for (StepType step : steps) { String eventId = step.getEventId(); - EFGEvent event = new EFGEvent(eventId); - event.setTarget(getWidgetId(eventId)); + GUITAREventType type = new GUITAREventType(eventId); + GUITAREventTarget target = new GUITAREventTarget(getWidgetId(eventId)); + Event event = new Event(type, target); + event.addReplayable(new GUITARReplayable(eventId)); sequence.add(event); } Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java (revision 555) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java (revision 556) @@ -53,5 +53,5 @@ } }); - Collection>> sequences = new LinkedList>>(); + Collection> sequences = new LinkedList>(); GUITARTestCaseParser parser; if (efgFileName == null) { Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/EFGEvent.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/EFGEvent.java (revision 555) +++ (revision ) @@ -1,34 +1,0 @@ -package de.ugoe.cs.quest.plugin.guitar.eventcore; - -import de.ugoe.cs.quest.eventcore.ReplayableEvent; - -/** - *

- * Convenience class for working with EFGEvents. - *

- * - * @author Steffen Herbold - * @version 1.0 - */ -public class EFGEvent extends ReplayableEvent { - - /** - *

- * Id for object serialization. - *

- */ - private static final long serialVersionUID = 1L; - - /** - *

- * Constructor. Creates a new EFGEvent. - *

- * - * @param eventId - * EventId of the event in the EFG and GUI files - */ - public EFGEvent(String eventId) { - super(eventId); - this.addReplayEvent(new EFGReplayable(eventId)); - } -} Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/EFGReplayable.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/EFGReplayable.java (revision 555) +++ (revision ) @@ -1,66 +1,0 @@ -package de.ugoe.cs.quest.plugin.guitar.eventcore; - -import de.ugoe.cs.quest.eventcore.IReplayable; -import de.ugoe.cs.util.StringTools; - -/** - *

- * {@link IReplayable} used to generate test cases for the GUITAR suite. - *

- * - * @author Steffen Herbold - * @version 1.0 - */ -public class EFGReplayable implements IReplayable { - - /** - *

- * EventId in the EFG and GUI files. - *

- */ - String eventId; - - /** - *

- * Id for object serialization. - *

- */ - private static final long serialVersionUID = 1L; - - /** - *

- * Constructor. Creates a new {@link EFGReplayable}. - *

- * - * @param eventId - */ - public EFGReplayable(String eventId) { - this.eventId = eventId; - } - - /* - * (non-Javadoc) - * - * @see de.ugoe.cs.quest.eventcore.IReplayable#getReplay() - */ - @Override - public String getReplay() { - StringBuilder replay = new StringBuilder(); - replay.append("" + StringTools.ENDLINE); - replay.append("" + eventId + "" + StringTools.ENDLINE); - replay.append("false" + StringTools.ENDLINE); - replay.append("" + StringTools.ENDLINE); - return replay.toString(); - } - - /* - * (non-Javadoc) - * - * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget() - */ - @Override - public String getTarget() { - return null; // target indirectly included in replay through the eventId - } - -} Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventTarget.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventTarget.java (revision 556) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventTarget.java (revision 556) @@ -0,0 +1,43 @@ +package de.ugoe.cs.quest.plugin.guitar.eventcore; + +import de.ugoe.cs.quest.eventcore.IEventTarget; + +/** + * + *

+ * TODO comment + *

+ * + * @version $Revision: $ $Date: Aug 16, 2012$ + * @author 2012, last modified by $Author: sherbold$ + */ +public class GUITAREventTarget implements IEventTarget { + + private static final long serialVersionUID = 1L; + + String widgetId; + + public GUITAREventTarget(String widgetId) { + this.widgetId = widgetId; + } + + /* (non-Javadoc) + * @see de.ugoe.cs.quest.eventcore.IEventTarget#getPlatform() + */ + @Override + public String getPlatform() { + // TODO Auto-generated method stub + System.out.println("TODO: implement GUITAREventTarget.getPlatform "); + return null; + } + + /* + * (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return widgetId; + } + +} Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventType.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventType.java (revision 556) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITAREventType.java (revision 556) @@ -0,0 +1,42 @@ +package de.ugoe.cs.quest.plugin.guitar.eventcore; + +import de.ugoe.cs.quest.eventcore.IEventType; + +/** + * + *

+ * TODO comment + *

+ * + * @version $Revision: $ $Date: Aug 16, 2012$ + * @author 2012, last modified by $Author: sherbold$ + */ +public class GUITAREventType implements IEventType { + + /** */ + private static final long serialVersionUID = 1L; + + String guitarEventId; + + public GUITAREventType(String eventId) { + this.guitarEventId = eventId; + } + + /* (non-Javadoc) + * @see de.ugoe.cs.quest.eventcore.IEventType#getName() + */ + @Override + public String getName() { + return "GUITAREventType"; + } + + /* + * (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return guitarEventId; + } + +} Index: trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITARReplayable.java =================================================================== --- trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITARReplayable.java (revision 556) +++ trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITARReplayable.java (revision 556) @@ -0,0 +1,56 @@ +package de.ugoe.cs.quest.plugin.guitar.eventcore; + +import de.ugoe.cs.quest.eventcore.IReplayable; +import de.ugoe.cs.util.StringTools; + +/** + *

+ * {@link IReplayable} used to generate test cases for the GUITAR suite. + *

+ * + * @author Steffen Herbold + * @version 1.0 + */ +public class GUITARReplayable implements IReplayable { + + /** + *

+ * EventId in the EFG and GUI files. + *

+ */ + String eventId; + + /** + *

+ * Id for object serialization. + *

+ */ + private static final long serialVersionUID = 1L; + + /** + *

+ * Constructor. Creates a new {@link GUITARReplayable}. + *

+ * + * @param eventId + */ + public GUITARReplayable(String eventId) { + this.eventId = eventId; + } + + /* + * (non-Javadoc) + * + * @see de.ugoe.cs.quest.eventcore.IReplayable#getReplay() + */ + @Override + public String getReplay() { + StringBuilder replay = new StringBuilder(); + replay.append("" + StringTools.ENDLINE); + replay.append("" + eventId + "" + StringTools.ENDLINE); + replay.append("false" + StringTools.ENDLINE); + replay.append("" + StringTools.ENDLINE); + return replay.toString(); + } + +}