Commit bf2d3139 authored by Michael Schwarz's avatar Michael Schwarz

Prevent from applying fix of connected conflict if one connected is not

resolved
parent 5161af32
......@@ -1155,6 +1155,20 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
}
private void applyConnectedResolution(){
for(ConflictPanel p: conflictPanels){
if(p.partOfCurrentConnected){
if(p.resolutionOptions.getSelectionIndex() == 0){
Shell shell = new Shell(Display.getCurrent());
MessageBox box = new MessageBox(shell,SWT.ICON_WARNING | SWT.OK);
box.setText("Information");
box.setMessage("Please choose a way to resolve all conflicts that are affected. Then click this button again.");
box.open();
return;
}
}
}
try {
IDocument document = editor.getDocument();
ParserResult r = Model.getInstanceForDocument(document).getAstModel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment