Projects >> zanata-server >>0a0aeee5c909a759563978cdf0862110c3c49b70

Chunk
Conflicting content 
import javax.validation.constraints.NotNull;

<<<<<<< HEAD
@Named("copyTransServiceImpl")
@javax.enterprise.context.Dependent
=======
import static org.zanata.transaction.TransactionUtil.runInTransaction;

@Name("copyTransServiceImpl")
@Scope(ScopeType.STATELESS)
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
@Slf4j
@ContainsAsyncMethods
@AllArgsConstructor
Solution content 
import javax.validation.constraints.NotNull;

import static org.zanata.transaction.TransactionUtil.runInTransaction;

@Named("copyTransServiceImpl")
@javax.enterprise.context.Dependent
@Slf4j
@ContainsAsyncMethods
@AllArgsConstructor
File
CopyTransServiceImpl.java
Developer's decision
Combination
Kind of conflict
Annotation
Import
Chunk
Conflicting content 
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

<<<<<<< HEAD
import javax.inject.Inject;
import javax.inject.Named;
=======
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.zanata.common.ContentState;
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.zanata.dao.TextFlowTargetDAO;
import org.zanata.events.TextFlowTargetStateEvent;
import org.zanata.model.HCopyTransOptions;
Solution content 
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

import javax.inject.Inject;
import javax.inject.Named;
import org.zanata.common.ContentState;
import org.zanata.dao.TextFlowTargetDAO;
import org.zanata.events.TextFlowTargetStateEvent;
import org.zanata.model.HCopyTransOptions;
File
CopyTransWorkFactory.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
/**
 * @author Sean Flanigan sflaniga@redhat.com
 */
<<<<<<< HEAD
@Named("copyTransWorkFactory")
@javax.enterprise.context.Dependent
=======
@Name("copyTransWorkFactory")
@Scope(ScopeType.STATELESS)
@Slf4j
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
public class CopyTransWorkFactory {

    // Inject textFlowTargetDAO for Hibernate-based query
Solution content 
/**
 * @author Sean Flanigan sflaniga@redhat.com
 */
@Named("copyTransWorkFactory")
@javax.enterprise.context.Dependent
@Slf4j
public class CopyTransWorkFactory {

    // Inject textFlowTargetDAO for Hibernate-based query
File
CopyTransWorkFactory.java
Developer's decision
Combination
Kind of conflict
Annotation
Chunk
Conflicting content 
    // Inject textFlowTargetDAO for Hibernate-based query
    // Inject translationMemoryServiceImpl for Hibernate Search query
<<<<<<< HEAD
    @Inject
//    @Inject
=======
    @In("textFlowTargetDAO")
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
    private TranslationFinder translationFinder;

    @Inject
Solution content 
    // Inject textFlowTargetDAO for Hibernate-based query
    // Inject translationMemoryServiceImpl for Hibernate Search query
    @Inject
    private TranslationFinder translationFinder;

    @Inject
File
CopyTransWorkFactory.java
Developer's decision
Combination
Kind of conflict
Annotation
Comment
Chunk
Conflicting content 
import javax.inject.Inject;
import javax.annotation.Nullable;

import lombok.extern.slf4j.Slf4j;
<<<<<<< HEAD
import javax.inject.Named;
=======

import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.zanata.async.Async;
import org.zanata.async.AsyncTaskResult;
import org.zanata.async.ContainsAsyncMethods;
Solution content 
import javax.annotation.Nullable;

import lombok.extern.slf4j.Slf4j;
import javax.inject.Inject;
import javax.inject.Named;
import org.zanata.async.Async;
import org.zanata.async.AsyncTaskResult;
import org.zanata.async.ContainsAsyncMethods;
File
CopyVersionServiceImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import lombok.extern.slf4j.Slf4j;

<<<<<<< HEAD
import javax.inject.Inject;
import javax.inject.Named;
=======
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.core.Events;
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.zanata.async.Async;
import org.zanata.async.AsyncTaskResult;
import org.zanata.async.ContainsAsyncMethods;
Solution content 
import lombok.extern.slf4j.Slf4j;

import javax.inject.Inject;
import javax.inject.Named;
import org.jboss.seam.core.Events;
import org.zanata.async.Async;
import org.zanata.async.AsyncTaskResult;
import org.zanata.async.ContainsAsyncMethods;
File
MergeTranslationsServiceImpl.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.zanata.service.TranslationMergeService;
import org.zanata.service.TranslationService;
import org.zanata.service.ValidationService;
<<<<<<< HEAD
import javax.enterprise.event.Event;
=======
import org.zanata.transaction.TransactionUtil;
import org.zanata.util.Event;
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.zanata.util.ShortString;
import org.zanata.webtrans.shared.model.TransUnitId;
import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
Solution content 
import org.zanata.service.TranslationMergeService;
import org.zanata.service.TranslationService;
import org.zanata.service.ValidationService;
import org.zanata.transaction.TransactionUtil;
import javax.enterprise.event.Event;
import org.zanata.util.ShortString;
import org.zanata.webtrans.shared.model.TransUnitId;
import org.zanata.webtrans.shared.model.TransUnitUpdateInfo;
File
TranslationServiceImpl.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.concurrent.TimeUnit;

<<<<<<< HEAD
import org.apache.deltaspike.core.api.common.DeltaSpike;
=======
import javax.enterprise.event.Observes;

import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.hibernate.event.spi.PostInsertEvent;
import org.hibernate.event.spi.PostInsertEventListener;
import org.hibernate.event.spi.PostUpdateEvent;
Solution content 
import java.util.concurrent.TimeUnit;

import javax.enterprise.event.Observes;
import org.apache.deltaspike.core.api.common.DeltaSpike;

import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

import org.hibernate.event.spi.PostInsertEvent;
import org.hibernate.event.spi.PostInsertEventListener;
import org.hibernate.event.spi.PostUpdateEvent;
File
TranslationUpdateListener.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;

<<<<<<< HEAD
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

import javax.enterprise.event.Observes;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;

=======
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
/**
 * Entity event listener for HTextFlowTarget.
 *
Solution content 
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
/**
 * Entity event listener for HTextFlowTarget.
 *
File
TranslationUpdateListener.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import lombok.extern.slf4j.Slf4j;

<<<<<<< HEAD
import javax.annotation.PreDestroy;
import javax.inject.Named;
import javax.servlet.http.HttpSession;

import org.apache.deltaspike.core.api.common.DeltaSpike;
import org.jboss.seam.util.Work;
=======
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.web.ServletContexts;
>>>>>>> f05fd3080e0596f873b6ba3942f0de5fa58a2a73
import org.zanata.async.Async;
import org.zanata.async.ContainsAsyncMethods;
import org.zanata.common.EntityStatus;
Solution content 
import lombok.extern.slf4j.Slf4j;

import javax.annotation.PreDestroy;
import javax.inject.Named;
import javax.servlet.http.HttpSession;

import org.apache.deltaspike.core.api.common.DeltaSpike;
import org.zanata.async.Async;
import org.zanata.async.ContainsAsyncMethods;
import org.zanata.common.EntityStatus;
File
TranslationWorkspaceManagerImpl.java
Developer's decision
Combination
Kind of conflict
Import