Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvs2001-05-30 04:34:44 -0400
committercvs2001-05-30 04:34:44 -0400
commit5bf964b39d4b92170c8711849faa641e800f60e0 (patch)
tree1b32dbdbea3ea76b2291500517390c9b8e65be3f /bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer
parentbe2120d7eeec145c6cc1db11e7d574581daaf497 (diff)
downloadeclipse.platform.team-5bf964b39d4b92170c8711849faa641e800f60e0.tar.gz
eclipse.platform.team-5bf964b39d4b92170c8711849faa641e800f60e0.tar.xz
eclipse.platform.team-5bf964b39d4b92170c8711849faa641e800f60e0.zip
1GEI0FC: ITPJUI:WIN2000 - Smoke 114: Rename CU Refactoring: all changes are conflicts in preview page
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.java3
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java2
2 files changed, 1 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 751ef7105..c4d014c36 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
@@ -100,7 +100,7 @@ public class DiffTreeViewer extends TreeViewer {
IDiffElement input= (IDiffElement) element;
int kind= input.getKind();
- if (!fIgnoreLeftIsLocal && fLeftIsLocal) {
+ if (fLeftIsLocal) {
switch (kind & Differencer.DIRECTION_MASK) {
case Differencer.LEFT:
kind= (kind &~ Differencer.LEFT) | Differencer.RIGHT;
@@ -130,7 +130,6 @@ public class DiffTreeViewer extends TreeViewer {
private ResourceBundle fBundle;
private CompareConfiguration fCompareConfiguration;
- boolean fIgnoreLeftIsLocal= true;
private boolean fLeftIsLocal;
private ViewerFilter fViewerFilter;
private IPropertyChangeListener fPropertyChangeListener;
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 519ee7e9f..223730ee9 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
@@ -76,8 +76,6 @@ public class StructureDiffViewer extends DiffTreeViewer {
private void initialize() {
- fIgnoreLeftIsLocal= false;
-
setAutoExpandLevel(3);
fContentChangedListener= new IContentChangeListener() {

Back to the top