fixed #41

Author: mgeipel

src/main/java/org/culturegraph/mf/morph/Metamorph.java

@@ -19,10 +19,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +31,6 @@
 import org.culturegraph.mf.framework.annotations.In;
 import org.culturegraph.mf.framework.annotations.Out;
 import org.culturegraph.mf.stream.pipe.StreamFlattener;
-import org.culturegraph.mf.types.MultiHashMap;
 import org.culturegraph.mf.types.MultiMap;
 import org.culturegraph.mf.util.StreamConstants;
 
@@ -58,24 +55,24 @@ public final class Metamorph implements StreamPipe<StreamReceiver>, NamedValueRe
 
 	private static final String ENTITIES_NOT_BALANCED = "Entity starts and ends are not balanced";
 
-	private final Registry<NamedValueReceiver> dataRegistry = new WildcardRegistry<NamedValueReceiver>();
-	private final List<NamedValueReceiver> elseSources = new ArrayList<NamedValueReceiver>();
+	private final Registry<NamedValueReceiver> dataRegistry = MorphCollectionFactory.createRegistry();
+	private final List<NamedValueReceiver> elseSources = MorphCollectionFactory.createList();
 
 //rivate final Registry<FlushListener> entityEndListenerRegistry = new WildcardRegistry<FlushListener>();
 
-	private final MultiMap multiMap = new MultiHashMap();
-	private final List<Closeable> resources = new ArrayList<Closeable>();
+	private final MultiMap multiMap = MorphCollectionFactory.createMultiMap();
+	private final List<Closeable> resources = MorphCollectionFactory.createList();
 
 	private final StreamFlattener flattener = new StreamFlattener();
 
-	private final Deque<Integer> entityCountStack = new LinkedList<Integer>();
+	private final Deque<Integer> entityCountStack = MorphCollectionFactory.createDeque();
 	private int entityCount;
 	private int currentEntityCount;
 
 	private StreamReceiver outputStreamReceiver;
 	private MorphErrorHandler errorHandler = new DefaultErrorHandler();
 	private int recordCount;
-	private final List<FlushListener> recordEndListener = new ArrayList<FlushListener>();
+	private final List<FlushListener> recordEndListener = MorphCollectionFactory.createList();
 
 	protected Metamorph() {
 		// package private
@@ -301,21 +298,6 @@ public void receive(final String name, final String value, final NamedValueSourc
 
 	}
 
-	// /**
-	// * @param from
-	// * @param to
-	// */
-	// protected void addEntityMapping(final String from, final String toParam)
-	// {
-	// throw new NotImplementedException();
-	// //entityMap.put(from, toParam);
-	// }
-
-//	@Override
-//	public void addEntityEndListener(final FlushListener entityEndListener, final String entityName) {
-//		entityEndListenerRegistry.register(entityName, entityEndListener);
-//	}
-
 	@Override
 	public Map<String, String> getMap(final String mapName) {
 		return multiMap.getMap(mapName);

src/main/java/org/culturegraph/mf/morph/MorphCollectionFactory.java

@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2013 Deutsche Nationalbibliothek
+ *
+ *  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 org.culturegraph.mf.morph;
+
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.culturegraph.mf.types.MultiHashMap;
+import org.culturegraph.mf.types.MultiMap;
+
+
+/**
+ * Sets the implementation for different Collections used in {@link Metamorph}.
+ * 
+ * @author markus geipel
+ *
+ */
+final class MorphCollectionFactory {
+	private MorphCollectionFactory() {
+		//no instances
+	}
+	
+	public static MultiMap createMultiMap(){
+		return new MultiHashMap();
+	}
+	
+	public static  <T> List<T> createList(){
+		return new ArrayList<T>();
+	}
+	
+	public static <T> Deque<T> createDeque(){
+		return new LinkedList<T>();
+	}
+	
+	public static <T> Registry<T> createRegistry(){
+		return new WildcardRegistry<T>();
+	}
+}