From ec2232ae5176d5f89196820da120d372f87bdf7f Mon Sep 17 00:00:00 2001
From: Andre Weinand
Date: Fri, 17 May 2002 09:27:24 +0000
Subject: #14624
---
.../org.eclipse.compare/buildnotes_compare.html | 1 +
.../contentmergeviewer/TextMergeViewer.java | 43 ++++++++++++++++------
.../compare/internal/CompareMessages.properties | 12 ++++++
.../eclipse/compare/internal/CompareNavigator.java | 12 ++++++
.../org.eclipse.compare/buildnotes_compare.html | 1 +
.../contentmergeviewer/TextMergeViewer.java | 43 ++++++++++++++++------
.../compare/internal/CompareMessages.properties | 12 ++++++
.../eclipse/compare/internal/CompareNavigator.java | 12 ++++++
8 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 7bd7f7f25..a2bb5b142 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -35,6 +35,7 @@ Problem reports fixed
#14680: Compare unreadable in high contrast black
#14952: Diff Browser Opens Too Small / Not Easily Resizable
#14742: Ignore whitespace preference
+#14624: No visual cue when compared file wraps
null
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
index 7302d5e9e..157d076bc 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
@@ -38,3 +38,15 @@ TextMergeViewer.diffType.format= {0} {1}
TextMergeViewer.diffDescription.noDiff.format= no diff
TextMergeViewer.diffDescription.diff.format= {0} #{1} (Left: {2}, Right: {3})
TextMergeViewer.statusLine.format= Left: {0}, Right: {1}, {2}
+
+TextMergeViewer.atEnd.title= Goto Next Change
+TextMergeViewer.atEnd.message= End of Document reached. Continue at Beginning?
+
+TextMergeViewer.atBeginning.title= Goto Previous Change
+TextMergeViewer.atBeginning.message= Beginning of Document reached. Continue at End?
+
+CompareNavigator.atEnd.title= Goto Next Change
+CompareNavigator.atEnd.message= Last Resource reached.
+
+CompareNavigator.atBeginning.title= Goto Previous Change
+CompareNavigator.atBeginning.message= First Resource reached.
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 16df01c8e..a977359e3 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
@@ -11,6 +11,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.compare.CompareEditorInput;
import org.eclipse.compare.*;
@@ -60,6 +61,17 @@ public class CompareNavigator {
Display display= c.getDisplay();
if (display != null)
display.beep();
+
+ String title;
+ String message;
+ if (next) {
+ title= CompareMessages.getString("CompareNavigator.atEnd.title"); //$NON-NLS-1$
+ message= CompareMessages.getString("CompareNavigator.atEnd.message"); //$NON-NLS-1$
+ } else {
+ title= CompareMessages.getString("CompareNavigator.atBeginning.title"); //$NON-NLS-1$
+ message= CompareMessages.getString("CompareNavigator.atBeginning.message"); //$NON-NLS-1$
+ }
+ MessageDialog.openInformation(c.getShell(), title, message);
}
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 7bd7f7f25..a2bb5b142 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -35,6 +35,7 @@ Problem reports fixed
#14680: Compare unreadable in high contrast blacknull
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
index 7302d5e9e..157d076bc 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
@@ -38,3 +38,15 @@ TextMergeViewer.diffType.format= {0} {1}
TextMergeViewer.diffDescription.noDiff.format= no diff
TextMergeViewer.diffDescription.diff.format= {0} #{1} (Left: {2}, Right: {3})
TextMergeViewer.statusLine.format= Left: {0}, Right: {1}, {2}
+
+TextMergeViewer.atEnd.title= Goto Next Change
+TextMergeViewer.atEnd.message= End of Document reached. Continue at Beginning?
+
+TextMergeViewer.atBeginning.title= Goto Previous Change
+TextMergeViewer.atBeginning.message= Beginning of Document reached. Continue at End?
+
+CompareNavigator.atEnd.title= Goto Next Change
+CompareNavigator.atEnd.message= Last Resource reached.
+
+CompareNavigator.atBeginning.title= Goto Previous Change
+CompareNavigator.atBeginning.message= First Resource reached.
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index 16df01c8e..a977359e3 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -11,6 +11,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.compare.CompareEditorInput;
import org.eclipse.compare.*;
@@ -60,6 +61,17 @@ public class CompareNavigator {
Display display= c.getDisplay();
if (display != null)
display.beep();
+
+ String title;
+ String message;
+ if (next) {
+ title= CompareMessages.getString("CompareNavigator.atEnd.title"); //$NON-NLS-1$
+ message= CompareMessages.getString("CompareNavigator.atEnd.message"); //$NON-NLS-1$
+ } else {
+ title= CompareMessages.getString("CompareNavigator.atBeginning.title"); //$NON-NLS-1$
+ message= CompareMessages.getString("CompareNavigator.atBeginning.message"); //$NON-NLS-1$
+ }
+ MessageDialog.openInformation(c.getShell(), title, message);
}
}
}
--
cgit v1.2.3