Projects >> RoboBinding >>729c2b4e10403cd441fdb1e871a38edd5c539db2

Chunk
Conflicting content 
 * @author Robert Taylor
 */
public class Binders {
<<<<<<< HEAD
    private final Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap;
    
    private Binders(Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap) {
	this.bindingAttributeMappingsProviderMap = bindingAttributeMappingsProviderMap;
    }

    private ActivityBinder createActivityBinder(Activity activity, boolean withPreInitializingViews) {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(activity));
	BinderImplementor binderImplementor = createBinderImplementor(activity, nonBindingViewInflater, withPreInitializingViews);
	return new ActivityBinder(activity, binderImplementor);
    }
    
    private LayoutInflater createLayoutInflater(Context context) {
	return LayoutInflater.from(context).cloneInContext(context);
    }

    private BinderImplementor createBinderImplementor(Context context, NonBindingViewInflater nonBindingViewInflater, boolean withPreInitializingViews) {
	BindingViewInflater bindingViewInflater = createBindingViewInflater(context);
=======
    private final Context context;
    
    private Binders(Context context) {
	this.context = context;
    }

    private ActivityBinder createActivityBinder(Activity activity, boolean withPreInitializingViews) {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater());
	BinderImplementor binderImplementor = createBinderImplementor(nonBindingViewInflater, withPreInitializingViews);
	return new ActivityBinder(activity, binderImplementor);
    }
    
    private LayoutInflater createLayoutInflater() {
	return LayoutInflater.from(context).cloneInContext(context);
    }

    private BinderImplementor createBinderImplementor(NonBindingViewInflater nonBindingViewInflater, boolean withPreInitializingViews) {
	BindingViewInflater bindingViewInflater = createBindingViewInflater();
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	BindingContextFactory bindingContextFactory = new BindingContextFactory(context, withPreInitializingViews, nonBindingViewInflater);
	BinderImplementor binderImplementor = new InternalBinder(bindingViewInflater, bindingContextFactory, new PlainTextErrorFormatter());
	return binderImplementor;
Solution content 
 * @author Robert Taylor
 */
public class Binders {
    private final Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap;
    
    private Binders(Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap) {
	this.bindingAttributeMappingsProviderMap = bindingAttributeMappingsProviderMap;
    }

    private ActivityBinder createActivityBinder(Activity activity, boolean withPreInitializingViews) {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(activity));
	BinderImplementor binderImplementor = createBinderImplementor(activity, nonBindingViewInflater, withPreInitializingViews);
	return new ActivityBinder(activity, binderImplementor);
    }
    
    private LayoutInflater createLayoutInflater(Context context) {
	return LayoutInflater.from(context).cloneInContext(context);
    }

    private BinderImplementor createBinderImplementor(Context context, NonBindingViewInflater nonBindingViewInflater, boolean withPreInitializingViews) {
	BindingViewInflater bindingViewInflater = createBindingViewInflater(context);
	BindingContextFactory bindingContextFactory = new BindingContextFactory(context, withPreInitializingViews, nonBindingViewInflater);
	BinderImplementor binderImplementor = new InternalBinder(bindingViewInflater, bindingContextFactory, new PlainTextErrorFormatter());
	return binderImplementor;
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
	return binderImplementor;
    }

<<<<<<< HEAD
    private BindingViewInflater createBindingViewInflater(Context context) {
	LayoutInflater layoutInflater = createLayoutInflater(context);
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(layoutInflater);
	ByBindingAttributeMappingsResolverFinder byBindingAttributeProviderResolverFinder = new ByBindingAttributeMappingsResolverFinder(
		new BindingAttributeMappingsProviderResolver(bindingAttributeMappingsProviderMap));
=======
    private BindingViewInflater createBindingViewInflater() {
	LayoutInflater layoutInflater = createLayoutInflater();
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(layoutInflater);
	ByBindingAttributeMappingsResolverFinder byBindingAttributeProviderResolverFinder = new ByBindingAttributeMappingsResolverFinder(
		new BindingAttributeMappingsProviderResolver(createBindingAttributeMappingsProviderMap()));
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	BindingAttributeResolver bindingAttributeResolver = new BindingAttributeResolver(byBindingAttributeProviderResolverFinder);
	BindingViewInflater bindingViewInflater = new BindingViewInflater(nonBindingViewInflater, bindingAttributeResolver,
		new BindingAttributeParser());
Solution content 
	return binderImplementor;
    }

    private BindingViewInflater createBindingViewInflater(Context context) {
	LayoutInflater layoutInflater = createLayoutInflater(context);
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(layoutInflater);
	ByBindingAttributeMappingsResolverFinder byBindingAttributeProviderResolverFinder = new ByBindingAttributeMappingsResolverFinder(
		new BindingAttributeMappingsProviderResolver(bindingAttributeMappingsProviderMap));
	BindingAttributeResolver bindingAttributeResolver = new BindingAttributeResolver(byBindingAttributeProviderResolverFinder);
	BindingViewInflater bindingViewInflater = new BindingViewInflater(nonBindingViewInflater, bindingAttributeResolver,
		new BindingAttributeParser());
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    }
    
    private DialogBinder createDialogBinder(Dialog dialog) {
<<<<<<< HEAD
	Context context = dialog.getContext();
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(context));
	BinderImplementor binderImplementor = createBinderImplementor(context, nonBindingViewInflater, true);
	return new DialogBinder(dialog, binderImplementor);
    }

    private InternalViewBinder createInternalViewBinder(Context context)
    {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(context));
	BinderImplementor binderImplementor = createBinderImplementor(context, nonBindingViewInflater, true);
=======
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater());
	BinderImplementor binderImplementor = createBinderImplementor(nonBindingViewInflater, true);
	return new DialogBinder(dialog, binderImplementor);
    }

    private InternalViewBinder createInternalViewBinder()
    {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater());
	BinderImplementor binderImplementor = createBinderImplementor(nonBindingViewInflater, true);
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	return new InternalViewBinder(binderImplementor, nonBindingViewInflater);
    }
Solution content 
    }
    
    private DialogBinder createDialogBinder(Dialog dialog) {
	Context context = dialog.getContext();
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(context));
	BinderImplementor binderImplementor = createBinderImplementor(context, nonBindingViewInflater, true);
	return new DialogBinder(dialog, binderImplementor);
    }

    private InternalViewBinder createInternalViewBinder(Context context)
    {
	NonBindingViewInflater nonBindingViewInflater = new NonBindingViewInflater(createLayoutInflater(context));
	BinderImplementor binderImplementor = createBinderImplementor(context, nonBindingViewInflater, true);
	return new InternalViewBinder(binderImplementor, nonBindingViewInflater);
    }
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
    }
  
    public static void bind(Activity activity, int layoutId, Object presentationModel) {
<<<<<<< HEAD
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	ActivityBinder activityBinder = new Binders(bindingAttributeMappingsProviderMap).createActivityBinder(activity, true);
	activityBinder.inflateAndBind(layoutId, presentationModel);
    }
    public static void bindWithoutPreInitializingViews(Activity activity, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	ActivityBinder activityBinder = new Binders(bindingAttributeMappingsProviderMap).createActivityBinder(activity, false);
=======
	ActivityBinder activityBinder = new Binders(activity).createActivityBinder(activity, true);
	activityBinder.inflateAndBind(layoutId, presentationModel);
    }
    public static void bindWithoutPreInitializingViews(Activity activity, int layoutId, Object presentationModel) {
	ActivityBinder activityBinder = new Binders(activity).createActivityBinder(activity, false);
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	activityBinder.inflateAndBind(layoutId, presentationModel);
    }
Solution content 
    }
  
    public static void bind(Activity activity, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	ActivityBinder activityBinder = new Binders(bindingAttributeMappingsProviderMap).createActivityBinder(activity, true);
	activityBinder.inflateAndBind(layoutId, presentationModel);
    }
    public static void bindWithoutPreInitializingViews(Activity activity, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	ActivityBinder activityBinder = new Binders(bindingAttributeMappingsProviderMap).createActivityBinder(activity, false);
	activityBinder.inflateAndBind(layoutId, presentationModel);
    }
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    }

    public static void bind(Dialog dialog, int layoutId, Object presentationModel) {
<<<<<<< HEAD
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	DialogBinder dialogBinder = new Binders(bindingAttributeMappingsProviderMap).createDialogBinder(dialog);
=======
	DialogBinder dialogBinder = new Binders(dialog.getContext()).createDialogBinder(dialog);
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	dialogBinder.inflateAndBind(layoutId, presentationModel);
    }
Solution content 
    }

    public static void bind(Dialog dialog, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	DialogBinder dialogBinder = new Binders(bindingAttributeMappingsProviderMap).createDialogBinder(dialog);
	dialogBinder.inflateAndBind(layoutId, presentationModel);
    }
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    public static View bindView(Context context, int layoutId, Object presentationModel) {
<<<<<<< HEAD
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	InternalViewBinder viewBinder = new Binders(bindingAttributeMappingsProviderMap).createInternalViewBinder(context);
=======
	InternalViewBinder viewBinder = new Binders(context).createInternalViewBinder();
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	return viewBinder.inflateAndBind(layoutId, presentationModel);
    }
Solution content 
    }

    public static View bindView(Context context, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	InternalViewBinder viewBinder = new Binders(bindingAttributeMappingsProviderMap).createInternalViewBinder(context);
	return viewBinder.inflateAndBind(layoutId, presentationModel);
    }
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }
    
    public static View attachToRootAndBindView(ViewGroup parentView, Context context, int layoutId, Object presentationModel) {
<<<<<<< HEAD
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	InternalViewBinder viewBinder = new Binders(bindingAttributeMappingsProviderMap).createInternalViewBinder(context);
=======
	InternalViewBinder viewBinder = new Binders(context).createInternalViewBinder();
>>>>>>> 5e0995f787cc52e8a8ca4424cd6f81db48193a5f
	return viewBinder.inflateAndBind(layoutId, presentationModel, parentView);
    }
}
Solution content 
    }
    
    public static View attachToRootAndBindView(ViewGroup parentView, Context context, int layoutId, Object presentationModel) {
	Map, BindingAttributeMappingsProvider> bindingAttributeMappingsProviderMap = createBindingAttributeMappingsProviderMap();
	InternalViewBinder viewBinder = new Binders(bindingAttributeMappingsProviderMap).createInternalViewBinder(context);
	return viewBinder.inflateAndBind(layoutId, presentationModel, parentView);
    }
}
File
Binders.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable