diff options
| author | Andre Weinand | 2002-06-01 07:54:35 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-06-01 07:54:35 +0000 |
| commit | 672c2339999b9a5300555d7c3a65d86bd3517e46 (patch) | |
| tree | d5ccf9dcd18f1010591829ee3f35e2610652a19b | |
| parent | 115e3829e38b34743048f9903b863f53cc9a8dad (diff) | |
| download | eclipse.platform.team-672c2339999b9a5300555d7c3a65d86bd3517e46.tar.gz eclipse.platform.team-672c2339999b9a5300555d7c3a65d86bd3517e46.tar.xz eclipse.platform.team-672c2339999b9a5300555d7c3a65d86bd3517e46.zip | |
#18148, #18151
4 files changed, 22 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html index 36080d281..2c9b1bb7e 100644 --- a/bundles/org.eclipse.compare/buildnotes_compare.html +++ b/bundles/org.eclipse.compare/buildnotes_compare.html @@ -37,6 +37,8 @@ Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18206">#18206</a>: Casing, wording issue on "Last Resource reached" prompt<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=16285">#16285</a>: Add from Local History needs a description label<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=17431">#17431</a>: Accessibility issues<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18148">#18148</a>: Using combinations of No and Next file button break wrapping<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18151">#18151</a>: Next File button does not ding when on last file<br>
<h2>
Problem reports closed</h2>
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 de00ff6d2..683f48e1c 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 @@ -1205,6 +1205,7 @@ public class TextMergeViewer extends ContentMergeViewer { fCurrentDiff= null;
fChangeDiffs= null;
fAllDiffs= null;
+ fEndOfDocReached= false;
fLeftContentsChanged= false;
fRightContentsChanged= false;
@@ -2884,6 +2885,9 @@ public class TextMergeViewer extends ContentMergeViewer { //---- Navigating and resolving Diffs
+ /**
+ * Returns true if end (or beginning) of document reached.
+ */
private boolean navigate(boolean down, boolean wrap, boolean deep) {
Diff diff= null;
@@ -2918,8 +2922,10 @@ public class TextMergeViewer extends ContentMergeViewer { else
diff= (Diff) fChangeDiffs.get(fChangeDiffs.size()-1);
}
- } else
+ } else {
+ fEndOfDocReached= false;
return true;
+ }
}
setCurrentDiff(diff, true);
@@ -3023,6 +3029,8 @@ public class TextMergeViewer extends ContentMergeViewer { // if (d == fCurrentDiff)
// return;
+ fEndOfDocReached= false;
+
Diff oldDiff= fCurrentDiff;
if (d != null && revealAndSelect) {
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 36080d281..2c9b1bb7e 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 @@ -37,6 +37,8 @@ Problem reports fixed</h2> <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18206">#18206</a>: Casing, wording issue on "Last Resource reached" prompt<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=16285">#16285</a>: Add from Local History needs a description label<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=17431">#17431</a>: Accessibility issues<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18148">#18148</a>: Using combinations of No and Next file button break wrapping<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=18151">#18151</a>: Next File button does not ding when on last file<br>
<h2>
Problem reports closed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index de00ff6d2..683f48e1c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -1205,6 +1205,7 @@ public class TextMergeViewer extends ContentMergeViewer { fCurrentDiff= null;
fChangeDiffs= null;
fAllDiffs= null;
+ fEndOfDocReached= false;
fLeftContentsChanged= false;
fRightContentsChanged= false;
@@ -2884,6 +2885,9 @@ public class TextMergeViewer extends ContentMergeViewer { //---- Navigating and resolving Diffs
+ /**
+ * Returns true if end (or beginning) of document reached.
+ */
private boolean navigate(boolean down, boolean wrap, boolean deep) {
Diff diff= null;
@@ -2918,8 +2922,10 @@ public class TextMergeViewer extends ContentMergeViewer { else
diff= (Diff) fChangeDiffs.get(fChangeDiffs.size()-1);
}
- } else
+ } else {
+ fEndOfDocReached= false;
return true;
+ }
}
setCurrentDiff(diff, true);
@@ -3023,6 +3029,8 @@ public class TextMergeViewer extends ContentMergeViewer { // if (d == fCurrentDiff)
// return;
+ fEndOfDocReached= false;
+
Diff oldDiff= fCurrentDiff;
if (d != null && revealAndSelect) {
|