Correct use of String.toLowerCase/.toUpperCase
diff --git a/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/src/org/eclipse/statet/ecommons/waltable/data/ExtendedReflectiveColumnPropertyAccessor.java b/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/src/org/eclipse/statet/ecommons/waltable/data/ExtendedReflectiveColumnPropertyAccessor.java
index e863830..1ae870c 100644
--- a/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/src/org/eclipse/statet/ecommons/waltable/data/ExtendedReflectiveColumnPropertyAccessor.java
+++ b/ecommons.waltable/org.eclipse.statet.ecommons.waltable.core/src/org/eclipse/statet/ecommons/waltable/data/ExtendedReflectiveColumnPropertyAccessor.java
@@ -14,6 +14,7 @@
package org.eclipse.statet.ecommons.waltable.data;
import java.lang.reflect.Method;
+import java.util.Locale;
public class ExtendedReflectiveColumnPropertyAccessor<R> extends ReflectiveColumnPropertyAccessor<R> {
@@ -70,14 +71,14 @@
String getterName= null;
Method getterMethod= null;
for (final String pc : propertyChain) {
- getterName= "get" + pc.substring(0, 1).toUpperCase() + pc.substring(1); //$NON-NLS-1$
+ getterName= "get" + pc.substring(0, 1).toUpperCase(Locale.ROOT) + pc.substring(1); //$NON-NLS-1$
try {
getterMethod= objectClass.getMethod(getterName);
child= getterMethod.invoke(child);
}
catch (final NoSuchMethodException e) {
try {
- getterName= "is" + pc.substring(0, 1).toUpperCase() + pc.substring(1); //$NON-NLS-1$
+ getterName= "is" + pc.substring(0, 1).toUpperCase(Locale.ROOT) + pc.substring(1); //$NON-NLS-1$
getterMethod= objectClass.getMethod(getterName);
child= getterMethod.invoke(child);
}
diff --git a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariableResolver.java b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariableResolver.java
index af2873f..e62951c 100644
--- a/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariableResolver.java
+++ b/ecommons/org.eclipse.statet.ecommons.debug.core/src/org/eclipse/statet/ecommons/resources/core/variables/ResourceVariableResolver.java
@@ -31,6 +31,7 @@
import java.io.File;
import java.net.URI;
+import java.util.Locale;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IContainer;
@@ -280,7 +281,7 @@
charset= ((IContainer) resource).getDefaultCharset(true);
}
if (charset != null && charset.startsWith("utf")) { //$NON-NLS-1$
- charset= charset.toUpperCase();
+ charset= charset.toUpperCase(Locale.ROOT);
}
return charset;
}
diff --git a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CaseInsensitiveMap.java b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CaseInsensitiveMap.java
index 546b508..2a36c8e 100644
--- a/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CaseInsensitiveMap.java
+++ b/jcommons/org.eclipse.statet.jcommons.util/src/org/eclipse/statet/jcommons/collections/CaseInsensitiveMap.java
@@ -15,6 +15,7 @@
package org.eclipse.statet.jcommons.collections;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import org.eclipse.statet.jcommons.lang.NonNull;
@@ -50,9 +51,13 @@
}
+ private String toId(final String name) {
+ return name.toUpperCase(Locale.ROOT);
+ }
+
@Override
public @Nullable V put(final String name, final V value) {
- final String id= name.toUpperCase();
+ final String id= toId(name);
final String oldName= this.idNameMap.put(id, name);
@Nullable V prevValue;
if (!name.equals(oldName)) {
@@ -77,7 +82,7 @@
if (!(key instanceof String)) {
return null;
}
- final String id= ((String) key).toUpperCase();
+ final String id= toId((String)key);
final String realName= this.idNameMap.remove(id);
if (realName == null) {
return null;
@@ -107,7 +112,7 @@
if (!(key instanceof String)) {
return false;
}
- final String id= ((String) key).toUpperCase();
+ final String id= toId((String)key);
return this.idNameMap.containsKey(id);
}
@@ -121,7 +126,7 @@
if (!(key instanceof String)) {
return null;
}
- final String id= ((String) key).toUpperCase();
+ final String id= toId((String)key);
final String name= this.idNameMap.get(id);
return (name != null) ? super.get(name) : null;
}
