Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/EFGReplayDecorator.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/EFGReplayDecorator.java	(revision 204)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/EFGReplayDecorator.java	(revision 204)
@@ -0,0 +1,95 @@
+package de.ugoe.cs.eventbench.efg;
+
+import de.ugoe.cs.eventbench.IReplayDecorator;
+import de.ugoe.cs.util.StringTools;
+
+/**
+ * <p>
+ * {@link IReplayDecorator} for replays generated for the GUITAR suite.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
+public class EFGReplayDecorator implements IReplayDecorator {
+
+	/**
+	 * <p>
+	 * Id for object serialization.
+	 * </p>
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * <p>
+	 * The instance of the {@link EFGReplayDecorator} (implemented as
+	 * singleton).
+	 * </p>
+	 */
+	transient private static EFGReplayDecorator theInstance;
+
+	/**
+	 * <p>
+	 * Constructor. Private to guarantee that only one instance of the replay
+	 * generator exists.
+	 * </p>
+	 */
+	private EFGReplayDecorator() {
+	};
+
+	/**
+	 * <p>
+	 * Returns the instance of the MFCReplayDecorator.
+	 * </p>
+	 * 
+	 * @return instance of the MFCReplayDecorator.
+	 */
+	public static EFGReplayDecorator getInstance() {
+		if (theInstance == null) {
+			theInstance = new EFGReplayDecorator();
+		}
+		return theInstance;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.IReplayDecorator#getHeader()
+	 */
+	@Override
+	public String getHeader() {
+		return "<?xml version=\"1.0\" encoding=\"UTF-16\"?>"
+				+ StringTools.ENDLINE + "<TestCase>" + StringTools.ENDLINE;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.IReplayDecorator#getFooter()
+	 */
+	@Override
+	public String getFooter() {
+		return "</TestCase>";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.IReplayDecorator#getSessionHeader(int)
+	 */
+	@Override
+	public String getSessionHeader(int sessionId) {
+		return "";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.IReplayDecorator#getSessionFooter(int)
+	 */
+	@Override
+	public String getSessionFooter(int sessionId) {
+		return "";
+	}
+
+}
Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGEvent.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGEvent.java	(revision 203)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGEvent.java	(revision 204)
@@ -3,6 +3,14 @@
 import de.ugoe.cs.eventbench.data.ReplayableEvent;
 
+/**
+ * <p>
+ * Convenience class for working with EFGEvents.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
 public class EFGEvent extends ReplayableEvent<EFGReplayable> {
-	
+
 	/**
 	 * <p>
@@ -11,7 +19,16 @@
 	 */
 	private static final long serialVersionUID = 1L;
-	
-	public EFGEvent(String type) {
-		super(type);
+
+	/**
+	 * <p>
+	 * Constructor. Creates a new EFGEvent.
+	 * </p>
+	 * 
+	 * @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/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGReplayable.java
===================================================================
--- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGReplayable.java	(revision 203)
+++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/data/EFGReplayable.java	(revision 204)
@@ -2,6 +2,22 @@
 
 import de.ugoe.cs.eventbench.data.IReplayable;
+import de.ugoe.cs.util.StringTools;
 
+/**
+ * <p>
+ * {@link IReplayable} used to generate test cases for the GUITAR suite.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
 public class EFGReplayable implements IReplayable {
+
+	/**
+	 * <p>
+	 * EventId in the EFG and GUI files.
+	 * </p>
+	 */
+	String eventId;
 
 	/**
@@ -12,14 +28,38 @@
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * <p>
+	 * Constructor. Creates a new {@link EFGReplayable}.
+	 * </p>
+	 * 
+	 * @param eventId
+	 */
+	public EFGReplayable(String eventId) {
+		this.eventId = eventId;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.data.IReplayable#getReplay()
+	 */
 	@Override
 	public String getReplay() {
-		// TODO Auto-generated method stub
-		return null;
+		StringBuilder replay = new StringBuilder();
+		replay.append("<Step>" + StringTools.ENDLINE);
+		replay.append("<EventId>" + eventId + "</EventId>" + StringTools.ENDLINE);
+		replay.append("<ReachingStep>false</ReachingStep>" + StringTools.ENDLINE);
+		replay.append("</Step>" + StringTools.ENDLINE);
+		return replay.toString();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.eventbench.data.IReplayable#getTarget()
+	 */
 	@Override
 	public String getTarget() {
-		// TODO Auto-generated method stub
-		return null;
+		return null; // target indirectly included in replay through the eventId
 	}