Mostly cleanup. But I also changed the DiffNode.Visitor interface (accept => node)

Author: SQiShER

src/integration-test/java/de/danielbechler/diff/example/MapEntryValueAccessExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public static void main(final String[] args)
 		final DiffNode mapNode = ObjectDifferBuilder.buildDefault().compare(working, base);
 		mapNode.visitChildren(new DiffNode.Visitor()
 		{
-			public void accept(final DiffNode node, final Visit visit)
+			public void node(final DiffNode node, final Visit visit)
 			{
 				final Object key = ((MapKeyElementSelector) node.getElementSelector()).getKey();
 				//                 ^^^ I do not encourage this, but currently it's the only way

src/integration-test/java/de/danielbechler/diff/issues/issue66/MainApp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 package de.danielbechler.diff.issues.issue66;
 
-import de.danielbechler.diff.node.Visit;
 import de.danielbechler.diff.ObjectDiffer;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.Visit;
 
 public class MainApp
 {
@@ -41,7 +41,7 @@ public static void main(final String[] args)
 
 		root.visit(new DiffNode.Visitor()
 		{
-			public void accept(final DiffNode node, final Visit visit)
+			public void node(final DiffNode node, final Visit visit)
 			{
 				System.out.print(node.getPath() + " :: ");
 				System.out.print(node.canonicalGet(p1));

src/main/java/de/danielbechler/diff/ObjectMerger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package de.danielbechler.diff;
 
-import de.danielbechler.diff.node.Visit;
 import de.danielbechler.diff.node.DiffNode;
+import de.danielbechler.diff.node.Visit;
 
 /**
  * Careful: This class has not yet been tested very thoroughly and serves more as an example for your own
@@ -60,7 +60,7 @@ public MergingDifferenceVisitor(final T head, final T modified)
 			this.modified = modified;
 		}
 
-		public void accept(final DiffNode node, final Visit visit)
+		public void node(final DiffNode node, final Visit visit)
 		{
 			if (node.getState() == DiffNode.State.ADDED)
 			{
@@ -70,10 +70,6 @@ else if (node.getState() == DiffNode.State.REMOVED)
 			{
 				node.canonicalUnset(head);
 			}
-			else if (node.getState() == DiffNode.State.UNTOUCHED)
-			{
-				// not touched - nothing to do
-			}
 			else if (node.getState() == DiffNode.State.CHANGED)
 			{
 				if (node.hasChildren())

src/main/java/de/danielbechler/diff/access/Instances.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ public class Instances
 	private final Object base;
 	private final Object fresh;
 
-	public Instances(final Accessor sourceAccessor,
-					 final Object working,
-					 final Object base,
-					 final Object fresh)
+	Instances(final Accessor sourceAccessor,
+			  final Object working,
+			  final Object base,
+			  final Object fresh)
 	{
 		Assert.notNull(sourceAccessor, "sourceAccessor");
 		this.sourceAccessor = sourceAccessor;
@@ -160,40 +160,6 @@ public boolean isPrimitiveWrapperType()
 		return Classes.isPrimitiveWrapperType(getType());
 	}
 
-	public boolean isPrimitiveNumericType()
-	{
-		return Classes.isPrimitiveNumericType(getType());
-	}
-
-	private boolean isPrimitiveBooleanType()
-	{
-		return getType() == boolean.class;
-	}
-
-	public boolean areEqual()
-	{
-		return isEqual(base, working);
-	}
-
-	public boolean areSame()
-	{
-		return working == base;
-	}
-
-	public boolean areNull()
-	{
-		return working == null && base == null;
-	}
-
-	private Class<?> tryToGetTypeFromSourceAccessor()
-	{
-		if (sourceAccessor instanceof TypeAwareAccessor)
-		{
-			return ((TypeAwareAccessor) sourceAccessor).getType();
-		}
-		return null;
-	}
-
 	public Class<?> getType()
 	{
 		final Set<Class<?>> types = Classes.typesOf(working, base, fresh);
@@ -264,4 +230,38 @@ else if (sourceAccessorType != null)
 				"Instances must either be null or have the exact same type.");
 	}
 
+	private Class<?> tryToGetTypeFromSourceAccessor()
+	{
+		if (sourceAccessor instanceof TypeAwareAccessor)
+		{
+			return ((TypeAwareAccessor) sourceAccessor).getType();
+		}
+		return null;
+	}
+
+	public boolean isPrimitiveNumericType()
+	{
+		return Classes.isPrimitiveNumericType(getType());
+	}
+
+	private boolean isPrimitiveBooleanType()
+	{
+		return getType() == boolean.class;
+	}
+
+	public boolean areEqual()
+	{
+		return isEqual(base, working);
+	}
+
+	public boolean areSame()
+	{
+		return working == base;
+	}
+
+	public boolean areNull()
+	{
+		return working == null && base == null;
+	}
+
 }

src/main/java/de/danielbechler/diff/comparison/ComparisonStrategyAware.java

@@ -43,32 +43,6 @@ public EqualsOnlyComparisonStrategy(final String equalsValueProviderMethod)
 		this.equalsValueProviderMethod = equalsValueProviderMethod;
 	}
 
-	private static Object access(final Object target, final String methodName)
-	{
-		if (target == null)
-		{
-			return null;
-		}
-		try
-		{
-			final Method method = target.getClass().getMethod(methodName);
-			method.setAccessible(true);
-			return method.invoke(target);
-		}
-		catch (final NoSuchMethodException e)
-		{
-			throw Exceptions.escalate(e);
-		}
-		catch (final InvocationTargetException e)
-		{
-			throw Exceptions.escalate(e);
-		}
-		catch (final IllegalAccessException e)
-		{
-			throw Exceptions.escalate(e);
-		}
-	}
-
 	public void compare(final DiffNode node, final Class<?> type, final Object working, final Object base)
 	{
 		final boolean result;
@@ -92,8 +66,29 @@ public void compare(final DiffNode node, final Class<?> type, final Object worki
 		}
 	}
 
-	public String getEqualsValueProviderMethod()
+	private static Object access(final Object target, final String methodName)
 	{
-		return equalsValueProviderMethod;
+		if (target == null)
+		{
+			return null;
+		}
+		try
+		{
+			final Method method = target.getClass().getMethod(methodName);
+			method.setAccessible(true);
+			return method.invoke(target);
+		}
+		catch (final NoSuchMethodException e)
+		{
+			throw Exceptions.escalate(e);
+		}
+		catch (final InvocationTargetException e)
+		{
+			throw Exceptions.escalate(e);
+		}
+		catch (final IllegalAccessException e)
+		{
+			throw Exceptions.escalate(e);
+		}
 	}
 }