Index: /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java
===================================================================
--- /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java	(revision 1985)
+++ /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/EqualSOAPDataMap.java	(revision 1985)
@@ -0,0 +1,99 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.http.eventcore;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import org.apache.commons.collections4.set.ListOrderedSet;
+
+/**
+ * <p>
+ * Handles all request bodies of equal SOAP events. Can be used to view either all request bodies sent to an operation or to randomly draw one of the bodies.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ */
+public class EqualSOAPDataMap {
+    
+    /**
+     * Singleton. Handle to only instance of this class
+     */
+    public final static EqualSOAPDataMap INSTANCE = new EqualSOAPDataMap();
+    
+    /**
+     * Map with all soapRequestBodies for all equal {@link SimpleSOAPEventType}s
+     */
+    private final Map<SimpleSOAPEventType, ListOrderedSet<String>> soapRequestBodies = new HashMap<>();
+    
+    /**
+     * random number generator for picking a random request body
+     */
+    private final Random random = new Random(1); // TODO static seed for testing
+    
+    private EqualSOAPDataMap() {
+        // private constructor to avoid initialization
+    }
+
+    /**
+     * <p>
+     * Adds a new body to the map.
+     * </p>
+     *
+     * @param simpleSOAPEventType
+     */
+    public void add(SimpleSOAPEventType simpleSOAPEventType, String soapRequestBody) {
+        if( soapRequestBody!=null ) {
+            ListOrderedSet<String> requestBodySet = soapRequestBodies.get(simpleSOAPEventType);
+            if( requestBodySet==null ) {
+                requestBodySet = new ListOrderedSet<>();
+                soapRequestBodies.put(simpleSOAPEventType, requestBodySet);
+            }
+            requestBodySet.add(soapRequestBody);
+        }
+    }
+    
+    /**
+     * <p>
+     * Retrieves all bodies associated with the simpleSoapEventType; null if not found
+     * </p>
+     *
+     * @param simpleSoapEventType
+     * @return
+     */
+    public Set<String> getAll(SimpleSOAPEventType simpleSoapEventType) {
+        return Collections.unmodifiableSet(soapRequestBodies.get(simpleSoapEventType));
+    }
+    
+    /**
+     * <p>
+     * Randomly draws one of the SOAP event type bodies associated with the event
+     * </p>
+     *
+     * @param simpleSOAPEventType
+     * @return
+     */
+    public String getRandom(SimpleSOAPEventType simpleSOAPEventType) {
+        ListOrderedSet<String> requestBodySet = soapRequestBodies.get(simpleSOAPEventType);
+        if( requestBodySet==null || requestBodySet.isEmpty() ) {
+            throw new RuntimeException("no request body known for SimpleSOAPEventType: " + simpleSOAPEventType);
+        }
+        
+        return requestBodySet.get(random.nextInt(requestBodySet.size()));
+    }
+}
Index: /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java
===================================================================
--- /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java	(revision 1984)
+++ /trunk/autoquest-plugin-http/src/main/java/de/ugoe/cs/autoquest/plugin/http/eventcore/SimpleSOAPEventType.java	(revision 1985)
@@ -17,14 +17,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.collections4.set.ListOrderedSet;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -260,80 +254,4 @@
      * @author Steffen Herbold
      */
-    public static enum RequestBodyMode {LOCALEVENT, RANDOM};
-    
-    /**
-     * <p>
-     * Handles all request bodies of equal SOAP events. Can be used to view either all request bodies sent to an operation or to randomly draw one of the bodies.
-     * </p>
-     * 
-     * @author Steffen Herbold
-     */
-    public static class EqualSOAPDataMap {
-        
-        /**
-         * Singleton. Handle to only instance of this class
-         */
-        public final static EqualSOAPDataMap INSTANCE = new EqualSOAPDataMap();
-        
-        /**
-         * Map with all soapRequestBodies for all equal {@link SimpleSOAPEventType}s
-         */
-        private final Map<SimpleSOAPEventType, ListOrderedSet<String>> soapRequestBodies = new HashMap<>();
-        
-        /**
-         * random number generator for picking a random request body
-         */
-        private final Random random = new Random(1); // TODO static seed for testing
-        
-        private EqualSOAPDataMap() {
-            // private constructor to avoid initialization
-        }
-
-        /**
-         * <p>
-         * Adds a new body to the map.
-         * </p>
-         *
-         * @param simpleSOAPEventType
-         */
-        public void add(SimpleSOAPEventType simpleSOAPEventType, String soapRequestBody) {
-            if( soapRequestBody!=null ) {
-                ListOrderedSet<String> requestBodySet = soapRequestBodies.get(simpleSOAPEventType);
-                if( requestBodySet==null ) {
-                    requestBodySet = new ListOrderedSet<>();
-                    soapRequestBodies.put(simpleSOAPEventType, requestBodySet);
-                }
-                requestBodySet.add(soapRequestBody);
-            }
-        }
-        
-        /**
-         * <p>
-         * Retrieves all bodies associated with the simpleSoapEventType; null if not found
-         * </p>
-         *
-         * @param simpleSoapEventType
-         * @return
-         */
-        public Set<String> getAll(SimpleSOAPEventType simpleSoapEventType) {
-            return Collections.unmodifiableSet(soapRequestBodies.get(simpleSoapEventType));
-        }
-        
-        /**
-         * <p>
-         * Randomly draws one of the SOAP event type bodies associated with the event
-         * </p>
-         *
-         * @param simpleSOAPEventType
-         * @return
-         */
-        public String getRandom(SimpleSOAPEventType simpleSOAPEventType) {
-            ListOrderedSet<String> requestBodySet = soapRequestBodies.get(simpleSOAPEventType);
-            if( requestBodySet==null || requestBodySet.isEmpty() ) {
-                throw new RuntimeException("no request body known for SimpleSOAPEventType: " + simpleSOAPEventType);
-            }
-            
-            return requestBodySet.get(random.nextInt(requestBodySet.size()));
-        }
-    }
+    public static enum RequestBodyMode {LOCALEVENT, RANDOM}
 }