diff options
| author | 2025-09-03 13:59:45 +0300 | |
|---|---|---|
| committer | 2025-09-03 11:59:45 +0100 | |
| commit | 57c37c222c43f732c8b7703263cf9a573561322f (patch) | |
| tree | b1eda877bac461463448ec1def988810447193fc /enigma/src/main/java | |
| parent | Update Gradle and fix buildscripts (#557) (diff) | |
| download | enigma-fork-57c37c222c43f732c8b7703263cf9a573561322f.tar.gz enigma-fork-57c37c222c43f732c8b7703263cf9a573561322f.tar.xz enigma-fork-57c37c222c43f732c8b7703263cf9a573561322f.zip | |
Always specify locale in toUpperCase and toLowerCase (#556)
Not all of these changes are strictly needed to avoid the Turkish i issue
specifically, but it's good to be consistent.
Diffstat (limited to 'enigma/src/main/java')
| -rw-r--r-- | enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java | 5 | ||||
| -rw-r--r-- | enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java index 95c2c2a..c0979f5 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/StructureTreeNode.java | |||
| @@ -3,6 +3,7 @@ package cuchaz.enigma.analysis; | |||
| 3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
| 4 | import java.util.Comparator; | 4 | import java.util.Comparator; |
| 5 | import java.util.List; | 5 | import java.util.List; |
| 6 | import java.util.Locale; | ||
| 6 | import java.util.stream.Stream; | 7 | import java.util.stream.Stream; |
| 7 | 8 | ||
| 8 | import javax.swing.tree.DefaultMutableTreeNode; | 9 | import javax.swing.tree.DefaultMutableTreeNode; |
| @@ -67,9 +68,9 @@ public class StructureTreeNode extends DefaultMutableTreeNode { | |||
| 67 | case DEFAULT -> children; | 68 | case DEFAULT -> children; |
| 68 | case A_Z -> children.sorted(Comparator.comparing(e -> (e instanceof MethodEntry m && m.isConstructor()) | 69 | case A_Z -> children.sorted(Comparator.comparing(e -> (e instanceof MethodEntry m && m.isConstructor()) |
| 69 | // compare the class name when the entry is a constructor | 70 | // compare the class name when the entry is a constructor |
| 70 | ? project.getMapper().deobfuscate(e.getParent()).getSimpleName().toLowerCase() : project.getMapper().deobfuscate(e).getSimpleName().toLowerCase())); | 71 | ? project.getMapper().deobfuscate(e.getParent()).getSimpleName().toLowerCase(Locale.ROOT) : project.getMapper().deobfuscate(e).getSimpleName().toLowerCase())); |
| 71 | case Z_A -> children.sorted( | 72 | case Z_A -> children.sorted( |
| 72 | Comparator.comparing(e -> (e instanceof MethodEntry m && m.isConstructor()) ? project.getMapper().deobfuscate(((ParentedEntry<?>) e).getParent()).getSimpleName().toLowerCase() : project.getMapper().deobfuscate((ParentedEntry<?>) e).getSimpleName().toLowerCase()).reversed()); | 73 | Comparator.comparing(e -> (e instanceof MethodEntry m && m.isConstructor()) ? project.getMapper().deobfuscate(((ParentedEntry<?>) e).getParent()).getSimpleName().toLowerCase() : project.getMapper().deobfuscate((ParentedEntry<?>) e).getSimpleName().toLowerCase(Locale.ROOT)).reversed()); |
| 73 | }; | 74 | }; |
| 74 | 75 | ||
| 75 | for (ParentedEntry<?> child : children.toList()) { | 76 | for (ParentedEntry<?> child : children.toList()) { |
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java index 24204f8..bd45340 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/AccessFlags.java | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | package cuchaz.enigma.translation.representation; | 1 | package cuchaz.enigma.translation.representation; |
| 2 | 2 | ||
| 3 | import java.lang.reflect.Modifier; | 3 | import java.lang.reflect.Modifier; |
| 4 | import java.util.Locale; | ||
| 4 | 5 | ||
| 5 | import org.objectweb.asm.Opcodes; | 6 | import org.objectweb.asm.Opcodes; |
| 6 | 7 | ||
| @@ -110,7 +111,7 @@ public class AccessFlags { | |||
| 110 | 111 | ||
| 111 | @Override | 112 | @Override |
| 112 | public String toString() { | 113 | public String toString() { |
| 113 | StringBuilder builder = new StringBuilder(Access.get(this).toString().toLowerCase()); | 114 | StringBuilder builder = new StringBuilder(Access.get(this).toString().toLowerCase(Locale.ROOT)); |
| 114 | 115 | ||
| 115 | if (isStatic()) { | 116 | if (isStatic()) { |
| 116 | builder.append(" static"); | 117 | builder.append(" static"); |