mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Patch from Sam Rob, fix for 64783

Browse source 
* src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
This commit is contained in:
Alain Magloire 2004-06-03 14:42:21 +00:00
parent ab02e6e396
commit 965f0a205d
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -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

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java
View file

@ -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();
}
}

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
View file

@ -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;