mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00
Code Issues Wiki Activity

Bug 318510 - Fixed an NFE reported by Marc-Andre Laperle.

Browse source
This commit is contained in:
Sergey Prigogin 2010-09-13 18:34:01 +00:00
parent 4c1d5c5347
commit 82850038be
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java
View file

@ -301,7 +301,6 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
updatePageComplete(); updatePageComplete();
} }
// overrider
@Override @Override
public void dispose() { public void dispose() {
storePreferences(); storePreferences();
@ -312,14 +311,9 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
CRenameProcessor processor= getRenameProcessor(); CRenameProcessor processor= getRenameProcessor();
if (fWorkspace != null) { if (fWorkspace != null) {
int choice; int scope = fPreferences.getScope();
try {
choice= fPreferences.getInt(CRenameRefactoringPreferences.KEY_SCOPE);
} catch (Exception e) {
choice= TextSearchWrapper.SCOPE_RELATED_PROJECTS;
}
switch (choice) { switch (scope) {
case TextSearchWrapper.SCOPE_WORKSPACE: case TextSearchWrapper.SCOPE_WORKSPACE:
fWorkspace.setSelection(true); fWorkspace.setSelection(true);
break; break;
@ -330,13 +324,13 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
fWorkingSet.setSelection(true); fWorkingSet.setSelection(true);
break; break;
default: default:
choice= TextSearchWrapper.SCOPE_RELATED_PROJECTS; scope= TextSearchWrapper.SCOPE_RELATED_PROJECTS;
fDependent.setSelection(true); fDependent.setSelection(true);
break; break;
} }
processor.setScope(choice); processor.setScope(scope);
String workingSet= fPreferences.get(CRenameRefactoringPreferences.KEY_WORKING_SET_NAME); String workingSet= fPreferences.getWorkingSet();
processor.setWorkingSet(workingSet); // CRenameProcessor validates the working set name. processor.setWorkingSet(workingSet); // CRenameProcessor validates the working set name.
fWorkingSetSpec.setText(processor.getWorkingSet()); fWorkingSetSpec.setText(processor.getWorkingSet());
} }

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java
View file

@ -41,18 +41,10 @@ public class CRenameRefactoringPreferences {
} }
} }
public String get(String key) {
return fDialogSettings.get(key);
}
public boolean getBoolean(String key) { public boolean getBoolean(String key) {
return fDialogSettings.getBoolean(key); return fDialogSettings.getBoolean(key);
} }
public int getInt(String key) {
return fDialogSettings.getInt(key);
}
public void put(String key, int value) { public void put(String key, int value) {
fDialogSettings.put(key, value); fDialogSettings.put(key, value);
} }
@ -65,6 +57,18 @@ public class CRenameRefactoringPreferences {
fDialogSettings.put(key, value); fDialogSettings.put(key, value);
} }
public int getScope() {
try {
return fDialogSettings.getInt(KEY_SCOPE);
} catch (Exception e) {
return TextSearchWrapper.SCOPE_RELATED_PROJECTS;
}
}
public String getWorkingSet() {
return fDialogSettings.get(KEY_WORKING_SET_NAME);
}
public int getOptions() { public int getOptions() {
int options= 0; int options= 0;
if (!getBoolean(KEY_IGNORE_VIRTUAL)) if (!getBoolean(KEY_IGNORE_VIRTUAL))

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
View file

@ -426,8 +426,8 @@ public class RenameLinkedMode {
processor.setReplacementText(newName); processor.setReplacementText(newName);
CRenameRefactoringPreferences preferences = new CRenameRefactoringPreferences(); CRenameRefactoringPreferences preferences = new CRenameRefactoringPreferences();
processor.setSelectedOptions(preferences.getOptions()); processor.setSelectedOptions(preferences.getOptions());
processor.setScope(preferences.getInt(CRenameRefactoringPreferences.KEY_SCOPE)); processor.setScope(preferences.getScope());
processor.setWorkingSet(preferences.get(CRenameRefactoringPreferences.KEY_WORKING_SET_NAME)); processor.setWorkingSet(preferences.getWorkingSet());
RenameSupport renameSupport= RenameSupport.create(processor); RenameSupport renameSupport= RenameSupport.create(processor);
return renameSupport; return renameSupport;
} }