Skip to content

Show comparisons of several files in the unified diff #2980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Show comparisons of several files in the unified diff #2980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 3 additions & 50 deletions ...s/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleAdapter;
Expand Down Expand Up @@ -5069,57 +5068,11 @@ private void endOfDocumentReached(boolean down) {
}

private void handleEndOfDocumentReached(Shell shell, boolean next) {
IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore();
String value = store.getString(ICompareUIConstants.PREF_NAVIGATION_END_ACTION);
if (!value.equals(ICompareUIConstants.PREF_VALUE_PROMPT)) {
performEndOfDocumentAction(shell, store, ICompareUIConstants.PREF_NAVIGATION_END_ACTION, next);
} else {
shell.getDisplay().beep();
String loopMessage;
String nextMessage;
String message;
String title;
if (next) {
title = CompareMessages.TextMergeViewer_0;
message = CompareMessages.TextMergeViewer_1;
loopMessage = CompareMessages.TextMergeViewer_2;
nextMessage = CompareMessages.TextMergeViewer_3;
} else {
title = CompareMessages.TextMergeViewer_4;
message = CompareMessages.TextMergeViewer_5;
loopMessage = CompareMessages.TextMergeViewer_6;
nextMessage = CompareMessages.TextMergeViewer_7;
}
String[] localLoopOption = new String[] { loopMessage, ICompareUIConstants.PREF_VALUE_LOOP };
String[] nextElementOption = new String[] { nextMessage, ICompareUIConstants.PREF_VALUE_NEXT};
String[] doNothingOption = new String[] { CompareMessages.TextMergeViewer_17, ICompareUIConstants.PREF_VALUE_DO_NOTHING};
NavigationEndDialog dialog = new NavigationEndDialog(shell,
title,
null,
message,
new String[][] {
localLoopOption,
nextElementOption,
doNothingOption
});
int result = dialog.open();
if (result == Window.OK) {
performEndOfDocumentAction(shell, store, ICompareUIConstants.PREF_NAVIGATION_END_ACTION_LOCAL, next);
if (dialog.getToggleState()) {
String oldValue = store.getString(ICompareUIConstants.PREF_NAVIGATION_END_ACTION);
store.putValue(ICompareUIConstants.PREF_NAVIGATION_END_ACTION, store.getString(ICompareUIConstants.PREF_NAVIGATION_END_ACTION_LOCAL));
store.firePropertyChangeEvent(ICompareUIConstants.PREF_NAVIGATION_END_ACTION, oldValue, store.getString(ICompareUIConstants.PREF_NAVIGATION_END_ACTION_LOCAL));
}
}
}
}

private void performEndOfDocumentAction(Shell shell, IPreferenceStore store, String key, boolean next) {
String value = store.getString(key);
if (value.equals(ICompareUIConstants.PREF_VALUE_DO_NOTHING)) {
String action = NavigationEndDialog.chooseEndAction(shell, next);
if (action == null || action.equals(ICompareUIConstants.PREF_VALUE_DO_NOTHING)) {
return;
}
if (value.equals(ICompareUIConstants.PREF_VALUE_NEXT)) {
if (action.equals(ICompareUIConstants.PREF_VALUE_NEXT)) {
ICompareNavigator navigator = getCompareConfiguration()
.getContainer().getNavigator();
if (hasNextElement(next)) {
Expand Down
2 changes: 2 additions & 0 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ private CompareMessages() {
public static String UnifiedDiff_showUnchangedLines;
public static String UnifiedDiff_hideUnchangedLine;
public static String UnifiedDiff_hideUnchangedLines;
public static String UnifiedDiff_fileOf;
public static String UnifiedDiff_selectFile_tooltip;

static {
NLS.initializeMessages(BUNDLE_NAME, CompareMessages.class);
Expand Down
2 changes: 2 additions & 0 deletions ...ndles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,5 @@ UnifiedDiff_showUnchangedLine=Show 1 unchanged line
UnifiedDiff_showUnchangedLines=Show {0} unchanged lines
UnifiedDiff_hideUnchangedLine=Hide 1 unchanged line
UnifiedDiff_hideUnchangedLines=Hide {0} unchanged lines
UnifiedDiff_fileOf=File {0} of {1}
UnifiedDiff_selectFile_tooltip=Select the Changed File to Show
Loading
Loading