Projects >> zanata-server >>f76325ed0e8adb7470b0043f071b6327f161b6aa

Chunk
Conflicting content 
import java.util.Collection;

<<<<<<< HEAD
import org.zanata.webtrans.shared.model.ValidationAction;
=======
import org.zanata.model.HProjectIteration;
import org.zanata.webtrans.shared.model.ValidationObject;
>>>>>>> bb35002d92fc7e05b80b08581377395b716f927f


/**
Solution content 
import java.util.Collection;

import org.zanata.webtrans.shared.model.ValidationAction;
import org.zanata.model.HProjectIteration;


/**
File
ValidationService.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    * @param versionSlug
    * @return
    */
<<<<<<< HEAD
   Collection getValidationAction(String projectSlug, String versionSlug);
=======
   List getValidationObject(String projectSlug, String versionSlug);

   /**
    * Return all ValidationObjects with enabled=true on those which are
    * customized to the version
    * 
    * @param HProjectIteration
    * @return
    */
   List getValidationObject(HProjectIteration version);
>>>>>>> bb35002d92fc7e05b80b08581377395b716f927f
}
Solution content 
    * @param versionSlug
    * @return
    */
   Collection getValidationAction(String projectSlug, String versionSlug);

   /**
    * Return all ValidationActions with enabled=true on those which are
    * customized to the version
    * 
    * @param HProjectIteration
    * @return
    */
   Collection getValidationObject(HProjectIteration version);
}
File
ValidationService.java
Developer's decision
Manual
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
   @Override
   public Collection getValidationAction(String projectSlug, String versionSlug)
   {
<<<<<<< HEAD
      Collection validationList = ValidationFactory.getAllValidationActions(validationMessageResolverImpl).values();
      Set enabledValidations = new HashSet();
=======
      List validationList = ValidationFactory.getAllValidationObject();
>>>>>>> bb35002d92fc7e05b80b08581377395b716f927f

      if (!StringUtils.isEmpty(projectSlug) && !StringUtils.isEmpty(versionSlug))
      {
Solution content 
   @Override
   public Collection getValidationAction(String projectSlug, String versionSlug)
   {
      Collection validationList = null;

      if (!StringUtils.isEmpty(projectSlug) && !StringUtils.isEmpty(versionSlug))
      {
File
ValidationServiceImpl.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable