Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-01-08 10:27:01 -0500
committerAndre Weinand2002-01-08 10:27:01 -0500
commit85970cf9f89e51b50378f13e87a2bb6ee22c5e9b (patch)
treeace7d3cf9182e2c74359555b1164bcd27ad80d42 /bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer
parent00374087d79d1ed3140d31898dfcbc76f43591fb (diff)
downloadeclipse.platform.team-85970cf9f89e51b50378f13e87a2bb6ee22c5e9b.tar.gz
eclipse.platform.team-85970cf9f89e51b50378f13e87a2bb6ee22c5e9b.tar.xz
eclipse.platform.team-85970cf9f89e51b50378f13e87a2bb6ee22c5e9b.zip
Replace with previous
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java6
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java4
2 files changed, 6 insertions, 4 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 8461da200..dbec525ba 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
@@ -315,8 +315,10 @@ public class DiffTreeViewer extends TreeViewer {
super.inputChanged(in, oldInput);
//expandToLevel(2);
- navigate(true);
- updateActions();
+ if (in != oldInput) {
+ navigate(true);
+ updateActions();
+ }
}
/**
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 051fbc589..2fcd30bf9 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
@@ -155,8 +155,8 @@ public class StructureDiffViewer extends DiffTreeViewer {
if (input instanceof ICompareInput) {
compareInputChanged((ICompareInput) input);
diff();
- //expandToLevel(3);
- navigate(true);
+ if (input != oldInput)
+ navigate(true);
}
}

Back to the top