LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am dc87dd30: ADT Extract String ID: use Context.getString(id) directly, no need for Context.getResources().

Browse Source 
Merge commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6'

* commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6':
  ADT Extract String ID: use Context.getString(id) directly,
This commit is contained in:
Raphael
2009-07-14 10:50:40 -07:00
committed by The Android Open Source Project
parent b06c4ae736 dc87dd3052
commit da73c40ff0
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java
View File

@@ -1408,7 +1408,7 @@ public class ExtractStringRefactoring extends Refactoring {
// We want to analyze the calling context to understand whether we can // We want to analyze the calling context to understand whether we can
// just replace the string literal by the named int constant (R.id.foo) // just replace the string literal by the named int constant (R.id.foo)
// or if we should generate a Context.getResources().getString() call. // or if we should generate a Context.getString() call.
boolean useGetResource = false; boolean useGetResource = false;
useGetResource = examineVariableDeclaration(node) || useGetResource = examineVariableDeclaration(node) ||
examineMethodInvocation(node); examineMethodInvocation(node);
@@ -1420,9 +1420,6 @@ public class ExtractStringRefactoring extends Refactoring {
if (useGetResource) { if (useGetResource) {
MethodInvocation mi1 = mAst.newMethodInvocation();
mi1.setName(mAst.newSimpleName("getResources")); //$NON-NLS-1$
Expression context = methodHasContextArgument(node); Expression context = methodHasContextArgument(node);
if (context == null && !isClassDerivedFromContext(node)) { if (context == null && !isClassDerivedFromContext(node)) {
// if we don't have a class that derives from Context and // if we don't have a class that derives from Context and
@@ -1431,22 +1428,19 @@ public class ExtractStringRefactoring extends Refactoring {
context = findContextFieldOrMethod(node); context = findContextFieldOrMethod(node);
if (context == null) { if (context == null) {
// If not, let's write Context.getResources(), which is technically // If not, let's write Context.getString(), which is technically
// invalid but makes it a good clue on how to fix it. // invalid but makes it a good clue on how to fix it.
context = mAst.newSimpleName("Context"); //$NON-NLS-1$ context = mAst.newSimpleName("Context"); //$NON-NLS-1$
} }
} }
if (context != null) {
mi1.setExpression(context);
}
MethodInvocation mi2 = mAst.newMethodInvocation(); MethodInvocation mi2 = mAst.newMethodInvocation();
mi2.setName(mAst.newSimpleName("getString")); //$NON-NLS-1$ mi2.setName(mAst.newSimpleName("getString")); //$NON-NLS-1$
mi2.setExpression(mi1); mi2.setExpression(context);
mi2.arguments().add(newNode); mi2.arguments().add(newNode);
newNode = mi2; newNode = mi2;
title = "Replace string by getResource().getString(ID)"; title = "Replace string by Context.getString(R.string...)";
} }
TextEditGroup editGroup = new TextEditGroup(title); TextEditGroup editGroup = new TextEditGroup(title);
@@ -1493,7 +1487,7 @@ public class ExtractStringRefactoring extends Refactoring {
* If the expression is part of a method invocation (aka a function call) or a * If the expression is part of a method invocation (aka a function call) or a
* class instance creation (aka a "new SomeClass" constructor call), we try to * class instance creation (aka a "new SomeClass" constructor call), we try to
* find the type of the argument being used. If it is a String (most likely), we * find the type of the argument being used. If it is a String (most likely), we
* want to return true (to generate a getResources() call). However if there might * want to return true (to generate a getString() call). However if there might
* be a similar method that takes an int, in which case we don't want to do that. * be a similar method that takes an int, in which case we don't want to do that.
* *
* This covers the case of Activity.setTitle(int resId) vs setTitle(String str). * This covers the case of Activity.setTitle(int resId) vs setTitle(String str).
@@ -1552,7 +1546,7 @@ public class ExtractStringRefactoring extends Refactoring {
} }
// Eventually we want to determine if the parameter is a string type, // Eventually we want to determine if the parameter is a string type,
// in which case a Context.getResources() call must be generated. // in which case a Context.getString() call must be generated.
boolean useStringType = false; boolean useStringType = false;
// Find the type of that argument // Find the type of that argument