fixed #78679v20041116

4 files changed, 36 insertions, 12 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 3bdde70cf..366b91010 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,13 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input November 16th 2004
+
+<h2>Problem reports fixed</h2>
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input November 9th 2004
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 9d0afbec9..3fcd49cf0 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -73,10 +73,11 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 	
 	
 	private TextMergeViewer fPreviewViewer;
-	private IPropertyChangeListener	fPreferenceChangeListener;
+	private IPropertyChangeListener fPreferenceChangeListener;
 	private CompareConfiguration fCompareConfiguration;
 	private OverlayPreferenceStore fOverlayStore;
 	private Map fCheckBoxes= new HashMap();
+	private Text fFilters;
 	private SelectionListener fCheckBoxListener;
 
 
@@ -140,6 +141,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 	 * @see IWorkbenchPreferencePage#init()
 	 */
 	public void init(IWorkbench workbench) {
+		// empty
 	}	
 
 	/*
@@ -247,13 +249,13 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		l= new Label(c2, SWT.NONE);
 		l.setText(Utilities.getString("ComparePreferencePage.filter.label")); //$NON-NLS-1$
 		
-		final Text t= new Text(c2, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setText(fOverlayStore.getString(PATH_FILTER));
-		t.addModifyListener(
+		fFilters= new Text(c2, SWT.BORDER);
+		fFilters.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		fFilters.setText(fOverlayStore.getString(PATH_FILTER));
+		fFilters.addModifyListener(
 			new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
-					String filters= t.getText();
+					String filters= fFilters.getText();
 					String message= CompareFilter.validateResourceFilters(filters);
 					setValid(message == null);
 					setMessage(null);
@@ -336,6 +338,9 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			String key= (String) fCheckBoxes.get(b);
 			b.setSelection(fOverlayStore.getBoolean(key));
 		}
+		
+		if (fFilters != null)
+			fFilters.setText(fOverlayStore.getString(PATH_FILTER));
 	}
 
 	// overlay stuff
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 3bdde70cf..366b91010 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
@@ -12,6 +12,13 @@
 Eclipse Platform Build Notes<br>
 Compare</h1>
 
+Eclipse Build Input November 16th 2004
+
+<h2>Problem reports fixed</h2>
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
+
+<h1><hr WIDTH="100%"></h1>
+
 Eclipse Build Input November 9th 2004
 
 <h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index 9d0afbec9..3fcd49cf0 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -73,10 +73,11 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 	
 	
 	private TextMergeViewer fPreviewViewer;
-	private IPropertyChangeListener	fPreferenceChangeListener;
+	private IPropertyChangeListener fPreferenceChangeListener;
 	private CompareConfiguration fCompareConfiguration;
 	private OverlayPreferenceStore fOverlayStore;
 	private Map fCheckBoxes= new HashMap();
+	private Text fFilters;
 	private SelectionListener fCheckBoxListener;
 
 
@@ -140,6 +141,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 	 * @see IWorkbenchPreferencePage#init()
 	 */
 	public void init(IWorkbench workbench) {
+		// empty
 	}	
 
 	/*
@@ -247,13 +249,13 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		l= new Label(c2, SWT.NONE);
 		l.setText(Utilities.getString("ComparePreferencePage.filter.label")); //$NON-NLS-1$
 		
-		final Text t= new Text(c2, SWT.BORDER);
-		t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		t.setText(fOverlayStore.getString(PATH_FILTER));
-		t.addModifyListener(
+		fFilters= new Text(c2, SWT.BORDER);
+		fFilters.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		fFilters.setText(fOverlayStore.getString(PATH_FILTER));
+		fFilters.addModifyListener(
 			new ModifyListener() {
 				public void modifyText(ModifyEvent e) {
-					String filters= t.getText();
+					String filters= fFilters.getText();
 					String message= CompareFilter.validateResourceFilters(filters);
 					setValid(message == null);
 					setMessage(null);
@@ -336,6 +338,9 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			String key= (String) fCheckBoxes.get(b);
 			b.setSelection(fOverlayStore.getBoolean(key));
 		}
+		
+		if (fFilters != null)
+			fFilters.setText(fOverlayStore.getString(PATH_FILTER));
 	}
 
 	// overlay stuff