diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index 1d715916a..d5930d835 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java @@ -320,20 +320,28 @@ public class DiffTreeViewer extends TreeViewer { * Clients may extend to track their own property changes.
*/
protected void propertyChange(PropertyChangeEvent event) {
-
- //if (event.getProperty().equals(CompareConfiguration.SHOW_PSEUDO_CONFLICTS))
- // syncShowPseudoConflictFilter();
}
protected void inputChanged(Object in, Object oldInput) {
super.inputChanged(in, oldInput);
- //expandToLevel(2);
if (in != oldInput) {
- navigate(true);
+ initialSelection();
updateActions();
}
}
+
+ /**
+ * This hook method is called from within <code>inputChanged</code>
+ * after a new input has been set but before any controls are updated.
+ * This default implementation calls <code>navigate(true)<code>
+ * to select and expand the first leaf node.
+ * Clients can override this method and are free to decide whether
+ * they want to call the inherited method.
+ */
+ protected void initialSelection() {
+ navigate(true);
+ }
/**
* Overridden to avoid expanding <code>DiffNode</code>s that shouldn't expand
@@ -342,12 +350,17 @@ public class DiffTreeViewer extends TreeViewer { protected void internalExpandToLevel(Widget node, int level) {
Object data= node.getData();
- if (data instanceof DiffNode && ((DiffNode)data).dontExpand())
+
+ if (dontExpand(data))
return;
super.internalExpandToLevel(node, level);
}
+ protected boolean dontExpand(Object o) {
+ return o instanceof DiffNode && ((DiffNode)o).dontExpand();
+ }
+
//---- merge action support
/**
|