From 99396e7a96024ad66463cdfbc0aebf1c3853f092 Mon Sep 17 00:00:00 2001
From: Andre Weinand
Date: Tue, 16 Nov 2004 11:07:34 +0000
Subject: fixed #78679
---
bundles/org.eclipse.compare/buildnotes_compare.html | 7 +++++++
.../eclipse/compare/internal/ComparePreferencePage.java | 17 +++++++++++------
.../plugins/org.eclipse.compare/buildnotes_compare.html | 7 +++++++
.../eclipse/compare/internal/ComparePreferencePage.java | 17 +++++++++++------
4 files changed, 36 insertions(+), 12 deletions(-)
(limited to 'bundles')
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
Compare
+Eclipse Build Input November 16th 2004
+
+Problem reports fixed
+ 78679: Prefs Filtered Members field does not restore defaults
+
+
+
Eclipse Build Input November 9th 2004
Problem reports fixed
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
Compare
+Eclipse Build Input November 16th 2004
+
+Problem reports fixed
+ 78679: Prefs Filtered Members field does not restore defaults
+
+
+
Eclipse Build Input November 9th 2004
Problem reports fixed
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
--
cgit v1.2.3