Projects >> bndtools >>8f113c6f5d090ff539f3c342591a575b976fd23d

Chunk
Conflicting content
        if (fileList.isEmpty())
            return;

<<<<<<< HEAD
        File[] files = fileList.toArray(new File[fileList.size()]);
        if (!Arrays.equals(files, selectedFiles)) {
            this.selectedFiles = files;

            if (getSite().getPage().isPartVisible(this)) {
                executeAnalysis();
            } else {
                outOfDate = true;
            }
        }
    }

    private Collection getFilesFromSelection(ISelection selection) {
        if(selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
            return Collections.emptyList();
        }

=======
        Collection fileList = getFilesFromSelection(selection);

        // Filter out non-bundle files/dirs
        for (Iterator iter = fileList.iterator(); iter.hasNext(); ) {
            File file = iter.next();
            if (file.isDirectory()) {
                File manifestFile = new File(file, "META-INF/MANIFEST.MF");
                if (!manifestFile.isFile())
                    iter.remove();
            } else {
                String fileName = file.getName().toLowerCase();
                if (!fileName.endsWith(".bnd") && !fileName.endsWith(".jar"))
                    iter.remove();
            }
        }

        if (fileList.isEmpty())
            return;

        File[] files = fileList.toArray(new File[fileList.size()]);
        if (!Arrays.equals(files, selectedFiles)) {
            this.selectedFiles = files;
            executeAnalysis();
        }
    }

    private Collection getFilesFromSelection(ISelection selection) {
        if(selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
            return Collections.emptyList();
        }

>>>>>>> bd65c61548fb0eafd7101c9f480771e3faf0a6ab
        IStructuredSelection structSel = (IStructuredSelection) selection;
        Collection result = new ArrayList();
        Iterator iter = structSel.iterator();
Solution content
        if (fileList.isEmpty())
            return;

        File[] files = fileList.toArray(new File[fileList.size()]);
        if (!Arrays.equals(files, selectedFiles)) {
            this.selectedFiles = files;

            if (getSite().getPage().isPartVisible(this)) {
                executeAnalysis();
            } else {
                outOfDate = true;
            }
        }
    }

    private Collection getFilesFromSelection(ISelection selection) {
        if(selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
            return Collections.emptyList();
        }

        IStructuredSelection structSel = (IStructuredSelection) selection;
        Collection result = new ArrayList();
        Iterator iter = structSel.iterator();
File
ImportsExportsView.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
If statement
Method invocation
Method signature
Variable