Projects >> ceylon-ide-eclipse >>547d81cd1dad1b1cdda85937f7b90b4c5fe91d3b

Chunk
Conflicting content 
        public void apply(IDocument document) {
            super.apply(document);
            if (withBody && //module.getVersions().size()>1 && //TODO: put this back in when sure it works
<<<<<<< HEAD
                    getPreferences()
                        .getBoolean(LINKED_MODE_ARGUMENTS)) {
                final LinkedModeModel linkedModeModel = 
                        new LinkedModeModel();
=======
                    CeylonPlugin.getPreferences().getBoolean(LINKED_MODE_ARGUMENTS)) {
                final LinkedModeModel linkedModeModel = new LinkedModeModel();
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                final Point selection = getSelection(document);
                List proposals = 
                        new ArrayList();
Solution content 
        public void apply(IDocument document) {
            super.apply(document);
            if (withBody && //module.getVersions().size()>1 && //TODO: put this back in when sure it works
                    getPreferences()
                        .getBoolean(LINKED_MODE_ARGUMENTS)) {
                final LinkedModeModel linkedModeModel = 
                        new LinkedModeModel();
                final Point selection = getSelection(document);
                List proposals = 
                        new ArrayList();
File
ModuleCompletions.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        
        @Override
        public String getAdditionalProposalInfo() {
<<<<<<< HEAD
            return getDocumentationForModule(name, 
                    JDKUtils.jdk.version, 
=======
            return getAdditionalProposalInfo(null);
        }

        @Override
        public String getAdditionalProposalInfo(IProgressMonitor monitor) {
            return getDocumentationForModule(name, JDKUtils.jdk.version, 
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                    "This module forms part of the Java SDK.",
                    null, null);
        }
Solution content 
        }
        
        @Override
        public String getAdditionalProposalInfo() {
            return getAdditionalProposalInfo(null);
        }

        @Override
        public String getAdditionalProposalInfo(IProgressMonitor monitor) {
            return getDocumentationForModule(name, JDKUtils.jdk.version, 
                    "This module forms part of the Java SDK.",
                    null, null);
File
ModuleCompletions.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
                    final String name = module.getName();
                    if (!name.equals(Module.DEFAULT_MODULE_NAME) && 
                            !moduleAlreadyImported(cpc, name)) {
<<<<<<< HEAD
                        if (getPreferences()
                                .getBoolean(LINKED_MODE_ARGUMENTS)) {
                            result.add(new ModuleProposal(
                                    offset, prefix, len, 
=======
                        if (CeylonPlugin.getPreferences().getBoolean(LINKED_MODE_ARGUMENTS)) {
                            result.add(new ModuleProposal(offset, prefix, len, 
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                                    getModuleString(withBody, name, 
                                            module.getLastVersion()
                                                .getVersion()),
Solution content 
                    final String name = module.getName();
                    if (!name.equals(Module.DEFAULT_MODULE_NAME) && 
                            !moduleAlreadyImported(cpc, name)) {
                        if (getPreferences()
                                .getBoolean(LINKED_MODE_ARGUMENTS)) {
                            result.add(new ModuleProposal(
                                    offset, prefix, len, 
                                    getModuleString(withBody, name, 
                                            module.getLastVersion()
                                                .getVersion()),
File
ModuleCompletions.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
import com.redhat.ceylon.compiler.typechecker.context.TypecheckerUnit;
import com.redhat.ceylon.compiler.typechecker.tree.Tree;
<<<<<<< HEAD
import com.redhat.ceylon.compiler.typechecker.tree.Tree.CompilationUnit;
import com.redhat.ceylon.compiler.typechecker.tree.Tree.ImportModule;
import com.redhat.ceylon.compiler.typechecker.tree.Tree.ImportModuleList;
import com.redhat.ceylon.compiler.typechecker.tree.Tree.ModuleDescriptor;
import com.redhat.ceylon.eclipse.code.modulesearch.ModuleNode;
import com.redhat.ceylon.eclipse.code.modulesearch.ModuleVersionNode;
import com.redhat.ceylon.eclipse.core.builder.CeylonBuilder;
=======
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
import com.redhat.ceylon.eclipse.core.model.ProjectSourceFile;
import com.redhat.ceylon.eclipse.core.typechecker.ProjectPhasedUnit;
import com.redhat.ceylon.model.typechecker.model.Module;
Solution content 
import com.redhat.ceylon.common.Backends;
import com.redhat.ceylon.compiler.typechecker.tree.Tree;
import com.redhat.ceylon.eclipse.code.modulesearch.ModuleNode;
import com.redhat.ceylon.eclipse.code.modulesearch.ModuleVersionNode;
import com.redhat.ceylon.eclipse.core.model.ProjectSourceFile;
import com.redhat.ceylon.eclipse.core.typechecker.ProjectPhasedUnit;
import com.redhat.ceylon.model.typechecker.model.Module;
File
ModuleImportUtil.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
                moduleNames);
    }

<<<<<<< HEAD
    public static void exportModuleImports(
            IFile file, CompilationUnit cu, 
            String moduleName) {
=======
    public static void exportModuleImports(IFile file, 
            Tree.CompilationUnit cu, String moduleName) {
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        TextFileChange textFileChange = 
                new TextFileChange("Export Module Imports", 
                        file);
Solution content 
                moduleNames);
    }

    public static void exportModuleImports(IFile file, 
            Tree.CompilationUnit cu, String moduleName) {
        TextFileChange textFileChange = 
                new TextFileChange("Export Module Imports", 
                        file);
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
        performChange(textFileChange);
    }
    
<<<<<<< HEAD
    public static void removeModuleImports(
            IFile file, CompilationUnit cu, 
            List moduleNames) {
=======
    public static void removeModuleImports(IFile file, 
            Tree.CompilationUnit cu, List moduleNames) {
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        TextFileChange textFileChange = 
                new TextFileChange("Remove Module Imports", 
                        file);
Solution content 
        performChange(textFileChange);
    }
    
    public static void removeModuleImports(IFile file, 
            Tree.CompilationUnit cu, List moduleNames) {
        TextFileChange textFileChange = 
                new TextFileChange("Remove Module Imports", 
                        file);
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
        performChange(textFileChange);
    }
    
<<<<<<< HEAD
    public static void addModuleImport(
            IProject project, Module target, 
            String moduleName, String moduleVersion) {
        ModuleVersionNode versionNode = 
                new ModuleVersionNode(
                        new ModuleNode(moduleName, 
                                Collections.emptyList()), 
                            moduleVersion);
        int offset = 
                addModuleImports(project, target, 
                        singletonMap(moduleName, 
                                versionNode));
        TypecheckerUnit unit = 
                getDescriptorPhasedUnit(project, target)
                    .getUnit();
        gotoLocation(unit, 
=======
    public static void addModuleImport(IProject project, 
            Module target, 
            String moduleName, String moduleVersion) {
        int offset = addModuleImports(project, target, 
                singletonMap(moduleName, moduleVersion));
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
        gotoLocation(unit.getUnit(), 
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                offset + moduleName.length() + 
                        getDefaultIndent().length() + 10, 
                moduleVersion.length());
Solution content 
        performChange(textFileChange);
    }
    
    public static void addModuleImport(
            IProject project, Module target, 
            String moduleName, String moduleVersion) {
        ModuleVersionNode versionNode = 
                new ModuleVersionNode(
                        new ModuleNode(moduleName, 
                                Collections.emptyList()), 
                            moduleVersion);
        int offset = 
                addModuleImports(project, target, 
                        singletonMap(moduleName, 
                                versionNode));
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
        gotoLocation(unit.getUnit(), 
                offset + moduleName.length() + 
                        getDefaultIndent().length() + 10, 
                moduleVersion.length());
File
ModuleImportUtil.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
                moduleVersion.length());
    }
    
<<<<<<< HEAD
    public static void makeModuleImportShared(
            IProject project, Module target, 
            String[] moduleNames) {
=======
    public static void makeModuleImportShared(IProject project, 
            Module target, String[] moduleNames) {
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
        TextFileChange textFileChange =
Solution content 
                moduleVersion.length());
    }
    
    public static void makeModuleImportShared(
            IProject project, Module target, 
            String[] moduleNames) {
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
        TextFileChange textFileChange =
File
ModuleImportUtil.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
        IDocument doc = getDocument(textFileChange);
                unit.getCompilationUnit();
        for (String moduleName: moduleNames) {
<<<<<<< HEAD
            List importModules = 
                    compilationUnit.getModuleDescriptors()
                        .get(0)
                        .getImportModuleList()
=======
            Tree.ModuleDescriptor moduleDescriptor = 
                    compilationUnit.getModuleDescriptors()
                        .get(0);
            List importModules = 
                    moduleDescriptor.getImportModuleList()
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                        .getImportModules();
            for (Tree.ImportModule im: importModules) {
                String importedName = getImportedName(im);
Solution content 
                unit.getCompilationUnit();
        IDocument doc = getDocument(textFileChange);
        for (String moduleName: moduleNames) {
            Tree.ModuleDescriptor moduleDescriptor = 
                    compilationUnit.getModuleDescriptors()
                        .get(0);
            List importModules = 
                    moduleDescriptor.getImportModuleList()
                        .getImportModules();
            for (Tree.ImportModule im: importModules) {
                String importedName = getImportedName(im);
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                        importedName.equals(moduleName)) {
                    if (!removeSharedAnnotation(textFileChange, 
                            doc, im.getAnnotationList())) {
<<<<<<< HEAD
                        textFileChange.addEdit(
                                new InsertEdit(im.getStartIndex(), 
                                        "shared "));
=======
                        textFileChange.addEdit(new InsertEdit(
                                im.getStartIndex(), 
                                "shared "));
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                    }
                }
            }
Solution content 
                        importedName.equals(moduleName)) {
                    if (!removeSharedAnnotation(textFileChange, 
                            doc, im.getAnnotationList())) {
                        textFileChange.addEdit(
                                new InsertEdit(im.getStartIndex(), 
                                        "shared "));
                    }
                }
            }
File
ModuleImportUtil.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        return result;
    }
    
<<<<<<< HEAD
    public static int addModuleImports(
            IProject project, Module target, 
            Map moduleNamesAndVersions) {
=======
    public static int addModuleImports(IProject project, 
            Module target, 
            Map moduleNamesAndVersions) {
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        if (moduleNamesAndVersions.isEmpty()) return 0;
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
Solution content 
        return result;
    }
    
    public static int addModuleImports(
            IProject project, Module target, 
            Map moduleNamesAndVersions) {
        if (moduleNamesAndVersions.isEmpty()) return 0;
        ProjectPhasedUnit unit = 
                getDescriptorPhasedUnit(project, target);
File
ModuleImportUtil.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
                moduleNamesAndVersions);
    }

<<<<<<< HEAD
    public static int addModuleImports(
            IFile file, CompilationUnit cu, IProject project, 
            Map moduleNamesAndVersions) {
=======
    public static int addModuleImports(IFile file, 
            Tree.CompilationUnit cu, 
            Map moduleNamesAndVersions) {
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        TextFileChange textFileChange = 
                new TextFileChange("Add Module Imports", 
                        file);
Solution content 
                moduleNamesAndVersions);
    }

    public static int addModuleImports(IFile file, 
            Tree.CompilationUnit cu, IProject project, 
            Map moduleNamesAndVersions) {
        TextFileChange textFileChange = 
                new TextFileChange("Add Module Imports", 
                        file);
File
ModuleImportUtil.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
                new TextFileChange("Add Module Imports", 
                        file);
        textFileChange.setEdit(new MultiTextEdit());
<<<<<<< HEAD
        for (Map.Entry entry: 
                moduleNamesAndVersions.entrySet()) {
            String nativeBackend;
            String name = entry.getKey();
            String version = entry.getValue().getVersion();
            if (CeylonBuilder.compileToJava(project) &&
                CeylonBuilder.compileToJs(project)) {
                nativeBackend = 
                        entry.getValue().getNativeBackend();
            }
            else {
                nativeBackend = null;
            }
            InsertEdit edit = 
                    createAddEdit(cu, 
                            nativeBackend, name, version, 
=======
        for (Map.Entry entry: 
            moduleNamesAndVersions.entrySet()) {
            InsertEdit edit = 
                    createAddEdit(cu, 
                            entry.getKey(), 
                            entry.getValue(), 
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
                            getDocument(textFileChange));
            if (edit!=null) {
                textFileChange.addEdit(edit);
Solution content 
                new TextFileChange("Add Module Imports", 
                        file);
        textFileChange.setEdit(new MultiTextEdit());
        for (Map.Entry entry: 
                moduleNamesAndVersions.entrySet()) {
            Backends nativeBackend;
            String name = entry.getKey();
            String version = entry.getValue().getVersion();
            /*if (CeylonBuilder.compileToJava(project) &&
                CeylonBuilder.compileToJs(project)) {*/
                nativeBackend = 
                        entry.getValue().getNativeBackend();
            /*}
            else {
                nativeBackend = null;
            }*/
            InsertEdit edit = 
                    createAddEdit(cu, 
                            nativeBackend, name, version, 
                            getDocument(textFileChange));
            if (edit!=null) {
                textFileChange.addEdit(edit);
File
ModuleImportUtil.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
    
    }
    private static InsertEdit createAddEdit(
<<<<<<< HEAD
            CompilationUnit unit, String backend,
            String moduleName, String moduleVersion, 
            IDocument doc) {
        ImportModuleList iml = getImportList(unit);    
=======
            Tree.CompilationUnit unit, 
            String moduleName, String moduleVersion, 
            IDocument doc) {
        Tree.ImportModuleList iml = getImportList(unit);    
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        if (iml==null) return null;
        int offset;
        if (iml.getImportModules().isEmpty()) {
Solution content 
    }
    
    private static InsertEdit createAddEdit(
            Tree.CompilationUnit unit, Backends backend,
            String moduleName, String moduleVersion, 
            IDocument doc) {
        Tree.ImportModuleList iml = getImportList(unit);    
        if (iml==null) return null;
        int offset;
        if (iml.getImportModules().isEmpty()) {
File
ModuleImportUtil.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    public static void appendImportStatement(
<<<<<<< HEAD
            StringBuilder importModule,
            boolean shared, String backend,
=======
            StringBuilder importModule, boolean shared, 
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
            String moduleName, String moduleVersion, 
            String newline) {
        importModule.append(newline)
Solution content 
    }

    public static void appendImportStatement(
            StringBuilder importModule,
            boolean shared, Backends backend,
            String moduleName, String moduleVersion, 
            String newline) {
        importModule.append(newline)
File
ModuleImportUtil.java
Developer's decision
Manual
Kind of conflict
Variable
Chunk
Conflicting content 
    }

    private static DeleteEdit createRemoveEdit(
<<<<<<< HEAD
            CompilationUnit unit, 
            String moduleName) {
        ImportModuleList iml = getImportList(unit);    
=======
            Tree.CompilationUnit unit, String moduleName) {
        Tree.ImportModuleList iml = getImportList(unit);    
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        if (iml==null) return null;
        Tree.ImportModule prev = null;
        for (Tree.ImportModule im: iml.getImportModules()) {
Solution content 
    }

    private static DeleteEdit createRemoveEdit(
            Tree.CompilationUnit unit, String moduleName) {
        Tree.ImportModuleList iml = getImportList(unit);    
        if (iml==null) return null;
        Tree.ImportModule prev = null;
        for (Tree.ImportModule im: iml.getImportModules()) {
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    private static InsertEdit createExportEdit(
<<<<<<< HEAD
            CompilationUnit unit, 
            String moduleName) {
        ImportModuleList iml = getImportList(unit);    
=======
            Tree.CompilationUnit unit, String moduleName) {
        Tree.ImportModuleList iml = getImportList(unit);    
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        if (iml==null) return null;
        for (Tree.ImportModule im: iml.getImportModules()) {
            String ip = getImportedName(im);
Solution content 
    }

    private static InsertEdit createExportEdit(
            Tree.CompilationUnit unit, String moduleName) {
        Tree.ImportModuleList iml = getImportList(unit);    
        if (iml==null) return null;
        for (Tree.ImportModule im: iml.getImportModules()) {
            String ip = getImportedName(im);
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        return null;
    }

<<<<<<< HEAD
    private static ImportModuleList getImportList(
            CompilationUnit unit) {
        List moduleDescriptors = 
                unit.getModuleDescriptors();
        if (!moduleDescriptors.isEmpty()) {
            return moduleDescriptors.get(0)
                    .getImportModuleList();
=======
    private static Tree.ImportModuleList getImportList(
            Tree.CompilationUnit unit) {
        List moduleDescriptors = 
                unit.getModuleDescriptors();
        if (!moduleDescriptors.isEmpty()) {
            Tree.ModuleDescriptor moduleDescriptor = 
                    moduleDescriptors.get(0);
            return moduleDescriptor.getImportModuleList();
>>>>>>> 0d0745b157f29ce58b8f530a12b39071a830069d
        }
        else {
            return null;
Solution content 
        return null;
    }

    private static Tree.ImportModuleList getImportList(
            Tree.CompilationUnit unit) {
        List moduleDescriptors = 
                unit.getModuleDescriptors();
        if (!moduleDescriptors.isEmpty()) {
            Tree.ModuleDescriptor moduleDescriptor = 
                    moduleDescriptors.get(0);
            return moduleDescriptor.getImportModuleList();
        }
        else {
            return null;
File
ModuleImportUtil.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Variable