Projects >> ccw >>511dfe10e19edb15b2378e90a5b96822f408952e

Chunk
Conflicting content 
import clojuredev.debug.ClojureClient;
import clojuredev.editors.antlrbased.AntlrBasedClojureEditor;
import clojuredev.launching.LaunchUtils;
<<<<<<< HEAD
import clojuredev.lexers.ClojureLexer;
=======
import clojuredev.util.DisplayUtil;
>>>>>>> 8d2b31d479a2111dd650ce5cb0b0bc47438b2814
import clojuredev.utils.editors.antlrbased.IScanContext;

/**
Solution content 
import clojuredev.debug.ClojureClient;
import clojuredev.editors.antlrbased.AntlrBasedClojureEditor;
import clojuredev.launching.LaunchUtils;
import clojuredev.lexers.ClojureLexer;
import clojuredev.util.DisplayUtil;
import clojuredev.utils.editors.antlrbased.IScanContext;

/**
File
ClojuredevPlugin.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    
    private synchronized void createColorRegistry() {
    	if (colorRegistry == null) {
<<<<<<< HEAD
    		colorRegistry = new ColorRegistry(getWorkbench().getDisplay());
=======
    		DisplayUtil.syncExec(new Runnable() {
				public void run() {
		    		colorRegistry = new ColorRegistry(getWorkbench().getDisplay());
		    		AntlrBasedClojureEditor.registerEditorColors(colorRegistry);
				}});
>>>>>>> 8d2b31d479a2111dd650ce5cb0b0bc47438b2814
    	}
    }
Solution content 
    
    private void createColorRegistry() {
    	if (colorRegistry == null) {
    		DisplayUtil.syncExec(new Runnable() {
				public void run() {
		    		colorRegistry = new ColorRegistry(getWorkbench().getDisplay());
				}});
    	}
    }
File
ClojuredevPlugin.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation