Projects >> lidalia-lang >>2c84653607b07fcd01aec30fb3706213b10aba03

Chunk
Conflicting content 
                Thread.currentThread().interrupt();
				cache.remove(args, result);
			} catch (ExecutionException e) {
<<<<<<< HEAD
				if (e.getCause() instanceof RuntimeException)
					throw (RuntimeException) e.getCause();
				else if (e.getCause() instanceof Error)
					throw (Error) e.getCause();
				else
					throw new IllegalStateException(e.toString(), e.getCause());
=======
				throw Exceptions.asRuntimeException(e);
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77
			}
		}
	}
Solution content 
                Thread.currentThread().interrupt();
				cache.remove(args, result);
			} catch (ExecutionException e) {
				throw Exceptions.asRuntimeException(e);
			}
		}
	}
File
CachedFunction.java
Developer's decision
Version 2
Kind of conflict
If statement
Throw statement
Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

<<<<<<< HEAD:src/main/java/uk/org/lidalia/lang/RichObject.java
import static uk.org.lidalia.lang.ClassUtils.inSameClassHierarchy;
import static uk.org.lidalia.lang.EqualityUtils.equal;

public class RichObject {

	private static final Function, Set> GET_IDENTITY_FIELDS = CachedFunction.make(new Function, Set>() {
		@Override public Set call(Class clazz) {
=======
import com.google.common.base.Function;

public class RichObject {
	private static final Function, Set> GET_IDENTITY_FIELDS = CachedFunction.make(new Function, Set>() {
		@Override
		public Set apply(Class clazz) {
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77:src/main/java/uk/org/lidalia/lang/RichObject.java
			Set result = new HashSet();
			for (Field field : clazz.getDeclaredFields()) {
				if (field.isAnnotationPresent(Identity.class)) {
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.base.Function;

public class RichObject {
	private static final Function, Set> GET_IDENTITY_FIELDS = CachedFunction.make(new Function, Set>() {
		@Override
		public Set apply(Class clazz) {
			Set result = new HashSet();
			for (Field field : clazz.getDeclaredFields()) {
				if (field.isAnnotationPresent(Identity.class)) {
File
RichObject.java
Developer's decision
Version 2
Kind of conflict
Attribute
Class signature
Import
Method invocation
Chunk
Conflicting content 
			}
			Class superclass = clazz.getSuperclass();
			if (superclass != RichObject.class) {
<<<<<<< HEAD:src/main/java/uk/org/lidalia/lang/RichObject.java
				result.addAll(GET_IDENTITY_FIELDS.call(superclass));
=======
				result.addAll(GET_IDENTITY_FIELDS.apply(superclass));
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77:src/main/java/uk/org/lidalia/lang/RichObject.java
			}
			return Collections.unmodifiableSet(result);
		}
Solution content 
			}
			Class superclass = clazz.getSuperclass();
			if (superclass != RichObject.class) {
				result.addAll(GET_IDENTITY_FIELDS.apply(superclass));
			}
			return Collections.unmodifiableSet(result);
		}
File
RichObject.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
		final int prime = 37;
		int result = 17;
		try {
<<<<<<< HEAD:src/main/java/uk/org/lidalia/lang/RichObject.java
			Set thisFields = GET_IDENTITY_FIELDS.call(this.getClass());
=======
			Set thisFields = GET_IDENTITY_FIELDS.apply(this.getClass());
			java.lang.Object value = null;
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77:src/main/java/uk/org/lidalia/lang/RichObject.java
			for (Field field : thisFields) {
				Object value = field.get(this);
				result = prime * result + (value == null ? 0 : value.hashCode());
Solution content 
		final int prime = 37;
		int result = 17;
		try {
			Set thisFields = GET_IDENTITY_FIELDS.apply(this.getClass());
			for (Field field : thisFields) {
				Object value = field.get(this);
				result = prime * result + (value == null ? 0 : value.hashCode());
File
RichObject.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		if (thisFields.isEmpty()) {
			return super.toString();
		}
<<<<<<< HEAD:src/main/java/uk/org/lidalia/lang/RichObject.java
		StringBuilder builder = new StringBuilder(this.getClass().getSimpleName());
        Collection values = CollectionUtils.collect(thisFields, new Function() {
            @Override
            public String call(Field field) {
                try {
                    return field.getName() + "=" + field.get(RichObject.this);
                } catch (IllegalAccessException e) {
                    throw new IllegalStateException("Field " + field + " is not accessible - should be!", e);
                }
            }
        });
        builder.append(CollectionUtils.toString(values, ", "));
=======
		
		StringBuilder builder = new StringBuilder(this.getClass().getSimpleName());
		builder.append(Collections3.toString(thisFields, "[", ", ", "]", new Function() {
			@Override public String apply(Field field) {
				try {
					return field.getName() + "=" + field.get(RichObject.this);
				} catch (IllegalAccessException e) {
					throw new IllegalStateException("All fields should be accessible", e);
				}
			}
		}));
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77:src/main/java/uk/org/lidalia/lang/RichObject.java

		if (this instanceof Immutable) {
			toString = builder.toString();
Solution content 
		if (thisFields.isEmpty()) {
			return super.toString();
		}
		
		StringBuilder builder = new StringBuilder(this.getClass().getSimpleName());
		builder.append(Collections3.toString(thisFields, "[", ", ", "]", new Function() {
			@Override public String apply(Field field) {
				try {
					return field.getName() + "=" + field.get(RichObject.this);
				} catch (IllegalAccessException e) {
					throw new IllegalStateException("All fields should be accessible", e);
				}
			}
		}));

		if (this instanceof Immutable) {
			toString = builder.toString();
File
RichObject.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		}
		return builder.toString();
	}
<<<<<<< HEAD:src/main/java/uk/org/lidalia/lang/RichObject.java

    public boolean instanceOf(Class possibleSuperType) {
        return ClassUtils.instanceOf(this, possibleSuperType);
    }
=======
	
	public boolean instanceOf(Class possibleSuperType) {
		return possibleSuperType.isAssignableFrom(getClass());
	}
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77:src/main/java/uk/org/lidalia/lang/RichObject.java
}
Solution content 
		}
		return builder.toString();
	}

    public boolean instanceOf(Class possibleSuperType) {
        return Classes.instanceOf(this, possibleSuperType);
    }
}
File
RichObject.java
Developer's decision
Manual
Kind of conflict
Method declaration
Chunk
Conflicting content 
import uk.org.lidalia.lang.Identity;
import uk.org.lidalia.lang.RichObject;

<<<<<<< HEAD
public class ClassA extends RichObject {
=======
public class ClassA extends uk.org.lidalia.lang.RichObject {
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77

	@Identity
	private String value1;
Solution content 
import uk.org.lidalia.lang.Identity;
import uk.org.lidalia.lang.RichObject;

public class ClassA extends RichObject {

	@Identity
	private String value1;
File
ClassA.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
import uk.org.lidalia.lang.Identity;
import uk.org.lidalia.lang.RichObject;

<<<<<<< HEAD
public class ClassB extends RichObject {
=======
public class ClassB extends uk.org.lidalia.lang.RichObject {
>>>>>>> 18d0b49325c247a86235e0e7c5529b44f5d87e77

	@Identity
	private String value1;
Solution content 
import uk.org.lidalia.lang.Identity;
import uk.org.lidalia.lang.RichObject;

public class ClassB extends RichObject {

	@Identity
	private String value1;
File
ClassB.java
Developer's decision
Version 1
Kind of conflict
Class signature