You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bcel-dev@jakarta.apache.org by tc...@apache.org on 2006/03/02 04:50:04 UTC
svn commit: r382284 - in /jakarta/bcel/trunk/src/java/org/apache/bcel:
classfile/Utility.java generic/Instruction.java util/BCELFactory.java
util/BCELifier.java util/ClassPath.java verifier/statics/Pass2Verifier.java
Author: tcurdt
Date: Wed Mar 1 19:50:02 2006
New Revision: 382284
URL: http://svn.apache.org/viewcvs?rev=382284&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=24766
Modified:
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java Wed Mar 1 19:50:02 2006
@@ -30,6 +30,7 @@
import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -1014,7 +1015,7 @@
/** Map opcode names to opcode numbers. E.g., return Constants.ALOAD for "aload"
*/
public static short searchOpcode(String name) {
- name = name.toLowerCase();
+ name = name.toLowerCase(Locale.ENGLISH);
for(short i=0; i < Constants.OPCODE_NAMES.length; i++)
if(Constants.OPCODE_NAMES[i].equals(name))
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java Wed Mar 1 19:50:02 2006
@@ -20,6 +20,7 @@
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
+import java.util.Locale;
import org.apache.bcel.Constants;
import org.apache.bcel.classfile.ConstantPool;
import org.apache.bcel.util.ByteSequence;
@@ -178,7 +179,7 @@
}
private static final String className(short opcode) {
- String name = Constants.OPCODE_NAMES[opcode].toUpperCase();
+ String name = Constants.OPCODE_NAMES[opcode].toUpperCase(Locale.ENGLISH);
/* ICONST_0, etc. will be shortened to ICONST, etc., since ICONST_0 and the like
* are not implemented (directly).
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java Wed Mar 1 19:50:02 2006
@@ -5,6 +5,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.bcel.Constants;
@@ -97,7 +98,7 @@
!(i instanceof ConstantPushInstruction) &&
!(i instanceof ReturnInstruction)) { // Handled below
_out.println("il.append(InstructionConstants." +
- i.getName().toUpperCase() + ");");
+ i.getName().toUpperCase(Locale.ENGLISH) + ");");
return true;
}
@@ -138,7 +139,7 @@
_out.println("il.append(_factory.createFieldAccess(\"" +
class_name + "\", \"" + field_name + "\", " +
BCELifier.printType(type) + ", " +
- "Constants." + Constants.OPCODE_NAMES[opcode].toUpperCase() +
+ "Constants." + Constants.OPCODE_NAMES[opcode].toUpperCase(Locale.ENGLISH) +
"));");
}
@@ -153,7 +154,7 @@
class_name + "\", \"" + method_name + "\", " +
BCELifier.printType(type) + ", " +
BCELifier.printArgumentTypes(arg_types) + ", " +
- "Constants." + Constants.OPCODE_NAMES[opcode].toUpperCase() +
+ "Constants." + Constants.OPCODE_NAMES[opcode].toUpperCase(Locale.ENGLISH) +
"));");
}
@@ -260,7 +261,7 @@
args.append(" }");
_out.print("Select " + name + " = new " +
- bi.getName().toUpperCase() + "(" + args +
+ bi.getName().toUpperCase(Locale.ENGLISH) + "(" + args +
", new InstructionHandle[] { ");
for(int i=0; i < matchs.length; i++) {
@@ -284,7 +285,7 @@
_out.println(" BranchInstruction " + name +
" = _factory.createBranchInstruction(" +
- "Constants." + bi.getName().toUpperCase() + ", " +
+ "Constants." + bi.getName().toUpperCase(Locale.ENGLISH) + ", " +
target + ");");
}
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java Wed Mar 1 19:50:02 2006
@@ -226,7 +226,7 @@
else if ((pow == Constants.ACC_TRANSIENT) && (reason == FLAG_FOR_METHOD))
buf.append("ACC_VARARGS | ");
else
- buf.append("ACC_").append(Constants.ACCESS_NAMES[i].toUpperCase()).append(" | ");
+ buf.append("ACC_").append(Constants.ACCESS_NAMES[i].toUpperCase(Locale.ENGLISH)).append(" | ");
}
pow <<= 1;
@@ -261,7 +261,7 @@
byte t = type.getType();
if(t <= Constants.T_VOID) {
- return "Type." + Constants.TYPE_NAMES[t].toUpperCase();
+ return "Type." + Constants.TYPE_NAMES[t].toUpperCase(Locale.ENGLISH);
} else if(type.toString().equals("java.lang.String")) {
return "Type.STRING";
} else if(type.toString().equals("java.lang.Object")) {
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java Wed Mar 1 19:50:02 2006
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.StringTokenizer;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -140,7 +141,7 @@
File ext_dir = new File((String)e.next());
String[] extensions = ext_dir.list(new FilenameFilter() {
public boolean accept(File dir, String name) {
- name = name.toLowerCase();
+ name = name.toLowerCase(Locale.ENGLISH);
return name.endsWith(".zip") || name.endsWith(".jar");
}
});
Modified: jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java?rev=382284&r1=382283&r2=382284&view=diff
==============================================================================
--- jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java (original)
+++ jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java Wed Mar 1 19:50:02 2006
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.apache.bcel.Constants;
@@ -725,7 +726,7 @@
checkIndex(obj, obj.getSourceFileIndex(), CONST_Utf8);
String sourcefilename = ((ConstantUtf8) cp.getConstant(obj.getSourceFileIndex())).getBytes(); //==obj.getSourceFileName() ?
- String sourcefilenamelc = sourcefilename.toLowerCase();
+ String sourcefilenamelc = sourcefilename.toLowerCase(Locale.ENGLISH);
if ( (sourcefilename.indexOf('/') != -1) ||
(sourcefilename.indexOf('\\') != -1) ||
---------------------------------------------------------------------
To unsubscribe, e-mail: bcel-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: bcel-dev-help@jakarta.apache.org