| Chunk |
|---|
| Conflicting content |
|---|
import com.googlecode.androidannotations.annotations.AfterTextChange; import com.googlecode.androidannotations.annotations.AfterViews; import com.googlecode.androidannotations.annotations.App; <<<<<<< HEAD import com.googlecode.androidannotations.annotations.FragmentArg; ======= import com.googlecode.androidannotations.annotations.Arg; >>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7 import com.googlecode.androidannotations.annotations.Background; import com.googlecode.androidannotations.annotations.Bean; import com.googlecode.androidannotations.annotations.BeforeTextChange; |
| Solution content |
|---|
import com.googlecode.androidannotations.annotations.AfterTextChange; import com.googlecode.androidannotations.annotations.AfterViews; import com.googlecode.androidannotations.annotations.App; import com.googlecode.androidannotations.annotations.FragmentArg; import com.googlecode.androidannotations.annotations.Background; import com.googlecode.androidannotations.annotations.Bean; import com.googlecode.androidannotations.annotations.BeforeTextChange; |
| File |
|---|
| AndroidAnnotationProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
>>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7 import com.googlecode.androidannotations.processing.ArgProcessor; import com.googlecode.androidannotations.processing.AfterTextChangeProcessor; import com.googlecode.androidannotations.processing.AfterViewsProcessor; import com.googlecode.androidannotations.processing.AppProcessor; <<<<<<< HEAD import com.googlecode.androidannotations.processing.FragmentArgProcessor; ======= import com.googlecode.androidannotations.processing.BackgroundProcessor; import com.googlecode.androidannotations.processing.BeanProcessor; import com.googlecode.androidannotations.processing.BeforeTextChangeProcessor; |
| Solution content |
|---|
import com.googlecode.androidannotations.processing.AfterTextChangeProcessor; import com.googlecode.androidannotations.processing.AfterViewsProcessor; import com.googlecode.androidannotations.processing.AppProcessor; import com.googlecode.androidannotations.processing.FragmentArgProcessor; import com.googlecode.androidannotations.processing.BackgroundProcessor; import com.googlecode.androidannotations.processing.BeanProcessor; import com.googlecode.androidannotations.processing.BeforeTextChangeProcessor; |
| File |
|---|
| AndroidAnnotationProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import com.googlecode.androidannotations.validation.AfterTextChangeValidator; import com.googlecode.androidannotations.validation.AfterViewsValidator; import com.googlecode.androidannotations.validation.AppValidator; <<<<<<< HEAD import com.googlecode.androidannotations.validation.FragmentArgValidator; ======= import com.googlecode.androidannotations.validation.ArgValidator; >>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7 import com.googlecode.androidannotations.validation.BeanValidator; import com.googlecode.androidannotations.validation.BeforeTextChangeValidator; import com.googlecode.androidannotations.validation.ClickValidator; |
| Solution content |
|---|
import com.googlecode.androidannotations.validation.AfterTextChangeValidator; import com.googlecode.androidannotations.validation.AfterViewsValidator; import com.googlecode.androidannotations.validation.AppValidator; import com.googlecode.androidannotations.validation.FragmentArgValidator; import com.googlecode.androidannotations.validation.BeanValidator; import com.googlecode.androidannotations.validation.BeforeTextChangeValidator; import com.googlecode.androidannotations.validation.ClickValidator; |
| File |
|---|
| AndroidAnnotationProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
AfterTextChange.class, //
OrmLiteDao.class, //
HttpsClient.class, //
<<<<<<< HEAD
FragmentArg.class //
=======
Arg.class //
>>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7
})
@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor { |
| Solution content |
|---|
AfterTextChange.class, //
OrmLiteDao.class, //
HttpsClient.class, //
FragmentArg.class //
})
@SupportedSourceVersion(SourceVersion.RELEASE_6)
public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor { |
| File |
|---|
| AndroidAnnotationProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
modelValidator.register(new AfterTextChangeValidator(processingEnv, rClass)); modelValidator.register(new OrmLiteDaoValidator(processingEnv, rClass)); modelValidator.register(new HttpsClientValidator(processingEnv, rClass)); <<<<<<< HEAD modelValidator.register(new FragmentArgValidator(processingEnv)); ======= modelValidator.register(new ArgValidator(processingEnv)); >>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7 return modelValidator; } |
| Solution content |
|---|
modelValidator.register(new AfterTextChangeValidator(processingEnv, rClass)); modelValidator.register(new OrmLiteDaoValidator(processingEnv, rClass)); modelValidator.register(new HttpsClientValidator(processingEnv, rClass)); modelValidator.register(new FragmentArgValidator(processingEnv)); return modelValidator; } |
| File |
|---|
| AndroidAnnotationProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
{
// create()
<<<<<<< HEAD
JMethod method = holder.eBean.method(STATIC | PUBLIC, holder.fragmentBuilderClass, "builder");
=======
JMethod method = holder.eBean.method(STATIC | PUBLIC, holder.fragmentBuilderClass, "create");
>>>>>>> 253ee67a37bc268031c7515c33cc4cf536c706e7
method.body()._return(_new(holder.fragmentBuilderClass));
}
} |
| Solution content |
|---|
{
// create()
JMethod method = holder.eBean.method(STATIC | PUBLIC, holder.fragmentBuilderClass, "builder");
method.body()._return(_new(holder.fragmentBuilderClass));
}
} |
| File |
|---|
| EFragmentProcessor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |