Projects >> dawn-common >>f2008caddeccebf4e5f8192464fbcf97c7c7af21

Chunk
Conflicting content 
			updateLeft(windowRegion,broi);
			
		} catch (Exception e) {
<<<<<<< HEAD
			// FIXME Please use slf4j logger
=======
>>>>>>> f766b9327940769fd8b977c84d57979aa3063a1e
			e.printStackTrace();
		}
Solution content 
			updateLeft(windowRegion,broi);
			
		} catch (Exception e) {
			// FIXME Please use slf4j logger
			e.printStackTrace();
		}
File
HyperWindow.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
					}
				}
			}
<<<<<<< HEAD
				
=======
			
			@Override
			public void regionCreated(RegionEvent evt) {
			}
			
			@Override
			public void regionCancelled(RegionEvent evt) {
			}
			
>>>>>>> f766b9327940769fd8b977c84d57979aa3063a1e
			@Override
			public void regionAdded(RegionEvent evt) {
				if (evt.getRegion() != null) {
Solution content 
					}
				}
			}
			
			@Override
			public void regionAdded(RegionEvent evt) {
				if (evt.getRegion() != null) {
File
HyperWindow.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
=======
	}
	
	private IROIListener getROIListenerToRight() {
<<<<<<< HEAD
		return new IROIListener.Stub() {
		return new IROIListener() {
			
			@Override
			public void roiSelected(ROIEvent evt) {
			}
>>>>>>> f766b9327940769fd8b977c84d57979aa3063a1e
			
			@Override
			public void roiDragged(ROIEvent evt) {
Solution content 
	}
	
	private IROIListener getROIListenerToRight() {

		return new IROIListener.Stub() {
						
			@Override
			public void roiDragged(ROIEvent evt) {
File
HyperWindow.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement