Projects information

Chunk

Conflicting content
public VisPanel M; public DataStructure D; public InputField I; <<<<<<< HEAD IButton next, clear, random, snapshot; ICheckBox pause; ChLabel stats; JButton zoomIn, zoomOut, resetView; int snap=0; ======= public IButton previous, next, clear, random, save; ICheckBox pause; ChLabel stats; JButton zoomIn, zoomOut, resetView; private Thread scenarioTraverser; >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 abstract public void actionButtons(JPanel P);

Conflicting content

	public VisPanel M;
	public DataStructure D;
	public InputField I;
<<<<<<< HEAD
	IButton next, clear, random, snapshot;
	ICheckBox pause;
	ChLabel stats;
	JButton zoomIn, zoomOut, resetView;
	int snap=0;
=======
	public IButton previous, next, clear, random, save;
	ICheckBox pause;
	ChLabel stats;
	JButton zoomIn, zoomOut, resetView;
	private Thread scenarioTraverser;
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9

	abstract public void actionButtons(JPanel P);

Solution content
public VisPanel M; public DataStructure D; public InputField I; public IButton previous, next, clear, random, save, snapshot; ICheckBox pause; ChLabel stats; JButton zoomIn, zoomOut, resetView; private Thread scenarioTraverser; int snap; abstract public void actionButtons(JPanel P);

Solution content

	public VisPanel M;
	public DataStructure D;
	public InputField I;
	public IButton previous, next, clear, random, save, snapshot;
	ICheckBox pause;
	ChLabel stats;
	JButton zoomIn, zoomOut, resetView;
	private Thread scenarioTraverser;
	int snap;

	abstract public void actionButtons(JPanel P);

File
Buttons.java

Developer's decision
Manual

Kind of conflict
Attribute

Chunk

Conflicting content
initPause(); initClear(); initRandom(); <<<<<<< HEAD initSnapshot(); ======= // initSave(); >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 initZoom(); second.setLayout(new FlowLayout()); second.add(pause);

Conflicting content

		initPause();
		initClear();
		initRandom();
<<<<<<< HEAD
		initSnapshot();
=======
		// initSave();
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9
		initZoom();
		second.setLayout(new FlowLayout());
		second.add(pause);

Solution content
initPause(); initClear(); initRandom(); initSnapshot(); // initSave(); initZoom(); second.setLayout(new FlowLayout()); second.add(pause);

File
Buttons.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content
second.add(pause); second.add(clear); second.add(random); <<<<<<< HEAD second.add(snapshot); ======= // second.add(save); >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 // second.add(zoomLabel); // second.add(zoomIn); // second.add(zoomOut);

Conflicting content

		second.add(pause);
		second.add(clear);
		second.add(random);
<<<<<<< HEAD
		second.add(snapshot);
=======
		// second.add(save);
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9
		// second.add(zoomLabel);
		// second.add(zoomIn);
		// second.add(zoomOut);

Solution content
second.add(pause); second.add(clear); second.add(random); second.add(snapshot); // second.add(save); // second.add(zoomLabel); // second.add(zoomIn); // second.add(zoomOut);

File
Buttons.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content
random.addActionListener(this); } <<<<<<< HEAD public void initSnapshot() { snapshot = new IButton(M.S.L, "button-snapshot"); snapshot.setMnemonic(KeyEvent.VK_S); snapshot.addActionListener(this); ======= public void initSave() { save = new IButton(M.S.L, "button-save"); save.setMnemonic(KeyEvent.VK_S); save.setEnabled(D.scenario.isEnabled()); save.addActionListener(this); >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 } private JButton createButton(String alt, String path) {

Conflicting content

		random.addActionListener(this);
	}

<<<<<<< HEAD
	public void initSnapshot() {
		snapshot = new IButton(M.S.L, "button-snapshot");
		snapshot.setMnemonic(KeyEvent.VK_S);
		snapshot.addActionListener(this);
=======
	public void initSave() {
		save = new IButton(M.S.L, "button-save");
		save.setMnemonic(KeyEvent.VK_S);
		save.setEnabled(D.scenario.isEnabled());
		save.addActionListener(this);
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9
	}

	private JButton createButton(String alt, String path) {

Solution content
random.addActionListener(this); } public void initSnapshot() { snapshot = new IButton(M.S.L, "button-snapshot"); snapshot.setMnemonic(KeyEvent.VK_S); snapshot.addActionListener(this); } public void initSave() { save = new IButton(M.S.L, "button-save"); save.setMnemonic(KeyEvent.VK_S); save.setEnabled(D.scenario.isEnabled()); save.addActionListener(this); } private JButton createButton(String alt, String path) {

Solution content

		random.addActionListener(this);
	}

	public void initSnapshot() {
		snapshot = new IButton(M.S.L, "button-snapshot");
		snapshot.setMnemonic(KeyEvent.VK_S);
		snapshot.addActionListener(this);
	}
	
	public void initSave() {
		save = new IButton(M.S.L, "button-save");
		save.setMnemonic(KeyEvent.VK_S);
		save.setEnabled(D.scenario.isEnabled());
		save.addActionListener(this);
	}

	private JButton createButton(String alt, String path) {

File
Buttons.java

Developer's decision
Concatenation

Kind of conflict
Attribute
Method invocation
Method signature

Chunk

Conflicting content
if (state == Node.INVISIBLE \|\| key == NULL) { return; } <<<<<<< HEAD bgColor(red ? Color.red : Color.black); fgColor(red ? Color.black : Color.white); if (v.output) System.out.println(" RBNode("+id+(red?",True,":",False,")+key+","+x+"+"+y+"*1j)"); else super.draw(v); ======= setColor(red ? NodeColor.RED : NodeColor.BLACK); super.draw(v); >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 } public void drawBigNodes(View v) {

Conflicting content

		if (state == Node.INVISIBLE || key == NULL) {
			return;
		}
<<<<<<< HEAD
		bgColor(red ? Color.red : Color.black);
		fgColor(red ? Color.black : Color.white);
		if (v.output) System.out.println("  RBNode("+id+(red?",True,":",False,")+key+","+x+"+"+y+"*1j)");
		else super.draw(v);
=======
		setColor(red ? NodeColor.RED : NodeColor.BLACK);
		super.draw(v);
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9
	}

	public void drawBigNodes(View v) {

Solution content
if (state == Node.INVISIBLE \|\| key == NULL) { return; } setColor(red ? NodeColor.RED : NodeColor.BLACK); if (v.output) System.out.println(" RBNode("+id+(red?",True,":",False,")+key+","+x+"+"+y+"*1j)"); else super.draw(v); } public void drawBigNodes(View v) {

Solution content

		if (state == Node.INVISIBLE || key == NULL) {
			return;
		}
		setColor(red ? NodeColor.RED : NodeColor.BLACK);
		if (v.output) System.out.println("  RBNode("+id+(red?",True,":",False,")+key+","+x+"+"+y+"*1j)");
		else super.draw(v);
	}

	public void drawBigNodes(View v) {

File
RBNode.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
public void run() { if (T.root == null) { v.goToRoot(); <<<<<<< HEAD setText("empty"); ======= addStep("bstfindempty"); >>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9 mysuspend(); v.goDown(); v.setColor(NodeColor.NOTFOUND);

Conflicting content

	public void run() {
		if (T.root == null) {
			v.goToRoot();
<<<<<<< HEAD
			setText("empty");
=======
			addStep("bstfindempty");
>>>>>>> 095788beb58ee3b378b6d5e66bfe2afae15b85d9
			mysuspend();
			v.goDown();
			v.setColor(NodeColor.NOTFOUND);

Solution content
public void run() { if (T.root == null) { v.goToRoot(); addStep("bstfindempty"); mysuspend(); v.goDown(); v.setColor(NodeColor.NOTFOUND);

File
SplayFind.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Projects >> alg-vis >>8ce1030d1bd34cb7ec65f1dfbd63f873cba01fff