fixed #40

Author: mgeipel

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

@@ -79,7 +79,7 @@ protected void handleMapClass(final Node mapNode) {
 		final String mapName = resolveVars(attributes.remove(ATTRITBUTE.NAME.getString()));
 		final Map<String, String> map;
 
-		if (mapNode.getLocalName().equals(JAVA)) {
+		if (mapNode.getLocalName().equals(JAVAMAP)) {
 			final String className = resolvedAttribute(mapNode, ATTRITBUTE.CLASS);
 			map = ObjectFactory.newInstance(ObjectFactory.loadClass(className, Map.class));
 			attributes.remove(ATTRITBUTE.CLASS.getString());

src/test/java/org/culturegraph/mf/morph/maps/FileMap.xml

@@ -26,11 +26,7 @@
 
 				</mm:rules>
 				<mm:maps>
-<<<<<<< HEAD
 					<mm:filemap name="map1" files="maps/MARCcountries.txt" />
-=======
-					<mm:mapfile name="map1" files="maps/MARCcountries.txt" />
->>>>>>> aa24f65812c9ff505b222ab5642df5441f81f4e9
 				</mm:maps>
 			</mm:metamorph>
 		</transformation>

src/test/java/org/culturegraph/mf/morph/maps/MapsTest.java

@@ -13,16 +13,16 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.culturegraph.mf.morph.maps;
-
-import org.culturegraph.mf.test.TestSuite;
-import org.culturegraph.mf.test.TestSuite.TestDefinitions;
-import org.junit.runner.RunWith;
-
-
-/**
- * @author Markus Michael Geipel
- */
-@RunWith(TestSuite.class)
-@TestDefinitions("FileMap.xml")
-public final class MapsTest {/*bind to xml test*/}
+package org.culturegraph.mf.morph.maps;
+
+import org.culturegraph.mf.test.TestSuite;
+import org.culturegraph.mf.test.TestSuite.TestDefinitions;
+import org.junit.runner.RunWith;
+
+
+/**
+ * @author Markus Michael Geipel
+ */
+@RunWith(TestSuite.class)
+@TestDefinitions({"FileMap.xml", "JavaMap.xml"})
+public final class MapsTest {/*bind to xml test*/}