Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit ed4239b

Browse files
committed
Merge pull request #371 from excilys/370_R_inner_classes_independant_of_locale
Fixing turkish i bug when trying to locate R.id values. Fixes #370
2 parents c64d8ae + 781e118 commit ed4239b

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/rest/MethodProcessor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.lang.annotation.Annotation;
1919
import java.util.HashMap;
2020
import java.util.List;
21+
import java.util.Locale;
2122
import java.util.Map;
2223
import java.util.TreeMap;
2324

@@ -29,8 +30,8 @@
2930
import com.googlecode.androidannotations.annotations.rest.Accept;
3031
import com.googlecode.androidannotations.helper.CanonicalNameConstants;
3132
import com.googlecode.androidannotations.helper.RestAnnotationHelper;
32-
import com.googlecode.androidannotations.processing.EBeanHolder;
3333
import com.googlecode.androidannotations.processing.DecoratingElementProcessor;
34+
import com.googlecode.androidannotations.processing.EBeanHolder;
3435
import com.sun.codemodel.JBlock;
3536
import com.sun.codemodel.JClass;
3637
import com.sun.codemodel.JCodeModel;
@@ -81,7 +82,7 @@ protected void generateRestTemplateCallBlock(MethodProcessorHolder methodHolder)
8182
EBeanHolder eBeanHolder = methodHolder.getHolder();
8283
JClass httpMethod = eBeanHolder.refClass(CanonicalNameConstants.HTTP_METHOD);
8384
// add method type param
84-
String restMethodInCapitalLetters = getTarget().getSimpleName().toUpperCase();
85+
String restMethodInCapitalLetters = getTarget().getSimpleName().toUpperCase(Locale.ENGLISH);
8586
restCall.arg(httpMethod.staticRef(restMethodInCapitalLetters));
8687

8788
TreeMap<String, JVar> methodParams = (TreeMap<String, JVar>) generateMethodParamsVar(eBeanHolder, method, executableElement, holder);

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/rclass/IRClass.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@
1515
*/
1616
package com.googlecode.androidannotations.rclass;
1717

18+
import java.util.Locale;
19+
1820
public interface IRClass {
1921

2022
public enum Res {
2123
LAYOUT, ID, STRING, ARRAY, COLOR, ANIM, BOOL, DIMEN, DRAWABLE, INTEGER, MOVIE, MENU, RAW;
2224
public String rName() {
23-
return toString().toLowerCase();
25+
return toString().toLowerCase(Locale.ENGLISH);
2426
}
2527
}
2628

0 commit comments

Comments
 (0)