Bug 336079 - "Show Line Numbers" menu in compare editor should be
checked initially
Change-Id: I3a4171702b82bedee70349a01a017108a1d7a70e
Signed-off-by: Tobias Melcher <tobias.melcher@sap.com>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 32c9354..c10b085 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1622,6 +1622,16 @@
updateFont();
}
+ private static class LineNumberRulerToggleAction extends TextEditorPropertyAction {
+ public LineNumberRulerToggleAction(String label, MergeSourceViewer[] viewers, String preferenceKey) {
+ super(label, viewers, preferenceKey);
+ }
+
+ protected boolean toggleState(boolean checked) {
+ return true;
+ }
+ }
+
private ChainedPreferenceStore createChainedPreferenceStore() {
ArrayList stores= new ArrayList(2);
stores.add(getCompareConfiguration().getPreferenceStore());
@@ -3872,9 +3882,9 @@
new boolean[] {needsLeftPainter, needsRightPainter, needsAncestorPainter });
fHandlerService.registerAction(showWhitespaceAction, ITextEditorActionDefinitionIds.SHOW_WHITESPACE_CHARACTERS);
- toggleLineNumbersAction = new TextEditorPropertyAction(CompareMessages.TextMergeViewer_16, new MergeSourceViewer[] {
- fLeft, fRight, fAncestor
- }, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER);
+ toggleLineNumbersAction = new LineNumberRulerToggleAction(CompareMessages.TextMergeViewer_16,
+ new MergeSourceViewer[] { fLeft, fRight, fAncestor },
+ AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER);
fHandlerService.registerAction(toggleLineNumbersAction, ITextEditorActionDefinitionIds.LINENUMBER_TOGGLE);
}
