Projects >> spock >>b4023a94dca2cb28a086dca58783bf22ef4ecb3e

Chunk
Conflicting content 
  public static boolean isJointCompiled(ClassNode clazz) {
    return clazz.getModule().getUnit().getConfig().getJointCompilationOptions() != null;
  }
<<<<<<< HEAD
  
  public static MethodCallExpression createDirectMethodCall(Expression target, MethodNode method, Expression arguments) {
    MethodCallExpression result = new MethodCallExpression(target, method.getName(), arguments);
    result.setMethodTarget(method);
    return result;
=======

  public static void deleteMethod(ClassNode clazz, MethodNode method) {
    // as of 1.8.6, this is the best possible implementation
    clazz.getMethods().remove(method);
    clazz.getDeclaredMethods(method.getName()).remove(method);
>>>>>>> ed19f82038c6db9925ecc85b29bec441644c9ac8
  }
}
Solution content 
  public static boolean isJointCompiled(ClassNode clazz) {
    return clazz.getModule().getUnit().getConfig().getJointCompilationOptions() != null;
  }
  
  public static MethodCallExpression createDirectMethodCall(Expression target, MethodNode method, Expression arguments) {
    MethodCallExpression result = new MethodCallExpression(target, method.getName(), arguments);
    result.setMethodTarget(method);
    return result;
  }

  public static void deleteMethod(ClassNode clazz, MethodNode method) {
    // as of 1.8.6, this is the best possible implementation
    clazz.getMethods().remove(method);
    clazz.getDeclaredMethods(method.getName()).remove(method);
  }
}
File
AstUtil.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
@Target(ElementType.METHOD)
public @interface Unroll {
  // to ensure best possible tool support, we use the same default naming
<<<<<<< HEAD
  // scheme as Junit's @Parameterized
  Class value() default Closure.class;
=======
  // scheme as JUnit's @Parameterized
  String value() default "";
>>>>>>> ed19f82038c6db9925ecc85b29bec441644c9ac8
}
Solution content 
@Target(ElementType.METHOD)
public @interface Unroll {
  // to ensure best possible tool support, we use the same default naming
  // scheme as Junit's @Parameterized
  Class value() default Closure.class;
}
File
Unroll.java
Developer's decision
Version 1
Kind of conflict
Annotation declaration
Comment