Projects >> Maritaca_SD_version >>9404d8eb8d8f1b5529f69b0fb2ab6e20f8d988c7

Chunk
Conflicting content 
		this.createRules();
	}
	
<<<<<<< HEAD
	private void createRules() {
		permission[PRIVATE.getIdPolicy()][FORM.getIdDocument()][OWNER.getIdAccessor()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PRIVATE.getIdPolicy()][FORM.getIdDocument()][LIST.getIdAccessor()]   				= new Permission();
        permission[PRIVATE.getIdPolicy()][FORM.getIdDocument()][ALL.getIdAccessor()] 					= new Permission();
        
		permission[SHARED_HIERARCHICAL.getIdPolicy()][FORM.getIdDocument()][OWNER.getIdAccessor()]  	= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getIdPolicy()][FORM.getIdDocument()][LIST.getIdAccessor()]   	= new Permission(READ);
        permission[SHARED_HIERARCHICAL.getIdPolicy()][FORM.getIdDocument()][ALL.getIdAccessor()] 		= new Permission();
        
        permission[SHARED_SOCIAL.getIdPolicy()][FORM.getIdDocument()][OWNER.getIdAccessor()]  			= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getIdPolicy()][FORM.getIdDocument()][LIST.getIdAccessor()]   			= new Permission(READ);
        permission[SHARED_SOCIAL.getIdPolicy()][FORM.getIdDocument()][ALL.getIdAccessor()]	  			= new Permission();
        
        permission[PUBLIC.getIdPolicy()][FORM.getIdDocument()][OWNER.getIdAccessor()]  					= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getIdPolicy()][FORM.getIdDocument()][LIST.getIdAccessor()]   					= new Permission(READ);
        permission[PUBLIC.getIdPolicy()][FORM.getIdDocument()][ALL.getIdAccessor()]    					= new Permission(READ);
        //
        permission[PRIVATE.getIdPolicy()][ANSWER.getIdDocument()][OWNER.getIdAccessor()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PRIVATE.getIdPolicy()][ANSWER.getIdDocument()][LIST.getIdAccessor()]   				= new Permission();
        permission[PRIVATE.getIdPolicy()][ANSWER.getIdDocument()][ALL.getIdAccessor()] 	  				= new Permission();
        
        permission[SHARED_HIERARCHICAL.getIdPolicy()][ANSWER.getIdDocument()][OWNER.getIdAccessor()]  	= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getIdPolicy()][ANSWER.getIdDocument()][LIST.getIdAccessor()]   	= new Permission(UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getIdPolicy()][ANSWER.getIdDocument()][ALL.getIdAccessor()] 	  	= new Permission();
        
        permission[SHARED_SOCIAL.getIdPolicy()][ANSWER.getIdDocument()][OWNER.getIdAccessor()]  		= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getIdPolicy()][ANSWER.getIdDocument()][LIST.getIdAccessor()]   		= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getIdPolicy()][ANSWER.getIdDocument()][ALL.getIdAccessor()] 			= new Permission();
        
        permission[PUBLIC.getIdPolicy()][ANSWER.getIdDocument()][OWNER.getIdAccessor()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getIdPolicy()][ANSWER.getIdDocument()][LIST.getIdAccessor()]   				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getIdPolicy()][ANSWER.getIdDocument()][ALL.getIdAccessor()] 	 				= new Permission(READ, UPDATE, DELETE, SHARE);
