Lots of stuff

1 files changed, 15 insertions, 11 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 0e9994aae..fd67f87e1 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
@@ -197,7 +197,7 @@ public class DiffTreeViewer extends TreeViewer {
 		// register for notification with the Compare plugin's PreferenceStore 

 		fPreferenceChangeListener= new IPropertyChangeListener() {

 			public void propertyChange(PropertyChangeEvent event) {

-				if (event.getProperty().equals(CompareConfiguration.SHOW_PSEUDO_CONFLICTS))

+				if (event.getProperty().equals(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS))

 					syncShowPseudoConflictFilter();			

 			}

 		};

@@ -354,7 +354,7 @@ public class DiffTreeViewer extends TreeViewer {
 //		};

 //		Utilities.initAction(fCopyLeftToRightAction, fBundle, "action.TakeLeft.");

 //		toolbarManager.appendToGroup("merge", fCopyLeftToRightAction);

-

+//

 //		fCopyRightToLeftAction= new Action() {

 //			public void run() {

 //				copySelected(false);

@@ -584,19 +584,23 @@ public class DiffTreeViewer extends TreeViewer {
 	

 	private void syncShowPseudoConflictFilter() {

 		

-		boolean showPseudoConflicts= Utilities.getBoolean(fCompareConfiguration, CompareConfiguration.SHOW_PSEUDO_CONFLICTS, false);

+		IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();

+		boolean showPseudoConflicts= ps.getBoolean(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS);

 		

-		if (showPseudoConflicts) {

-			if (fViewerFilter != null) {

-				removeFilter(fViewerFilter);

+		Control tree= getControl();

+		if (!tree.isDisposed()) {

+			if (showPseudoConflicts) {

+				if (fViewerFilter != null) {

+					removeFilter(fViewerFilter);

+				}

+			} else {

+				if (fViewerFilter == null)

+					fViewerFilter= new FilterSame();	

+				addFilter(fViewerFilter);

 			}

-		} else {

-			if (fViewerFilter == null)

-				fViewerFilter= new FilterSame();	

-			addFilter(fViewerFilter);

 		}

 	}

-	

+		

 	private final boolean isEditable(Object element, boolean left) {

 		if (element instanceof ICompareInput) {

 			ICompareInput diff= (ICompareInput) element;