Projects >> errai >>5d095cac51e079aec9ad6fe3451228410b3c83dd

Chunk
Conflicting content
        ObjectBuilder builder = ObjectBuilder.newInstanceOf(annotationClass);
        ClassStructureBuilder classStructureBuilder = builder.extend();
<<<<<<< HEAD

        MetaMethod m = builder.getType().getMethod("annotationType", CallParameters.none().getParameterTypes());
        Statement statement = new StringStatement("return " + annotationClass.getName() + ".class;");

        classStructureBuilder.publicOverridesMethod(m, statement);
        builder.integrateClassStructure(classStructureBuilder);
=======
//
//        MetaMethod m = builder.getType().getMethod("annotationType");
//        Statement statement = new StringStatement("return " + annotationClass.getName() + ".class;");
//
//        classStructureBuilder.publicOverridesMethod(m, statement);
//        builder.integrateClassStructure(classStructureBuilder);
>>>>>>> 0b9e507c5170ebb8b0d1e4c9f6b9a4434daa0d6f

        return builder.generate();
    }
Solution content
        ObjectBuilder builder = ObjectBuilder.newInstanceOf(annotationClass);
        ClassStructureBuilder classStructureBuilder = builder.extend();

        MetaMethod m = builder.getType().getMethod("annotationType", CallParameters.none().getParameterTypes());
        Statement statement = new StringStatement("return " + annotationClass.getName() + ".class;");

        classStructureBuilder.publicOverridesMethod(m, statement);
        builder.integrateClassStructure(classStructureBuilder);

        return builder.generate();
    }
File
AnnotationEncoder.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable