Projects >> dawn-ui >>e8b6aa565dc30d281e5c9d0e680dd093c71c0fe5

Chunk
Conflicting content
		if (validRegions!=null) for (IRegion region : regions) {
			if (region == null)             continue;
			if (!isSupportedRegion(region)) continue;
		createMaskIfNeeded();
		monitor.worked(1);
		
<<<<<<< HEAD
		// Remove invalid regions first to make processing faster.
		final List validRegions = regions!=null?new ArrayList(regions.size()):null;
			if (region.getUserObject()!=MaskRegionType.REGION_FROM_MASKING)     continue;
			validRegions.add(region);
		}
		

 		if (minNumber!=null || maxNumber!=null) {
=======
        // Slightly wrong AbstractDataset loop, but it is faster...
		if (minNumber!=null || maxNumber!=null) {
			final IndexIterator ita = imageDataset.getIterator();
>>>>>>> c9f0b4599fab0b0c7277ba4b984f4b7b05eae273
			final int           as  = imageDataset.getElementsPerItem();
			if (as!=1) throw new RuntimeException("Cannot deal with mulitple elements in mask processing!");
			
Solution content
		createMaskIfNeeded();
		monitor.worked(1);
	
 		if (minNumber!=null || maxNumber!=null) {
        // Slightly wrong AbstractDataset loop, but it is faster...
		if (minNumber!=null || maxNumber!=null) {
			final IndexIterator ita = imageDataset.getIterator();
			final int           as  = imageDataset.getElementsPerItem();
			if (as!=1) throw new RuntimeException("Cannot deal with mulitple elements in mask processing!");
			
File
MaskObject.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
Method invocation
Variable