Projects >> celements-core >>fa2b46ad0a40df25f287edb2aa716efdeeeb8681

Chunk
Conflicting content 
import com.celements.auth.AuthenticationService;
import com.celements.auth.IAuthenticationServiceRole;
<<<<<<< HEAD
=======
import com.celements.mailsender.IMailSenderRole;
import com.celements.mandatory.CheckMandatoryDocuments;
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
import com.celements.navigation.cmd.GetMappedMenuItemsForParentCommand;
import com.celements.navigation.service.ITreeNodeService;
import com.celements.pagetype.IPageType;
Solution content 
import com.celements.auth.AuthenticationService;
import com.celements.auth.IAuthenticationServiceRole;
import com.celements.mailsender.IMailSenderRole;
import com.celements.navigation.cmd.GetMappedMenuItemsForParentCommand;
import com.celements.navigation.service.ITreeNodeService;
import com.celements.pagetype.IPageType;
File
CelementsWebPlugin.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.celements.pagetype.IPageType;
import com.celements.web.plugin.api.CelementsWebPluginApi;
import com.celements.web.plugin.cmd.AddTranslationCommand;
<<<<<<< HEAD
import com.celements.web.plugin.cmd.CelSendMail;
=======
import com.celements.web.plugin.cmd.CheckClassesCommand;
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
import com.celements.web.plugin.cmd.PossibleLoginsCommand;
import com.celements.web.plugin.cmd.SkinConfigObjCommand;
import com.celements.web.plugin.cmd.TokenBasedUploadCommand;
Solution content 
import com.celements.pagetype.IPageType;
import com.celements.web.plugin.api.CelementsWebPluginApi;
import com.celements.web.plugin.cmd.AddTranslationCommand;
import com.celements.web.plugin.cmd.PossibleLoginsCommand;
import com.celements.web.plugin.cmd.SkinConfigObjCommand;
import com.celements.web.plugin.cmd.TokenBasedUploadCommand;
File
CelementsWebPlugin.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
    _LOGGER.debug("getParentForLevel: level [" + level + "] returning [" + parent + "]");
    return parent;
  }
<<<<<<< HEAD
  
=======

  /**
   * @deprecated since 2.63.0
   * @deprecated instead use IDocumentParentsListerRole.getDocumentParentsList(
      DocumentReference docRef, boolean includeDoc)
   */
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
  @Override
  @Deprecated 
  public List getDocumentParentsList(DocumentReference docRef,
Solution content 
    _LOGGER.debug("getParentForLevel: level [" + level + "] returning [" + parent + "]");
    return parent;
  }
  
  /**
   * @deprecated since 2.63.0
   * @deprecated instead use IDocumentParentsListerRole.getDocumentParentsList(
      DocumentReference docRef, boolean includeDoc)
   */
  @Override
  @Deprecated 
  public List getDocumentParentsList(DocumentReference docRef,
File
WebUtilsService.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
  @Deprecated 
  public List getDocumentParentsList(DocumentReference docRef,
      boolean includeDoc) {
<<<<<<< HEAD
    ArrayList docParents = new ArrayList();
    try {
      DocumentReference nextParent;
      if (includeDoc) {
        docParents.add(docRef);
      }
        nextParent = getParentRef(docRef);
      while ((nextParent != null)
          && getContext().getWiki().exists(nextParent, getContext())
          && !docParents.contains(nextParent)) {
        docParents.add(nextParent);
        nextParent = getParentRef(nextParent);
      }
    } catch (XWikiException e) {
      _LOGGER.error("Failed to get parent reference. ", e);
    }
    return docParents;
  }
  
  private DocumentReference getParentRef(DocumentReference docRef) throws XWikiException {
    return getContext().getWiki().getDocument(docRef, getContext()).getParentReference();
=======
    return getDocumentParentsLister().getDocumentParentsList(docRef, includeDoc);
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
  }
  
  @Override
Solution content 
  @Deprecated 
  public List getDocumentParentsList(DocumentReference docRef,
      boolean includeDoc) {
    return getDocumentParentsLister().getDocumentParentsList(docRef, includeDoc);
  }
  
  @Override
File
WebUtilsService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
<<<<<<< HEAD
  @Override
  public List getAllowedLanguages(String spaceName) {
    List languages = new ArrayList();
    languages.addAll(Arrays.asList(getContext().getWiki(
      ).getSpacePreference("languages", spaceName, "", getContext()).split("[ ,]")));
=======
    String spaceLanguages = getContext().getWiki().getSpacePreference("languages",
        spaceName, "", getContext());
    languages.addAll(Arrays.asList(spaceLanguages.split("[ ,]")));
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
    languages.remove("");
    if (languages.size() > 0) {
      _LOGGER.debug("getAllowedLanguages: returning [" + spaceLanguages + "] for space ["
Solution content 
  @Override
  public List getAllowedLanguages(String spaceName) {
    List languages = new ArrayList();
    String spaceLanguages = getContext().getWiki().getSpacePreference("languages",
        spaceName, "", getContext());
    languages.addAll(Arrays.asList(spaceLanguages.split("[ ,]")));
    languages.remove("");
    if (languages.size() > 0) {
      _LOGGER.debug("getAllowedLanguages: returning [" + spaceLanguages + "] for space ["
File
WebUtilsService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
<<<<<<< HEAD
import org.xwiki.component.util.DefaultParameterizedType;
import org.xwiki.context.Execution;
=======
import org.xwiki.configuration.ConfigurationSource;
>>>>>>> 4ec9040830bc572e3e3db63b6f1ef0732e1f4191
import org.xwiki.model.EntityType;
import org.xwiki.model.reference.AttachmentReference;
import org.xwiki.model.reference.DocumentReference;
Solution content 
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.xwiki.component.util.DefaultParameterizedType;
import org.xwiki.configuration.ConfigurationSource;
import org.xwiki.context.Execution;
import org.xwiki.model.EntityType;
import org.xwiki.model.reference.AttachmentReference;
import org.xwiki.model.reference.DocumentReference;
File
WebUtilsServiceTest.java
Developer's decision
Combination
Kind of conflict
Import