Projects >> jabylon >>2924d6c2762b03b8d75daa0c4f9d18b247c42c85

Chunk
Conflicting content 
package de.jutzig.jabylon.ui.config.internal.general;

<<<<<<< HEAD
import java.util.HashSet;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.RegistryFactory;
=======
import java.util.ArrayList;
import java.util.List;

>>>>>>> 1fb5d49ed2fcc31650199fe28d799df378230e6c
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
Solution content 
package de.jutzig.jabylon.ui.config.internal.general;

import java.util.HashSet;

import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.RegistryFactory;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CommitException;
File
UserConfig.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.vaadin.ui.Form;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Table;
<<<<<<< HEAD
import com.vaadin.ui.Table.ColumnGenerator;
=======
>>>>>>> 1fb5d49ed2fcc31650199fe28d799df378230e6c
import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
Solution content 
import com.vaadin.ui.Form;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Table;
import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
File
UserConfig.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
				System.out.println(permissionSelect.getValue());
			}
		});
<<<<<<< HEAD
		addAvailablePermissions(permissionSelect);
		permissionSelect.setValue(new HashSet(selectedUser.getAllPermissions()));
		userDetails.getBody().addComponent(permissionSelect);
=======
		Button btnCancel = new Button("Cancel");
		btnCancel.addListener(new ClickListener() {
			@Override
			public void buttonClick(ClickEvent event) {
				// TODO Auto-generated method stub
			}
		});
		actions.addComponent(btnOk);
		actions.addComponent(btnCancel);
		userDetails.getBody().addComponent(actions);
>>>>>>> 1fb5d49ed2fcc31650199fe28d799df378230e6c
		userConfig.addComponent(userDetails);
	}
Solution content 
			}
		});
		addAvailablePermissions(permissionSelect);
		permissionSelect.setValue(new HashSet(selectedUser.getAllPermissions()));
		userDetails.getBody().addComponent(permissionSelect);
		userConfig.addComponent(userDetails);
	}
File
UserConfig.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	}

	private void addAvailablePermissions(TwinColSelect permissionSelect) {
<<<<<<< HEAD
		GenericEObjectContainer ds = new GenericEObjectContainer(userManagement, UsersPackage.Literals.USER_MANAGEMENT__PERMISSIONS);
		permissionSelect.setContainerDataSource(ds);
		permissionSelect.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY);
		permissionSelect.setItemCaptionPropertyId(UsersPackage.Literals.PERMISSION__DESCRIPTION);
=======
		permissionSelect.addItem("Administrator");
		permissionSelect.addItem("Project Admin");
		permissionSelect.addItem("Translator");
		permissionSelect.addItem("Reviewer");
		List selected = new ArrayList();
		selected.add("Translator");
		permissionSelect.setValue(selected);
		permissionSelect.setData(selected);
>>>>>>> 1fb5d49ed2fcc31650199fe28d799df378230e6c
	}

	private void addUser() {
Solution content 
	}

	private void addAvailablePermissions(TwinColSelect permissionSelect) {
		GenericEObjectContainer ds = new GenericEObjectContainer(userManagement, UsersPackage.Literals.USER_MANAGEMENT__PERMISSIONS);
		permissionSelect.setContainerDataSource(ds);
		permissionSelect.setItemCaptionMode(AbstractSelect.ITEM_CAPTION_MODE_PROPERTY);
		permissionSelect.setItemCaptionPropertyId(UsersPackage.Literals.PERMISSION__DESCRIPTION);
	}

	private void addUser() {
File
UserConfig.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable