Gray background for unrelated conflicts, resolution button removed for

RR

CupPlugin/src/de/tum/in/www2/cupplugin/Colors.java

@@ -21,7 +21,6 @@ public class Colors {
 
 	
 	public static final RGB stateGreen = new RGB(146, 203, 135);
-
 	public static final RGB stateBlue = new RGB(196, 232, 230);
 	public static final RGB stateRed = new RGB(232, 196, 196);
 	public static final RGB stateYellow = new RGB(218, 214, 155);
@@ -33,6 +32,6 @@ public class Colors {
 	public static final RGB conflictFgYellow = new RGB(91, 71, 17);
 	public static final RGB conflictBgRed = new RGB(255, 198, 198);
 	public static final RGB conflictFgRed = new RGB(255, 0, 0);
-
-
+	public static final RGB conflictBgGray = new RGB(232, 232, 232);
+	public static final RGB conflictFgGray = new RGB(114, 114, 114);
 }

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

@@ -135,8 +135,8 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
 		private Color backgroundColorShiftReduceAffected = new Color(Display.getCurrent(), Colors.conflictBgRed);
 		private Color foregroundColorShiftReduceAffected = new Color(Display.getCurrent(), Colors.conflictFgRed);		
 		
-		private Color backgroundColorShiftReduceUnrelated = new Color(Display.getCurrent(), Colors.conflictBgYellow);
-		private Color foregroundColorShiftReduceUnrelated = new Color(Display.getCurrent(), Colors.conflictFgYellow);
+		private Color backgroundColorShiftReduceUnrelated = new Color(Display.getCurrent(), Colors.conflictBgGray);
+		private Color foregroundColorShiftReduceUnrelated = new Color(Display.getCurrent(), Colors.conflictFgGray);
 				
 		GridData gridData;
 		
@@ -286,6 +286,9 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
 				changeColors(backgroundColorReduceReduce, foregroundColorReduceReduce);
 				conflictTypeLabel.setText("Reduce-Reduce conflict");
 
+				resolutionOptions.setVisible(false);
+				resolutionButton.setVisible(false);
+				
 				ProductionRight conflict1Ast = rrc.getConflictItem1()
 						.the_production().getAstNode();
 
@@ -342,8 +345,12 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
 				
 				ShiftReduceConflict src = (ShiftReduceConflict) conflict;
 				changeColors(backgroundColorShiftReduce, foregroundColorShiftReduce);
+				
+				resolutionOptions.setVisible(true);
+				resolutionButton.setVisible(true);
+				
 				conflictTypeLabel.setText("Shift-Reduce conflict");
-
+				
 				symbolLabel.setText("Under symbol: " + src.getTerminal().name());
 				
 				ProductionRight conflict1Ast = src.getConflictItem1()