RR resolution

CupPlugin/src/de/tum/in/www2/cupplugin/views/ConflictPanel.java

@@ -69,9 +69,11 @@ class ConflictPanel extends Composite {
 	private Color backgroundColorReduceReduce = new Color(Display.getCurrent(), Colors.conflictBgBlue);
 	private Color foregroundColorReduceReduce = new Color(Display.getCurrent(), Colors.conflictFgBlue);	
 	private Color backgroundColorShiftReduce = new Color(Display.getCurrent(), Colors.conflictBgYellow);
-	private Color foregroundColorShiftReduce = new Color(Display.getCurrent(), Colors.conflictFgYellow);	
+	private Color foregroundColorShiftReduce = new Color(Display.getCurrent(), Colors.conflictFgYellow);
+	
 	private Color backgroundColorAffected = new Color(Display.getCurrent(), Colors.conflictBgRed);
-	private Color foregroundColorAffected = new Color(Display.getCurrent(), Colors.conflictFgRed);			
+	private Color foregroundColorAffected = new Color(Display.getCurrent(), Colors.conflictFgRed);	
+	
 	private Color backgroundColorUnrelated = new Color(Display.getCurrent(), Colors.conflictBgGray);
 	private Color foregroundColorUnrelated = new Color(Display.getCurrent(), Colors.conflictFgGray);
 	
@@ -779,7 +781,7 @@ class ConflictPanel extends Composite {
 			}
 		}
 		
-		if(resolutionOptions.getSelectionIndex() == 2){ // Reduce
+		if(resolutionOptions.getSelectionIndex() == 2){ // Reduce with 2
 			try {
 				cupConflictsView.setOrder(item2, item1);
 			} catch (OrderCyclicException e1) {

CupPlugin/src/de/tum/in/www2/cupplugin/views/CupConflictsView.java

@@ -560,7 +560,25 @@ public class CupConflictsView extends FailableView
 		}
 	}
 	
-	private void applyConnectedResolutionRR(){
+	private void applyConnectedResolutionRR() {
+		try {
+			ReordersToDo rtd = (ReordersToDo) currentResolution;
+			List<lr_item_core> order = rtd.getItemsOrdered();
+			
+			ReduceReduceReorder rrr = new ReduceReduceReorder(editor.getDocument(),isThresholdPresent());
+			for(lr_item_core item : order){
+				rrr.moveItemToVeryEnd(item);
+			}
+			
+			rrr.apply();
+			
+		} catch (OrderCyclicException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (BadLocationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		
 	}