Projects >> RoboBinding >>9b283c597e5d168bf0edfaac27b4aab099043511

Chunk
Conflicting content 
	private enum ViewType {ITEM_LAYOUT, DROPDOWN_LAYOUT}
	
	private DataSetValueModel dataSetValueModel;
<<<<<<< HEAD
=======
	private final ItemBinder itemBinder;
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
	
	private boolean preInitializeViews;
	private boolean propertyChangeEventOccurred = false;
Solution content 
	private enum ViewType {ITEM_LAYOUT, DROPDOWN_LAYOUT}
	
	private DataSetValueModel dataSetValueModel;
	private final ItemBinder itemBinder;
	
	private boolean preInitializeViews;
	private boolean propertyChangeEventOccurred = false;
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
	
	public DataSetAdapter(BindingContext bindingContext)
	{
<<<<<<< HEAD
		itemBinder = bindingContext.createItemBinder();
		dropDownBinder = bindingContext.createItemBinder();
		this.preInitializeViews = bindingContext.shouldPreInitializeViews();
=======
		this.itemBinder = new ItemBinder(context);
		this.preInitializeViews = preInitializeViews;
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
	}

	public void observeChangesOnTheValueModel()
Solution content 
	{
		this.itemBinder = new ItemBinder(context);
		this.preInitializeViews = preInitializeViews;
	}

	public void observeChangesOnTheValueModel()
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD
=======
		};
	}
	
	public void setItemLayoutId(int itemLayoutId)
	{
		itemBinder.setItemLayoutId(itemLayoutId);
	}
	
	public void setDropdownLayoutId(int dropdownLayoutId)
	{
		itemBinder.setDropdownLayoutId(dropdownLayoutId);
	}
	
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
	@Override
	public int getCount()
	{
Solution content 
		};
	}
	
	public void setItemLayoutId(int itemLayoutId)
	{
		itemBinder.setItemLayoutId(itemLayoutId);
	}
	
	public void setDropdownLayoutId(int dropdownLayoutId)
	{
		itemBinder.setDropdownLayoutId(dropdownLayoutId);
	}
	
	@Override
	public int getCount()
	{
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
	private View newView(int position, ViewGroup parent, ViewType viewType)
	{
		ItemPresentationModel itemPresentationModel = dataSetValueModel.newItemPresentationModel();
<<<<<<< HEAD
		View view;
		if(viewType == ViewType.ITEM_LAYOUT)
		{
			view = itemBinder.inflateAndBind(itemLayoutId, itemPresentationModel);
		}else
		{
			view = dropDownBinder.inflateAndBind(dropDownLayoutId, itemPresentationModel);
		}
=======
		View view = viewType == ViewType.ITEM_LAYOUT ? itemBinder.inflateItemAndBindTo(itemPresentationModel) : itemBinder.inflateDropdownAndBindTo(itemPresentationModel);
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
		view.setTag(itemPresentationModel);
		return view;
	}
Solution content 
	private View newView(int position, ViewGroup parent, ViewType viewType)
	{
		ItemPresentationModel itemPresentationModel = dataSetValueModel.newItemPresentationModel();
		View view = viewType == ViewType.ITEM_LAYOUT ? itemBinder.inflateItemAndBindTo(itemPresentationModel) : itemBinder.inflateDropdownAndBindTo(itemPresentationModel);
		view.setTag(itemPresentationModel);
		return view;
	}
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
	public void setItemPredefinedPendingAttributesForViewGroup(Collection predefinedPendingAttributesForViewGroup)
	{
<<<<<<< HEAD
		itemBinder.setPredefinedPendingAttributesForViewGroup(predefinedPendingAttributesForViewGroup);
=======
		itemBinder.setItemMappingAttribute(itemMappingAttribute);
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
	}

	public void setDropdownPredefinedPendingAttributesForViewGroup(Collection predefinedPendingAttributesForViewGroup)
Solution content 
	{
		itemBinder.setItemMappingAttribute(itemMappingAttribute);
	}
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD

	public void setDropdownPredefinedPendingAttributesForViewGroup(Collection predefinedPendingAttributesForViewGroup)
	{
		dropDownBinder.setPredefinedPendingAttributesForViewGroup(predefinedPendingAttributesForViewGroup);
=======
		itemBinder.setDropdownMappingAttribute(dropdownMappingAttribute);
>>>>>>> 120c73a0666cb14e736ed4e558f661279b7df8f2
	}
}
Solution content 
	public void setDropdownMappingAttribute(DropdownMappingAttribute dropdownMappingAttribute)
	{
		itemBinder.setDropdownMappingAttribute(dropdownMappingAttribute);
	}
}
File
DataSetAdapter.java
Developer's decision
Version 2
Kind of conflict
Method invocation