Projects >> mes >>e4df25603ba9ea6d6565454b6a0c8404730f80ff

Chunk
Conflicting content 
import java.util.Set;

import org.springframework.core.io.Resource;
<<<<<<< HEAD:mes-plugin/src/main/java/com/qcadoo/plugin/internal/api/PluginXmlResolver.java

public interface PluginXmlResolver {

    Set getPluginXmlFiles();
=======
public interface PluginDescriptorResolver {

    Set getDescriptors();
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f:mes-plugin/src/main/java/com/qcadoo/plugin/internal/api/PluginDescriptorResolver.java

}
Solution content 
import java.util.Set;

import org.springframework.core.io.Resource;

public interface PluginDescriptorResolver {

    Set getDescriptors();

}
File
PluginDescriptorResolver.java
Developer's decision
Manual
Kind of conflict
Import
Interface signature
Method interface
Chunk
Conflicting content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD
import org.springframework.core.io.Resource;
=======
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Solution content 
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
File
DefaultPluginDescriptorParser.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    @Override
    public Set loadPlugins() {
        Set loadedplugins = new HashSet();
<<<<<<< HEAD
        for (Resource resource : pluginXmlResolver.getPluginXmlFiles()) {
            loadedplugins.add(parse(resource));
=======
        for (File xmlFile : pluginDescriptorResolver.getDescriptors()) {
            loadedplugins.add(parse(xmlFile));
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f
        }
        return loadedplugins;
    }
Solution content 
    @Override
    public Set loadPlugins() {
        Set loadedplugins = new HashSet();
        for (Resource resource : pluginDescriptorResolver.getDescriptors()) {
            loadedplugins.add(parse(resource));
        }
        return loadedplugins;
    }
File
DefaultPluginDescriptorParser.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<< HEAD
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
=======
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f

import com.qcadoo.plugin.internal.PluginException;
import com.qcadoo.plugin.internal.api.PluginArtifact;
Solution content 
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;

import com.qcadoo.plugin.internal.PluginException;
import com.qcadoo.plugin.internal.api.PluginArtifact;
File
DefaultPluginFileManager.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Collections;
import java.util.List;

<<<<<<< HEAD
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
=======
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f

import com.qcadoo.plugin.api.Plugin;
import com.qcadoo.plugin.api.PluginAccessor;
Solution content 
import java.util.Collections;
import java.util.List;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;

import com.qcadoo.plugin.api.Plugin;
import com.qcadoo.plugin.api.PluginAccessor;
File
DefaultPluginManager.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
@Service
public final class DefaultPluginManager implements PluginManager {

<<<<<<< HEAD
    private static final Logger LOG = LoggerFactory.getLogger(DefaultPluginManager.class);

=======
    @Autowired
>>>>>>> 65fdfe6ba12957a8fee1cf685392ead059a07a8f
    private PluginAccessor pluginAccessor;

    @Autowired
Solution content 
@Service
public final class DefaultPluginManager implements PluginManager {

    private static final Logger LOG = LoggerFactory.getLogger(DefaultPluginManager.class);

    @Autowired
    private PluginAccessor pluginAccessor;

    @Autowired
File
DefaultPluginManager.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Method invocation