Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 327846 - Method names conflicting with Java keywords should have underscore prepended, not appended. Expand list of Java keywords. General cleanup. r=bsmedberg. xulrunner only

Browse Source 
Original committer: pedemont%us.ibm.com
Original revision: 1.39
Original date: 2006/03/30 22:31:56


git-svn-id: svn://10.0.0.236/trunk@212611 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2006-09-27 15:17:35 +00:00
parent 4ce496bccf
commit 2607e2e8f4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
View File

@@ -390,7 +390,6 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
nsresult rv = NS_OK;
JNIEnv* env = GetJNIEnv();
jobject javaObject = env->NewLocalRef(mJavaWeakRef);
nsCAutoString methodSig("(");
@@ -447,6 +446,10 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
methodName.AppendASCII(aMethodInfo->GetName());
methodName.SetCharAt(tolower(methodName[0]), 0);
}
// If it's a Java keyword, then prepend an underscore
if (gJavaKeywords->GetEntry(methodName.get())) {
methodName.Insert('_', 0);
}
jclass clazz = env->GetObjectClass(javaObject);
if (clazz)
@@ -849,7 +852,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
iid = *variant;
}
jobject str;
jobject str = nsnull;
if (iid) {
char* iid_str = iid->ToString();
if (iid_str) {
@@ -860,8 +863,6 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
break;
}
PR_Free(iid_str);
} else {
str = nsnull;
}
if (!aParamInfo.IsOut()) { // 'in'
@@ -1030,7 +1031,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
case nsXPTType::T_VOID:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.j = (jlong) aVariant.val.p;
aJValue.j = NS_REINTERPRET_CAST(jlong, aVariant.val.p);
aMethodSig.Append('J');
} else { // 'inout' & 'out'
if (aVariant.val.p) {