From 965f0a205d1822fa1a523284c0fa6b40ab25ec77 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Thu, 3 Jun 2004 14:42:21 +0000 Subject: [PATCH] Patch from Sam Rob, fix for 64783 * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java --- core/org.eclipse.cdt.ui/ChangeLog | 6 ++++++ .../ui/preferences/CFileTypesPreferencePage.java | 9 ++++----- .../internal/ui/preferences/CFileTypesPropertyPage.java | 8 ++++---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 62193c8caf4..dce740cf179 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,9 @@ +2004-06-03 Alain Magloire + + Patch from Sam Rob, fix for 64783 + * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java + * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java + 2004-06-02 Bogdan Gheorghe Fix for Bug 61241 - [Search] Closing the Search view mid search causes an error diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java index fa258d55b72..13ed2b6ea72 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java @@ -71,19 +71,18 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben } /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performApply() + * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ - protected void performApply() { + public boolean performOk() { IResolverModel model = getResolverModel(); fPrefsBlock.performApply(); model.setResolver(fPrefsBlock.getResolver()); - super.performApply(); + return super.performOk(); } - + private IResolverModel getResolverModel() { return CCorePlugin.getDefault().getResolverModel(); } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index f562bf0bcb5..ffd0d503a87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -108,9 +108,9 @@ public class CFileTypesPropertyPage extends PropertyPage { } /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performApply() + * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ - protected void performApply() { + public boolean performOk() { IResolverModel model = getResolverModel(); fPrefsBlock.performApply(); @@ -122,9 +122,9 @@ public class CFileTypesPropertyPage extends PropertyPage { model.setResolver(getProject(), null); } - super.performApply(); + return super.performOk(); } - + private IProject getProject(){ Object element = getElement(); IProject project = null;