Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / src / org / json / simple / JSONValue.java

diff --git a/src/org/json/simple/JSONValue.java b/src/org/json/simple/JSONValue.java
index 5da3cd0..eb11cb2 100644 (file)
--- a/src/org/json/simple/JSONValue.java
+++ b/src/org/json/simple/JSONValue.java
@@ -10,6 +10,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Collection;
+import java.util.Locale;
 // import java.util.List;
 import java.util.Map;
 
@@ -41,6 +42,7 @@ public class JSONValue {
         * {@code null}; please use {@link JSONValue#parseWithException(Reader)}
         * instead
         */
+  @Deprecated
        public static Object parse(Reader in){
                try{
                        JSONParser parser=new JSONParser();
@@ -71,6 +73,7 @@ public class JSONValue {
         * {@code null}; please use {@link JSONValue#parseWithException(String)}
         * instead
         */
+  @Deprecated
        public static Object parse(String s){
                StringReader in=new StringReader(s);
                return parse(in);
@@ -304,7 +307,7 @@ public class JSONValue {
                                        for(int k=0;k<4-ss.length();k++){
                                                sb.append('0');
                                        }
-                                       sb.append(ss.toUpperCase());
+                                       sb.append(ss.toUpperCase(Locale.ROOT));
                                }
                                else{
                                        sb.append(ch);