diff options
| author | Andre Weinand | 2001-09-21 13:48:37 +0000 |
|---|---|---|
| committer | Andre Weinand | 2001-09-21 13:48:37 +0000 |
| commit | f4279abb21643d188952e1b0555e41489d677031 (patch) | |
| tree | 4dcb8faef4c1f74eab8e4e1fe70e196c20b2cc2f /bundles/org.eclipse.compare/compare/org/eclipse/compare | |
| parent | 23b4aba1fe6436b0ce26184a9546ead58d52230b (diff) | |
| download | eclipse.platform.team-f4279abb21643d188952e1b0555e41489d677031.tar.gz eclipse.platform.team-f4279abb21643d188952e1b0555e41489d677031.tar.xz eclipse.platform.team-f4279abb21643d188952e1b0555e41489d677031.zip | |
various fixes for 0.201
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare')
3 files changed, 7 insertions, 6 deletions
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 824a6f783..8e09aa12e 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 @@ -1439,7 +1439,7 @@ public class TextMergeViewer extends ContentMergeViewer { boolean leftToRight= false;
boolean rightToLeft= false;
- if (fCurrentDiff != null) {
+ if (fCurrentDiff != null && isThreeWay() && !fIgnoreAncestor) {
IMergeViewerContentProvider cp= getMergeContentProvider();
if (cp != null) {
rightToLeft= cp.isLeftEditable(getInput());
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java index a4dfcfccb..696e4bfe8 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java @@ -91,11 +91,12 @@ public class CompareNavigator { }
public static void handleNavigationKeys(KeyEvent e) {
- if (e.character == ('D'-0x40) ) { // Control-D
+ if ((e.stateMask & SWT.ALT) != 0 &&
+ e.character == ('N'-0x40) || e.character == ('P'-0x40)) { // Control-N/P
if (e.widget instanceof Control) {
CompareNavigator nav= findNavigator((Control)e.widget);
if (nav != null)
- nav.selectChange((e.stateMask & SWT.SHIFT) == 0);
+ nav.selectChange(e.character == ('N'-0x40));
}
}
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index e0997bb18..c87d51cab 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -676,8 +676,8 @@ public final class CompareUIPlugin extends AbstractUIPlugin { /**
* Guesses the file type of the given input.
- * Returns ITypedElement.TEXT_TYPE if the first 1000 bytes contain only values in the range 0-127.
- * Returns ITypedElement.UNKNOWN_TYPE if a single byte is out of this range.
+ * Returns ITypedElement.TEXT_TYPE if no line is longer than 1000 bytes.
+ * Returns ITypedElement.UNKNOWN_TYPE if a line is longer that 1000 bytes.
* Returns <code>null</code> if the input isn't an <code>IStreamContentAccessor</code>.
*/
private static String guessType(ITypedElement input) {
@@ -693,7 +693,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { int c= is.read();
if (c == -1) // EOF
break;
- if (c == '\n')
+ if (c == '\n' || c == '\r') // reset line length
lineLength= 0;
else
lineLength++;
|