Projects >> annotare2 >>c2015f574fa4c9024dac427c7353f109543691e5

Chunk
Conflicting content 
import org.hibernate.criterion.Restrictions;
import uk.ac.ebi.fg.annotare2.db.dao.RecordNotFoundException;
import uk.ac.ebi.fg.annotare2.db.dao.UserDao;
<<<<<<< HEAD
import uk.ac.ebi.fg.annotare2.db.om.UserRole;
import uk.ac.ebi.fg.annotare2.db.om.enums.Role;
=======
import uk.ac.ebi.fg.annotare2.db.model.enums.Role;
>>>>>>> f6814583bab790f12dd95572fed6b6fe78674be6
import uk.ac.ebi.fg.annotare2.db.util.HibernateSessionFactory;
import uk.ac.ebi.fg.annotare2.db.model.User;
Solution content 
import org.hibernate.criterion.Restrictions;
import uk.ac.ebi.fg.annotare2.db.dao.RecordNotFoundException;
import uk.ac.ebi.fg.annotare2.db.dao.UserDao;
import uk.ac.ebi.fg.annotare2.db.model.enums.Role;
import uk.ac.ebi.fg.annotare2.db.util.HibernateSessionFactory;
import uk.ac.ebi.fg.annotare2.db.model.User;
File
UserDaoImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
<<<<<<< HEAD
import uk.ac.ebi.fg.annotare2.configmodel.OntologyTerm;
=======
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.PrintingProtocolDto;
>>>>>>> f6814583bab790f12dd95572fed6b6fe78674be6
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.dataproxy.ArrayDesignDataProxy;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.dataproxy.OntologyDataProxy;
Solution content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.dataproxy.ArrayDesignDataProxy;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.dataproxy.OntologyDataProxy;
File
AdfDetailsActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.IsWidget;
<<<<<<< HEAD
import uk.ac.ebi.fg.annotare2.configmodel.OntologyTerm;
=======
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.PrintingProtocolDto;
>>>>>>> f6814583bab790f12dd95572fed6b6fe78674be6
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;

import java.util.List;
Solution content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.IsWidget;
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;

import java.util.List;
File
AdfDetailsView.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.*;
import com.google.gwt.user.datepicker.client.DateBox;
<<<<<<< HEAD
import uk.ac.ebi.fg.annotare2.configmodel.OntologyTerm;
=======
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.PrintingProtocolDto;
>>>>>>> f6814583bab790f12dd95572fed6b6fe78674be6
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.PrintingProtocolDto;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.view.widget.EfoSuggestOracle;
Solution content 
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.*;
import com.google.gwt.user.datepicker.client.DateBox;
import uk.ac.ebi.fg.annotare2.submission.model.OntologyTerm;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.PrintingProtocolDto;
import uk.ac.ebi.fg.annotare2.web.gwt.common.shared.arraydesign.ArrayDesignDetailsDto;
import uk.ac.ebi.fg.annotare2.web.gwt.editor.client.view.widget.EfoSuggestOracle;
File
AdfDetailsViewImpl.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.inject.Inject;
import uk.ac.ebi.fg.annotare2.db.dao.UserDao;
<<<<<<< HEAD
import uk.ac.ebi.fg.annotare2.db.dao.UserRoleDao;
import uk.ac.ebi.fg.annotare2.db.om.User;
import uk.ac.ebi.fg.annotare2.db.om.UserRole;
import uk.ac.ebi.fg.annotare2.db.om.enums.Role;

import java.math.BigInteger;
import java.security.SecureRandom;
=======
import uk.ac.ebi.fg.annotare2.db.model.User;
>>>>>>> f6814583bab790f12dd95572fed6b6fe78674be6

import static uk.ac.ebi.fg.annotare2.web.server.services.utils.DigestUtil.md5Hex;
Solution content 
import com.google.inject.Inject;
import uk.ac.ebi.fg.annotare2.db.dao.UserDao;
import uk.ac.ebi.fg.annotare2.db.dao.UserRoleDao;
import uk.ac.ebi.fg.annotare2.db.model.User;
import uk.ac.ebi.fg.annotare2.db.model.UserRole;
import uk.ac.ebi.fg.annotare2.db.model.enums.Role;

import java.math.BigInteger;
import java.security.SecureRandom;

import static uk.ac.ebi.fg.annotare2.web.server.services.utils.DigestUtil.md5Hex;
File
AccountManager.java
Developer's decision
Manual
Kind of conflict
Import