Projects >> nuxeo-features >>9d0bd4044048f2512d3435b2f86f3badbc66b9f8

Chunk
Conflicting content 
 *     Florent Bonnet
 *     Florent Guillaume
 */
<<<<<<< HEAD:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/tree/TreeManagerPluginDescriptor.java

package org.nuxeo.ecm.webapp.tree;
=======
package org.nuxeo.ecm.webapp.navigation;

>>>>>>> 7cd606bf50a651c79b7232064b034c5d03cd1af6:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/navigation/TreeManagerPluginExtension.java

import java.io.Serializable;
import java.util.ArrayList;
Solution content 
 */

package org.nuxeo.ecm.webapp.tree;

import java.io.Serializable;
import java.util.ArrayList;
File
TreeManagerPluginDescriptor.java
Developer's decision
Version 1
Kind of conflict
Package declaration
Chunk
Conflicting content 
import org.nuxeo.common.xmap.annotation.XObject;

/**
<<<<<<< HEAD:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/tree/TreeManagerPluginDescriptor.java
 * Plugin holding filter and sort configuration information for a document tree.
 *
 * @author Florent BONNET
 * @author Anahide Tchertchian
=======
 * @author Florent Bonnet
 * @author Florent Guillaume
>>>>>>> 7cd606bf50a651c79b7232064b034c5d03cd1af6:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/navigation/TreeManagerPluginExtension.java
 */
@XObject("treeManagerPlugin")
public class TreeManagerPluginDescriptor implements Serializable {
Solution content 
 */
@XObject("treeManagerPlugin")
public class TreeManagerPluginDescriptor implements Serializable {
import org.nuxeo.common.xmap.annotation.XObject;

/**
 * Plugin holding filter and sort configuration information for a document tree.
 *
 * @author Florent BONNET
 * @author Anahide Tchertchian
File
TreeManagerPluginDescriptor.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 

    private static final long serialVersionUID = 1L;

<<<<<<< HEAD:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/tree/TreeManagerPluginDescriptor.java
    @XNode("@name")
    protected String name;

    @XNode("filterClass")
    protected String filterClassName;
=======
    // attribute is deprecated, use the element instead
    @XNode("@filterClass")
    String filterClassName;

    @XNode("filterClass")
    public void setFilterClassName(String className) {
        filterClassName = className;
    }
    @XNode("leafFilterClass")
    String leafFilterClassName;

    @XNode("showFiles")
    Boolean showFiles;
>>>>>>> 7cd606bf50a651c79b7232064b034c5d03cd1af6:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/navigation/TreeManagerPluginExtension.java

    @XNode("sorterClass")
    protected String sorterClassName;
Solution content 
    private static final long serialVersionUID = 1L;

    @XNode("@name")
    protected String name;

    @XNode("filterClass")
    protected String filterClassName;

    @XNode("sorterClass")
    protected String sorterClassName;
File
TreeManagerPluginDescriptor.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Comment
Method declaration
Chunk
Conflicting content 
        return includedFacets;
    }

<<<<<<< HEAD:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/tree/TreeManagerPluginDescriptor.java
    public String getSortPropertyPath() {
        return sortPropertyPath;
=======
    public String getLeafFilterClassName() {
        return leafFilterClassName;
>>>>>>> 7cd606bf50a651c79b7232064b034c5d03cd1af6:nuxeo-platform-webapp-core/src/main/java/org/nuxeo/ecm/webapp/navigation/TreeManagerPluginExtension.java
    }

}
Solution content 
        return includedFacets;
    }

    public String getSortPropertyPath() {
        return sortPropertyPath;
    }

}
File
TreeManagerPluginDescriptor.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method signature
Return statement