@Nullable
private GutterIconRenderer createApplyRenderer(@NotNull final Side side) {
return createIconRenderer(
side,
"Accept",
DiffUtil.getArrowIcon(side),
new Runnable() {
@Override
public void run() {
myViewer.replaceChange(SimpleDiffChange.this, side);
}
});
}
@Nullable
private GutterIconRenderer createApplyRenderer(@NotNull final Side side, final boolean modifier) {
if (isResolved(side)) return null;
Icon icon =
isOnesideAppliedConflict() ? DiffUtil.getArrowDownIcon(side) : DiffUtil.getArrowIcon(side);
return createIconRenderer(
DiffBundle.message("merge.dialog.apply.change.action.name"),
icon,
isConflict(),
new Runnable() {
@Override
public void run() {
myViewer.executeMergeCommand(
"Accept change",
Collections.singletonList(TextMergeChange.this),
new Runnable() {
@Override
public void run() {
myViewer.replaceChange(TextMergeChange.this, side, modifier);
}
});
}
});
}
