Projects information

Chunk

Conflicting content
@Override public void rehistogram() { <<<<<<< HEAD imageServiceBean.setMax(null); // I think... ======= imageServiceBean.setMax(null); >>>>>>> 9076297b70d51a4cacd55b934a623d6d6082fb17 imageServiceBean.setMin(null); createScaledImage(ImageScaleType.REHISTOGRAM, null); // Max and min changed in all likely-hood

Conflicting content

	@Override
	public void rehistogram() {
<<<<<<< HEAD
		imageServiceBean.setMax(null); // I think...
=======
		imageServiceBean.setMax(null);
>>>>>>> 9076297b70d51a4cacd55b934a623d6d6082fb17
		imageServiceBean.setMin(null);
		createScaledImage(ImageScaleType.REHISTOGRAM, null);
		// Max and min changed in all likely-hood

Solution content
@Override public void rehistogram() { imageServiceBean.setMax(null); imageServiceBean.setMin(null); createScaledImage(ImageScaleType.REHISTOGRAM, null); // Max and min changed in all likely-hood

File
ImageTrace.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content
updateHistogramToolElements(null, false); } <<<<<<< HEAD ======= @Override public void maxCutChanged(PaletteEvent evt) { // TODO Auto-generated method stub } @Override public void minCutChanged(PaletteEvent evt) { // TODO Auto-generated method stub } @Override public void nanBoundsChanged(PaletteEvent evt) { // TODO Auto-generated method stub } >>>>>>> 9076297b70d51a4cacd55b934a623d6d6082fb17 };

Conflicting content

				updateHistogramToolElements(null, false);
			}

<<<<<<< HEAD
=======
			@Override
			public void maxCutChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}

			@Override
			public void minCutChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}

			@Override
			public void nanBoundsChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}
			
>>>>>>> 9076297b70d51a4cacd55b934a623d6d6082fb17
		};

Solution content
updateHistogramToolElements(null, false); } @Override public void maxCutChanged(PaletteEvent evt) { // TODO Auto-generated method stub } @Override public void minCutChanged(PaletteEvent evt) { // TODO Auto-generated method stub } @Override public void nanBoundsChanged(PaletteEvent evt) { // TODO Auto-generated method stub } };

Solution content

				updateHistogramToolElements(null, false);
			}

			@Override
			public void maxCutChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}

			@Override
			public void minCutChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}

			@Override
			public void nanBoundsChanged(PaletteEvent evt) {
				// TODO Auto-generated method stub
				
			}
			
		};

File
HistogramToolPage.java

Developer's decision
Version 2

Kind of conflict
Annotation
Method declaration

Projects >> dawn-ui >>e8058a6a510e49ebf8482018507a815d3ca52423