Projects >> nuxeo-features >>566e78f22aa32c0358fba58cc95e1eabd4b9784d

Chunk
Conflicting content 
    /**
     *
<<<<<<< HEAD
     * @param data comma-separated values that will be used to create a list of
     *            structures containing an index also
=======
     * @param data comma-separated values that will be used to create a list
     *            of structures containing an index also
>>>>>>> 29a6e00aa8624d53946e896e2b26aebe8e7efc53
     * @return
     */
    public static List getCSLData(String data) {
Solution content 
    /**
     *
     * @param data comma-separated values that will be used to create a list of
     *            structures containing an index also
     * @return
     */
    public static List getCSLData(String data) {
File
DirectoryFunctions.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        try {
        return items.length;
    }

<<<<<<< HEAD
    public static DocumentModel getDirectoryEntry(String directoryName,
            String entryId) throws Exception {
        if (entryId == null) {
            return null;
        }
        Session session = null;
            DirectoryService dirService = Framework.getService(DirectoryService.class);
            session = dirService.open(directoryName);
            return session.getEntry(entryId);
        } finally {
            if (session != null) {
                session.close();
            }
        }
    }

    public static DocumentModelList getDirectoryEntries(String directoryName,
            String... entryIds) throws Exception {
        if (entryIds == null) {
            return null;
        }
        Session session = null;
        try {
            DirectoryService dirService = Framework.getService(DirectoryService.class);
            session = dirService.open(directoryName);
            DocumentModelList result = new DocumentModelListImpl();
            DocumentModel entry;
            for (String entryId : entryIds) {
                entry = session.getEntry(entryId);
                if (entry != null) {
                    result.add(entry);
                }
            }
            return result;
        } finally {
            if (session != null) {
                session.close();
            }
        }
    }

    public static DocumentModelList getDirectoryListEntries(
            String directoryName, Collection entryIds) throws Exception {
        if (entryIds == null) {
            return null;
        }
        return DirectoryFunctions.getDirectoryEntries(directoryName,
                entryIds.toArray(new String[] {}));
    }

=======
>>>>>>> 29a6e00aa8624d53946e896e2b26aebe8e7efc53
}
Solution content 
        return items.length;
    }

    public static DocumentModel getDirectoryEntry(String directoryName,
            String entryId) throws Exception {
        if (entryId == null) {
            return null;
        }
        Session session = null;
        try {
            DirectoryService dirService = Framework.getService(DirectoryService.class);
            session = dirService.open(directoryName);
            return session.getEntry(entryId);
        } finally {
            if (session != null) {
                session.close();
            }
        }
    }

    public static DocumentModelList getDirectoryEntries(String directoryName,
            String... entryIds) throws Exception {
        if (entryIds == null) {
            return null;
        }
        Session session = null;
        try {
            DirectoryService dirService = Framework.getService(DirectoryService.class);
            session = dirService.open(directoryName);
            DocumentModelList result = new DocumentModelListImpl();
            DocumentModel entry;
            for (String entryId : entryIds) {
                entry = session.getEntry(entryId);
                if (entry != null) {
                    result.add(entry);
                }
            }
            return result;
        } finally {
            if (session != null) {
                session.close();
            }
        }
    }

    public static DocumentModelList getDirectoryListEntries(
            String directoryName, Collection entryIds) throws Exception {
        if (entryIds == null) {
            return null;
        }
        return DirectoryFunctions.getDirectoryEntries(directoryName,
                entryIds.toArray(new String[] {}));
    }

}
File
DirectoryFunctions.java
Developer's decision
Version 1
Kind of conflict
Method declaration