Projects >> rodl >>7644641c807ecd7f5562803b4a400255e0a4bd08

Chunk
Conflicting content

    /**
<<<<<<< HEAD
     * Load the triple store location from the properties file. In case of any exceptions, log them and return null.
     * 
     * @param filename
     *            properties file name
     * @return the path to the triple store directory
     */
    private static String getStoreDirectory(String filename) {
        try (InputStream is = Thing.class.getClassLoader().getResourceAsStream(filename)) {
            Properties props = new Properties();
            props.load(is);
            return props.getProperty("store.directory");

        } catch (Exception e) {
            LOGGER.error("Trple store location can not be loaded from the properties file", e);
        }
        return null;
=======
     * Build a new immutable research object.
     * 
     * @param uri
     *            the URI
     * @return a new immutable Research Object instance
     */
    public ImmutableResearchObject buildImmutableResearchObject(URI uri) {
        ImmutableResearchObject researchObject = new ImmutableResearchObject(user, dataset, useTransactions, uri);
        researchObject.setBuilder(this);
        return researchObject;
    }


    /**
     * Build a new immutable research object.
     * 
     * @param uri
     *            the URI
     * @param creator
     *            author
     * @param created
     *            creation date
     * @return a new immutable Research Object instance
     */
    public ImmutableResearchObject buildImmutableResearchObject(URI uri, UserMetadata creator, DateTime created) {
        ImmutableResearchObject researchObject = new ImmutableResearchObject(user, dataset, useTransactions, uri);
        researchObject.setCreator(creator);
        researchObject.setCreated(created);
        researchObject.setBuilder(this);
        return researchObject;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param researchObject
     *            the research object that is described
     * @param creator
     *            author
     * @param created
     *            creation date
     * @return a new evo info instance
     */
    public LiveEvoInfo buildLiveEvoInfo(URI uri, ResearchObject researchObject, UserMetadata creator, DateTime created) {
        LiveEvoInfo evoInfo = new LiveEvoInfo(user, dataset, useTransactions, researchObject, uri);
        evoInfo.setCreator(creator);
        evoInfo.setCreated(created);
        evoInfo.setBuilder(this);
        return evoInfo;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param immutableResearchObject
     *            the research object that is described
     * @param creator
     *            author
     * @param created
     *            creation date
     * @param evoType
     * @return a new evo info instance
     */
    public ImmutableEvoInfo buildImmutableEvoInfo(URI uri, ImmutableResearchObject immutableResearchObject,
            UserMetadata creator, DateTime created, EvoType evoType) {
        ImmutableEvoInfo evoInfo = new ImmutableEvoInfo(user, dataset, useTransactions, immutableResearchObject, uri);
        evoInfo.setCreator(creator);
        evoInfo.setCreated(created);
        evoInfo.setEvoType(evoType);
        evoInfo.setBuilder(this);
        return evoInfo;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param immutableResearchObject
     *            the research object that is described
     * @return a new evo info instance
     */
    public ImmutableEvoInfo buildImmutableEvoInfo(URI uri, ImmutableResearchObject immutableResearchObject) {
        ImmutableEvoInfo evoInfo = new ImmutableEvoInfo(user, dataset, useTransactions, immutableResearchObject, uri);
        evoInfo.setBuilder(this);
        return evoInfo;
>>>>>>> b629ce4ba68fbf3669f964368d5b4058f399045f
    }

}
Solution content

    /**
     * Build a new immutable research object.
     * 
     * @param uri
     *            the URI
     * @return a new immutable Research Object instance
     */
    public ImmutableResearchObject buildImmutableResearchObject(URI uri) {
        ImmutableResearchObject researchObject = new ImmutableResearchObject(user, dataset, useTransactions, uri);
        researchObject.setBuilder(this);
        return researchObject;
    }


    /**
     * Build a new immutable research object.
     * 
     * @param uri
     *            the URI
     * @param creator
     *            author
     * @param created
     *            creation date
     * @return a new immutable Research Object instance
     */
    public ImmutableResearchObject buildImmutableResearchObject(URI uri, UserMetadata creator, DateTime created) {
        ImmutableResearchObject researchObject = new ImmutableResearchObject(user, dataset, useTransactions, uri);
        researchObject.setCreator(creator);
        researchObject.setCreated(created);
        researchObject.setBuilder(this);
        return researchObject;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param researchObject
     *            the research object that is described
     * @param creator
     *            author
     * @param created
     *            creation date
     * @return a new evo info instance
     */
    public LiveEvoInfo buildLiveEvoInfo(URI uri, ResearchObject researchObject, UserMetadata creator, DateTime created) {
        LiveEvoInfo evoInfo = new LiveEvoInfo(user, dataset, useTransactions, researchObject, uri);
        evoInfo.setCreator(creator);
        evoInfo.setCreated(created);
        evoInfo.setBuilder(this);
        return evoInfo;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param immutableResearchObject
     *            the research object that is described
     * @param creator
     *            author
     * @param created
     *            creation date
     * @param evoType
     * @return a new evo info instance
     */
    public ImmutableEvoInfo buildImmutableEvoInfo(URI uri, ImmutableResearchObject immutableResearchObject,
            UserMetadata creator, DateTime created, EvoType evoType) {
        ImmutableEvoInfo evoInfo = new ImmutableEvoInfo(user, dataset, useTransactions, immutableResearchObject, uri);
        evoInfo.setCreator(creator);
        evoInfo.setCreated(created);
        evoInfo.setEvoType(evoType);
        evoInfo.setBuilder(this);
        return evoInfo;
    }


    /**
     * Build a new evolution information resource.
     * 
     * @param uri
     *            the URI
     * @param immutableResearchObject
     *            the research object that is described
     * @return a new evo info instance
     */
    public ImmutableEvoInfo buildImmutableEvoInfo(URI uri, ImmutableResearchObject immutableResearchObject) {
        ImmutableEvoInfo evoInfo = new ImmutableEvoInfo(user, dataset, useTransactions, immutableResearchObject, uri);
        evoInfo.setBuilder(this);
        return evoInfo;
    }
File
Builder.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable