Projects >> frostwire-android >>4f00cbb12c6ba4bd001cae80e166235594fb3070

Chunk
Conflicting content 
    private List currentSearchTokens;
    private boolean searchFinished;

<<<<<<< HEAD
=======
    private static LocalSearchEngine instance;

    private final HashSet openedSearchResults;

>>>>>>> 7fffa4c9cc6b8e81719c339544fa9b22891f2a93
    public synchronized static void create() {
        if (instance != null) {
            return;
Solution content 
    private List currentSearchTokens;
    private boolean searchFinished;

    public synchronized static void create() {
        if (instance != null) {
            return;
File
LocalSearchEngine.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        return CrawlPagedWebSearchPerformer.getCacheSize();
    }

<<<<<<< HEAD
    public void markOpened(SearchResult sr) {
        opened.add(sr.uid());
    }

    public boolean hasBeenOpened(SearchResult sr) {
        if (sr == null) {
            return false;
        }
        return opened.contains(sr.uid());
=======
    public boolean hasBeenOpened(SearchResult sr) {
        return openedSearchResults.contains(sr.uid());
    }

    public void markOpened(SearchResult sr) {
        openedSearchResults.add(sr.uid());
>>>>>>> 7fffa4c9cc6b8e81719c339544fa9b22891f2a93
    }

    private void onResults(long token, List results) {
Solution content 
        return CrawlPagedWebSearchPerformer.getCacheSize();
    }

    public void markOpened(SearchResult sr) {
        opened.add(sr.uid());
    }

    public boolean hasBeenOpened(SearchResult sr) {
        if (sr == null) {
            return false;
        }
        return opened.contains(sr.uid());
    }

    private void onResults(long token, List results) {
File
LocalSearchEngine.java
Developer's decision
Version 1
Kind of conflict
If statement
Method declaration
Method invocation
Method signature
Return statement