Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-02-25 13:16:37 -0500
committerAndre Weinand2002-02-25 13:16:37 -0500
commitf18fffdbe2989225b9667c5544cde90461caee1a (patch)
treedf6ce1a9fff72d76a80f532ad4aecd3d30fec400
parente12adb24e45560d6eb8d5b04f1937767ae7fecf9 (diff)
downloadeclipse.platform.team-f18fffdbe2989225b9667c5544cde90461caee1a.tar.gz
eclipse.platform.team-f18fffdbe2989225b9667c5544cde90461caee1a.tar.xz
eclipse.platform.team-f18fffdbe2989225b9667c5544cde90461caee1a.zip
#7681: Structured results expands import statements
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java6
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java6
4 files changed, 16 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index e70b5e17e..5de800fc0 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,7 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input February ??th 2002
+Eclipse Build Input February 26th 2002
<h2>
What's new in this drop</h2>
@@ -33,6 +33,8 @@ Known deficiencies</h2>
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9540">#9540</a>: Compare with patch: it should not be possible to check items that could not be applied<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9532">#9532</a>: Compare with patch: next disabled although clipboard specified<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=7681">#7681</a>: Structured results expands import statements<br>
+
<h2>
Problem reports closed</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 58f6065b7..7a766746d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -147,10 +147,14 @@ public class StructureDiffViewer extends DiffTreeViewer {
if (input instanceof ICompareInput) {
compareInputChanged((ICompareInput) input);
if (input != oldInput)
- navigate(true);
+ initialSelection();
}
}
+ protected void initialSelection() {
+ expandToLevel(2);
+ }
+
/* (non Javadoc)
* Overridden to unregister all listeners.
*/
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 e70b5e17e..5de800fc0 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
@@ -11,7 +11,7 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input February ??th 2002
+Eclipse Build Input February 26th 2002
<h2>
What's new in this drop</h2>
@@ -33,6 +33,8 @@ Known deficiencies</h2>
Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9540">#9540</a>: Compare with patch: it should not be possible to check items that could not be applied<br>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=9532">#9532</a>: Compare with patch: next disabled although clipboard specified<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=7681">#7681</a>: Structured results expands import statements<br>
+
<h2>
Problem reports closed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 58f6065b7..7a766746d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -147,10 +147,14 @@ public class StructureDiffViewer extends DiffTreeViewer {
if (input instanceof ICompareInput) {
compareInputChanged((ICompareInput) input);
if (input != oldInput)
- navigate(true);
+ initialSelection();
}
}
+ protected void initialSelection() {
+ expandToLevel(2);
+ }
+
/* (non Javadoc)
* Overridden to unregister all listeners.
*/

Back to the top