=======
	private void createRules() {																					
		//TODO: Use AccessLevel and Operation                        //PERMISSION(READ, UPDATE, DELETE, SHARE)
		permission[PRIVATE.getId()][FORM.getId()][OWNER.getId()] = new Permission(true, true, true, true);
        permission[PRIVATE.getId()][FORM.getId()][LIST.getId()]  = new Permission(false, false, false, false);
        permission[PRIVATE.getId()][FORM.getId()][ALL.getId()] 	 = new Permission(false, false, false, false);
        
		permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][LIST.getId()]   = new Permission(true, false, false, false);
        permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][ALL.getId()] 	  = new Permission(false, false, false, false);
        
        permission[SHARED_SOCIAL.getId()][FORM.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[SHARED_SOCIAL.getId()][FORM.getId()][LIST.getId()]   = new Permission(true, false, false, false);
        permission[SHARED_SOCIAL.getId()][FORM.getId()][ALL.getId()]	= new Permission(false, false, false, false);
        
        permission[PUBLIC.getId()][FORM.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[PUBLIC.getId()][FORM.getId()][LIST.getId()]   = new Permission(true, false, false, false);
        permission[PUBLIC.getId()][FORM.getId()][ALL.getId()]    = new Permission(true, false, false, false);
        //
        permission[PRIVATE.getId()][ANSWER.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[PRIVATE.getId()][ANSWER.getId()][LIST.getId()]   = new Permission(false, false, false, false);
        permission[PRIVATE.getId()][ANSWER.getId()][ALL.getId()] 	= new Permission(false, false, false, false);
        
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][LIST.getId()]   = new Permission(false, false, false, false);
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][ALL.getId()] 	= new Permission(false, false, false, false);
        
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][LIST.getId()]   = new Permission(true, true, true, true);
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][ALL.getId()] 	  = new Permission(false, false, false, false);
        
        permission[PUBLIC.getId()][ANSWER.getId()][OWNER.getId()]  = new Permission(true, true, true, true);
        permission[PUBLIC.getId()][ANSWER.getId()][LIST.getId()]   = new Permission(true, true, true, true);
        permission[PUBLIC.getId()][ANSWER.getId()][ALL.getId()]    = new Permission(true, true, true, true);
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
	}
	
	/**
Solution content 
		this.createRules();
	}
	
	private void createRules() {
		permission[PRIVATE.getId()][FORM.getId()][OWNER.getId()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PRIVATE.getId()][FORM.getId()][LIST.getId()]   				= new Permission();
        permission[PRIVATE.getId()][FORM.getId()][ALL.getId()] 					= new Permission();
        
		permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][OWNER.getId()]  	= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][LIST.getId()]   	= new Permission(READ);
        permission[SHARED_HIERARCHICAL.getId()][FORM.getId()][ALL.getId()] 		= new Permission();
        
        permission[SHARED_SOCIAL.getId()][FORM.getId()][OWNER.getId()]  		= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getId()][FORM.getId()][LIST.getId()]   		= new Permission(READ);
        permission[SHARED_SOCIAL.getId()][FORM.getId()][ALL.getId()]	  		= new Permission();
        
        permission[PUBLIC.getId()][FORM.getId()][OWNER.getId()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getId()][FORM.getId()][LIST.getId()]   				= new Permission(READ);
        permission[PUBLIC.getId()][FORM.getId()][ALL.getId()]    				= new Permission(READ);
        //
        permission[PRIVATE.getId()][ANSWER.getId()][OWNER.getId()]  			= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PRIVATE.getId()][ANSWER.getId()][LIST.getId()]   			= new Permission();
        permission[PRIVATE.getId()][ANSWER.getId()][ALL.getId()] 	  			= new Permission();
        
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][OWNER.getId()]  = new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][LIST.getId()]  	= new Permission(UPDATE, DELETE, SHARE);
        permission[SHARED_HIERARCHICAL.getId()][ANSWER.getId()][ALL.getId()]  	= new Permission();
       
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][OWNER.getId()]  		= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][LIST.getId()]   		= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[SHARED_SOCIAL.getId()][ANSWER.getId()][ALL.getId()] 			= new Permission();
        
        permission[PUBLIC.getId()][ANSWER.getId()][OWNER.getId()]  				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getId()][ANSWER.getId()][LIST.getId()]   				= new Permission(READ, UPDATE, DELETE, SHARE);
        permission[PUBLIC.getId()][ANSWER.getId()][ALL.getId()] 	 			= new Permission(READ, UPDATE, DELETE, SHARE);
	}
	
	/**
File
Rule.java
Developer's decision
Manual
Kind of conflict
Array access
Comment
Method invocation
Method signature
Chunk
Conflicting content 
	 * @param userDto
	 * @throws IllegalArgumentException
	 */
<<<<<<< HEAD
	public void saveAccount(UserDTO userDto){
		if(userDto.getEmail()==null||(userDto.getKey()==null && registeredEmail(userDto.getEmail()))){
=======
	public void saveNewAccount(UserDTO userDto){
		if(userDto.getEmail()==null||registeredEmail(userDto.getEmail())){
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
			throw new IllegalArgumentException();
		}
		saveAccount(userDto);
Solution content 
	 * @param userDto
	 * @throws IllegalArgumentException
	 */

	public void saveNewAccount(UserDTO userDto){
		if(userDto.getEmail()==null||registeredEmail(userDto.getEmail())){
			throw new IllegalArgumentException();
		}
		saveAccount(userDto);
File
AccountEditorEJB.java
Developer's decision
Version 2
Kind of conflict
If statement
Method signature
Chunk
Conflicting content 
			if(user != null) {
		List formsDTO = null;
		List
 forms = formDAO.getListOwnFormsByUserKey(userDTO.getKey().toString());
		if(forms != null && !forms.isEmpty()) {
<<<<<<< HEAD
			formsDTO = new ArrayList();			
			User user = userDAO.findUserByEmail(userDTO.getEmail());
=======
			formsDTO = new ArrayList();
			//TODO: Need I this query? this user has all the permissions for his/her forms!
			User user = userDAO.findUserByKey(userDTO.getKey());
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
                for(Form form : forms) {//Ask
                	Permission permission = new Permission(Operation.READ, Operation.UPDATE, Operation.DELETE, Operation.SHARE);//super.getPermission(form, form.getUser().getKey(), Document.FORM);
Solution content 
		List formsDTO = null;
		List forms = formDAO.getListOwnFormsByUserKey(userDTO.getKey().toString());
		if(forms != null && !forms.isEmpty()) {
			formsDTO = new ArrayList();
			//TODO: Need I this query? this user has all the permissions for his/her forms!
			User user = userDAO.findUserByKey(userDTO.getKey());
			if(user != null) {
                for(Form form : forms) {//Ask
                	Permission permission = new Permission(Operation.READ, Operation.UPDATE, Operation.DELETE, Operation.SHARE);//super.getPermission(form, form.getUser().getKey(), Document.FORM);
File
FormListerEJB.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
		List forms = formDAO.getAllSharedFormsByUserKey(userDTO.getKey().toString());
		if(forms!= null && !forms.isEmpty()) {
			formsDTO = new ArrayList();
<<<<<<< HEAD
			User user = userDAO.findUserByEmail(userDTO.getEmail());
=======
			//TODO: Need I this query?
			User user = userDAO.findUserByKey(userDTO.getKey());
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
			if(user != null) {
                for(Form form : forms) {
                	if(form != null && !userDTO.getKey().toString().equals(form.getUser().getKey().toString())) {
Solution content 
		List forms = formDAO.getAllSharedFormsByUserKey(userDTO.getKey().toString());
		if(forms!= null && !forms.isEmpty()) {
			formsDTO = new ArrayList();
			User user = userDAO.findUserByKey(userDTO.getKey());
			if(user != null) {
                for(Form form : forms) {
                	if(form != null && !userDTO.getKey().toString().equals(form.getUser().getKey().toString())) {
File
FormListerEJB.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
import org.richfaces.component.UIPanelMenu;
import org.richfaces.event.ItemChangeEvent;
<<<<<<< HEAD
=======
import br.unifesp.maritaca.web.jsf.AbstractBean;
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
import br.unifesp.maritaca.web.module.Module;
import br.unifesp.maritaca.web.module.ModuleImpl;
import br.unifesp.maritaca.web.submodule.SubModule;
Solution content 
import org.richfaces.component.UIPanelMenu;
import org.richfaces.event.ItemChangeEvent;
import br.unifesp.maritaca.web.module.Module;
import br.unifesp.maritaca.web.module.ModuleImpl;
import br.unifesp.maritaca.web.submodule.SubModule;
File
Manager.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	public void setModuleManager(Manager moduleManager) {
		this.moduleManager = moduleManager;
	}
<<<<<<< HEAD

	public Integer getItemsPerPage() {						
		return itemsPerPage;
	}

	public void setItemsPerPage(Integer itemsPerPage) {
		this.itemsPerPage = itemsPerPage;
	}	
}
=======
}
>>>>>>> aaed02dd95c20f56704a759403754a38d35d4ec1
Solution content 
	public void setModuleManager(Manager moduleManager) {
		this.moduleManager = moduleManager;
	}
	public Integer getItemsPerPage() {						
		return itemsPerPage;
	}

	public void setItemsPerPage(Integer itemsPerPage) {
		this.itemsPerPage = itemsPerPage;
	}	
}
File
MaritacaJSFBean.java
Developer's decision
Version 1
Kind of conflict
Method declaration