Projects information

Chunk

Conflicting content
import com.sun.codemodel.JFieldVar; import com.sun.codemodel.JInvocation; import org.androidannotations.annotations.rest.Rest; <<<<<<< HEAD import org.androidannotations.handler.BaseGeneratingAnnotationHandler; ======= import org.androidannotations.handler.BaseAnnotationHandler; import org.androidannotations.handler.GeneratingAnnotationHandler; import org.androidannotations.helper.APTCodeModelHelper; >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 import org.androidannotations.helper.AnnotationHelper; import org.androidannotations.holder.RestHolder; import org.androidannotations.model.AnnotationElements;

Conflicting content

import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JInvocation;
import org.androidannotations.annotations.rest.Rest;
<<<<<<< HEAD
import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
=======
import org.androidannotations.handler.BaseAnnotationHandler;
import org.androidannotations.handler.GeneratingAnnotationHandler;
import org.androidannotations.helper.APTCodeModelHelper;
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06
import org.androidannotations.helper.AnnotationHelper;
import org.androidannotations.holder.RestHolder;
import org.androidannotations.model.AnnotationElements;

Solution content
import com.sun.codemodel.JFieldVar; import com.sun.codemodel.JInvocation; import org.androidannotations.annotations.rest.Rest; import org.androidannotations.handler.BaseGeneratingAnnotationHandler; import org.androidannotations.helper.APTCodeModelHelper; import org.androidannotations.helper.AnnotationHelper; import org.androidannotations.holder.RestHolder; import org.androidannotations.model.AnnotationElements;

Solution content

import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JInvocation;
import org.androidannotations.annotations.rest.Rest;
import org.androidannotations.handler.BaseGeneratingAnnotationHandler;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.AnnotationHelper;
import org.androidannotations.holder.RestHolder;
import org.androidannotations.model.AnnotationElements;

File
RestHandler.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
import java.util.ArrayList; import java.util.List; import java.util.Map; <<<<<<< HEAD import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX; import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS; ======= >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 public class AnnotationHelper {

Conflicting content

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
<<<<<<< HEAD

import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
import static org.androidannotations.helper.ModelConstants.VALID_ENHANCED_COMPONENT_ANNOTATIONS;
=======
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06

public class AnnotationHelper {

Solution content
import java.util.ArrayList; import java.util.List; import java.util.Map; import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX; public class AnnotationHelper {

File
AnnotationHelper.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; <<<<<<< HEAD import org.androidannotations.helper.APTCodeModelHelper; import org.androidannotations.process.ProcessHolder; import com.sun.codemodel.ClassType; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; import com.sun.codemodel.JDefinedClass; ======= import static com.sun.codemodel.JMod.FINAL; import static com.sun.codemodel.JMod.PUBLIC; >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 import javax.lang.model.element.Element; import javax.lang.model.element.NestingKind;

Conflicting content

import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;

<<<<<<< HEAD
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.process.ProcessHolder;

import com.sun.codemodel.ClassType;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
=======
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06

import javax.lang.model.element.Element;
import javax.lang.model.element.NestingKind;

Solution content
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; import static com.sun.codemodel.JMod.FINAL; import static com.sun.codemodel.JMod.PUBLIC; import javax.lang.model.element.Element; import javax.lang.model.element.NestingKind;

Solution content

import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;

import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;

import javax.lang.model.element.Element;
import javax.lang.model.element.NestingKind;

File
BaseGeneratedClassHolder.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
JClass bound = codeModelHelper.typeBoundsToJClass(this, typeParam.getBounds()); generatedClass.generify(typeParam.getSimpleName().toString(), bound); } <<<<<<< HEAD setExtends(); ======= generatedClass._extends(annotatedComponent); codeModelHelper.addNonAAAnotations(generatedClass, annotatedElement.getAnnotationMirrors(), this); >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 } protected void setExtends() {

Conflicting content

			JClass bound = codeModelHelper.typeBoundsToJClass(this, typeParam.getBounds());
			generatedClass.generify(typeParam.getSimpleName().toString(), bound);
		}
<<<<<<< HEAD

		setExtends();
=======
		generatedClass._extends(annotatedComponent);
		codeModelHelper.addNonAAAnotations(generatedClass, annotatedElement.getAnnotationMirrors(), this);
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06
	}

	protected void setExtends() {

Solution content
JClass bound = codeModelHelper.typeBoundsToJClass(this, typeParam.getBounds()); generatedClass.generify(typeParam.getSimpleName().toString(), bound); } setExtends(); codeModelHelper.addNonAAAnotations(generatedClass, annotatedElement.getAnnotationMirrors(), this); } protected void setExtends() {

Solution content

			JClass bound = codeModelHelper.typeBoundsToJClass(this, typeParam.getBounds());
			generatedClass.generify(typeParam.getSimpleName().toString(), bound);
		}
		setExtends();
		codeModelHelper.addNonAAAnotations(generatedClass, annotatedElement.getAnnotationMirrors(), this);
	}

	protected void setExtends() {

File
BaseGeneratedClassHolder.java

Developer's decision
Combination

Kind of conflict
Method invocation

Chunk

Conflicting content
import static com.sun.codemodel.JExpr._new; import static com.sun.codemodel.JExpr._this; <<<<<<< HEAD ======= import static com.sun.codemodel.JExpr.lit; import static com.sun.codemodel.JMod.FINAL; import static com.sun.codemodel.JMod.PUBLIC; >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE; import static org.androidannotations.helper.CanonicalNameConstants.STRING;

Conflicting content

import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._this;
<<<<<<< HEAD
=======
import static com.sun.codemodel.JExpr.lit;
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06
import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE;
import static org.androidannotations.helper.CanonicalNameConstants.STRING;

Solution content
import static com.sun.codemodel.JExpr._new; import static com.sun.codemodel.JExpr._this; import static com.sun.codemodel.JExpr.lit; import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE; import static org.androidannotations.helper.CanonicalNameConstants.STRING;

Solution content

import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._this;
import static com.sun.codemodel.JExpr.lit;
import static org.androidannotations.helper.CanonicalNameConstants.REST_TEMPLATE;
import static org.androidannotations.helper.CanonicalNameConstants.STRING;

File
RestHolder.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.process.ProcessHolder; <<<<<<< HEAD ======= import com.sun.codemodel.ClassType; import com.sun.codemodel.JBlock; >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JExpr;

Conflicting content

import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.process.ProcessHolder;

<<<<<<< HEAD
=======
import com.sun.codemodel.ClassType;
import com.sun.codemodel.JBlock;
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06
import com.sun.codemodel.JClass;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;

Solution content
import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.process.ProcessHolder; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JExpr;

Solution content

import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.process.ProcessHolder;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;

File
RestHolder.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
/ package org.androidannotations.holder; <<<<<<< HEAD import com.sun.codemodel.; import org.androidannotations.api.sharedpreferences.*; ======= import static com.sun.codemodel.JMod.FINAL; import static com.sun.codemodel.JMod.PUBLIC; import static com.sun.codemodel.JMod.STATIC; import java.util.HashMap; import java.util.Map; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField; import org.androidannotations.api.sharedpreferences.EditorHelper; import org.androidannotations.api.sharedpreferences.FloatPrefEditorField; import org.androidannotations.api.sharedpreferences.IntPrefEditorField; import org.androidannotations.api.sharedpreferences.LongPrefEditorField; import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper; import org.androidannotations.api.sharedpreferences.StringPrefEditorField; >>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06 import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.ModelConstants; import org.androidannotations.process.ProcessHolder;

Conflicting content

 */
package org.androidannotations.holder;

<<<<<<< HEAD
import com.sun.codemodel.*;
import org.androidannotations.api.sharedpreferences.*;
=======
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;
import static com.sun.codemodel.JMod.STATIC;

import java.util.HashMap;
import java.util.Map;

import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;

import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField;
import org.androidannotations.api.sharedpreferences.EditorHelper;
import org.androidannotations.api.sharedpreferences.FloatPrefEditorField;
import org.androidannotations.api.sharedpreferences.IntPrefEditorField;
import org.androidannotations.api.sharedpreferences.LongPrefEditorField;
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
>>>>>>> 4ec8a02e125b6d466f0d8fd40ea8409ca3a24a06
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.ModelConstants;
import org.androidannotations.process.ProcessHolder;

Solution content
/ package org.androidannotations.holder; import com.sun.codemodel.; import static com.sun.codemodel.JMod.FINAL; import static com.sun.codemodel.JMod.PUBLIC; import static com.sun.codemodel.JMod.STATIC; import java.util.HashMap; import java.util.Map; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField; import org.androidannotations.api.sharedpreferences.EditorHelper; import org.androidannotations.api.sharedpreferences.FloatPrefEditorField; import org.androidannotations.api.sharedpreferences.IntPrefEditorField; import org.androidannotations.api.sharedpreferences.LongPrefEditorField; import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper; import org.androidannotations.api.sharedpreferences.StringPrefEditorField; import org.androidannotations.helper.CanonicalNameConstants; import org.androidannotations.helper.ModelConstants; import org.androidannotations.process.ProcessHolder;

Solution content

 */
package org.androidannotations.holder;

import com.sun.codemodel.*;
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;
import static com.sun.codemodel.JMod.STATIC;

import java.util.HashMap;
import java.util.Map;

import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;

import org.androidannotations.api.sharedpreferences.BooleanPrefEditorField;
import org.androidannotations.api.sharedpreferences.EditorHelper;
import org.androidannotations.api.sharedpreferences.FloatPrefEditorField;
import org.androidannotations.api.sharedpreferences.IntPrefEditorField;
import org.androidannotations.api.sharedpreferences.LongPrefEditorField;
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
import org.androidannotations.api.sharedpreferences.StringPrefEditorField;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.ModelConstants;
import org.androidannotations.process.ProcessHolder;

File
SharedPrefHolder.java

Developer's decision
Combination

Kind of conflict
Import

Projects >> androidannotations >>984439f2c12dd3cae3e5132894cfdaee62437c6b