LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 15:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turkish locale toLowerCase I problem fix (causing not loading main window because of icon names conversion, etc.)

Browse Source
This commit is contained in:
Jindra Petřík
2018-04-01 16:26:32 +02:00
parent 5717035254
commit c2f729b3bf
14 changed files with 69 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/ExportDialog.java
+3 -2
View File
@@ -54,6 +54,7 @@ import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -168,7 +169,7 @@ public class ExportDialog extends AppDialog {
int selIndex = combos[i].getSelectedIndex();
Class c = optionClasses[i];
Object[] vals = c.getEnumConstants();
String key = optionNames[i] + "." + vals[selIndex].toString().toLowerCase();
String key = optionNames[i] + "." + vals[selIndex].toString().toLowerCase(Locale.ENGLISH);
if (i > 0) {
cfg.append(",");
}
@@ -276,7 +277,7 @@ public class ExportDialog extends AppDialog {
int itemIndex = -1;
for (int j = 0; j < vals.length; j++) {
String key = optionNames[i] + "." + vals[j].toString().toLowerCase();
String key = optionNames[i] + "." + vals[j].toString().toLowerCase(Locale.ENGLISH);
if (exportFormats.contains(key)) {
itemIndex = j;
}
src/com/jpexs/decompiler/flash/gui/Main.java
+15 -15
View File
@@ -375,7 +375,7 @@ public class Main {
}
if (instrSWF != null) {
String swfFileName = fTempFile.getAbsolutePath();
if (swfFileName.toLowerCase().endsWith(".swf")) {
if (swfFileName.toLowerCase(Locale.ENGLISH).endsWith(".swf")) {
swfFileName = swfFileName.substring(0, swfFileName.length() - 4) + ".swd";
} else {
swfFileName = swfFileName + ".swd";
@@ -806,7 +806,7 @@ public class Main {
@Override
public boolean accept(File f) {
String name = f.getName().toLowerCase();
String name = f.getName().toLowerCase(Locale.ENGLISH);
for (String ext : supportedExtensions) {
if (name.endsWith(ext)) {
return true;
@@ -825,7 +825,7 @@ public class Main {
FileFilter swfFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".swf")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".swf")) || (f.isDirectory());
}
@Override
@@ -838,7 +838,7 @@ public class Main {
FileFilter gfxFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".gfx")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".gfx")) || (f.isDirectory());
}
@Override
@@ -1354,7 +1354,7 @@ public class Main {
FileFilter swfFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".swf")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".swf")) || (f.isDirectory());
}
@Override
@@ -1366,7 +1366,7 @@ public class Main {
FileFilter gfxFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".gfx")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".gfx")) || (f.isDirectory());
}
@Override
@@ -1405,7 +1405,7 @@ public class Main {
FileFilter exeFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(fext)) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(fext)) || (f.isDirectory());
}
@Override
@@ -1431,13 +1431,13 @@ public class Main {
try {
String fileName = file.getAbsolutePath();
if (selFilter == swfFilter) {
if (!fileName.toLowerCase().endsWith(extension)) {
if (!fileName.toLowerCase(Locale.ENGLISH).endsWith(extension)) {
fileName += extension;
}
swf.gfx = false;
}
if (selFilter == gfxFilter) {
if (!fileName.toLowerCase().endsWith(".gfx")) {
if (!fileName.toLowerCase(Locale.ENGLISH).endsWith(".gfx")) {
fileName += ".gfx";
}
swf.gfx = true;
@@ -1465,7 +1465,7 @@ public class Main {
@Override
public boolean accept(File f) {
String name = f.getName().toLowerCase();
String name = f.getName().toLowerCase(Locale.ENGLISH);
for (String ext : supportedExtensions) {
if (name.endsWith(ext)) {
return true;
@@ -1484,7 +1484,7 @@ public class Main {
FileFilter swfFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".swf")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".swf")) || (f.isDirectory());
}
@Override
@@ -1497,7 +1497,7 @@ public class Main {
FileFilter swcFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".swc")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".swc")) || (f.isDirectory());
}
@Override
@@ -1510,7 +1510,7 @@ public class Main {
FileFilter gfxFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".gfx")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".gfx")) || (f.isDirectory());
}
@Override
@@ -1523,7 +1523,7 @@ public class Main {
FileFilter iggyFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".iggy")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".iggy")) || (f.isDirectory());
}
@Override
@@ -1536,7 +1536,7 @@ public class Main {
FileFilter zipFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(".zip")) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".zip")) || (f.isDirectory());
}
@Override
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+5 -4
View File
@@ -193,6 +193,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
@@ -2108,7 +2109,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
FileFilter f = new FileFilter() {
@Override
public boolean accept(File f) {
return f.isDirectory() || (f.getName().toLowerCase().endsWith(".fla"));
return f.isDirectory() || (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".fla"));
}
@Override
@@ -2125,7 +2126,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
f = new FileFilter() {
@Override
public boolean accept(File f) {
return f.isDirectory() || (f.getName().toLowerCase().endsWith(".xfl"));
return f.isDirectory() || (f.getName().toLowerCase(Locale.ENGLISH).endsWith(".xfl"));
}
@Override
@@ -2761,7 +2762,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
File selfile = Helper.fixDialogFile(selectedFile);
DefineSoundTag ds = (DefineSoundTag) item;
int soundFormat = SoundFormat.FORMAT_UNCOMPRESSED_LITTLE_ENDIAN;
if (selfile.getName().toLowerCase().endsWith(".mp3")) {
if (selfile.getName().toLowerCase(Locale.ENGLISH).endsWith(".mp3")) {
soundFormat = SoundFormat.FORMAT_MP3;
}
@@ -2969,7 +2970,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
if (f.isDirectory()) {
return true;
}
String fileName = f.getName().toLowerCase();
String fileName = f.getName().toLowerCase(Locale.ENGLISH);
for (String ext : extensions) {
if (fileName.endsWith(ext)) {
return true;
src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java
+3 -2
View File
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.treeitems.AS3ClassTreeItem;
import com.jpexs.decompiler.graph.DottedChain;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import javax.swing.event.TreeModelEvent;
import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreeModel;
@@ -80,11 +81,11 @@ public class ClassesListTreeModel extends AS3ClassTreeItem implements TreeModel
getSwf().getFlexMainClass(ignoredClasses, ignoredNss);
}
filter = (filter == null || filter.isEmpty()) ? null : filter.toLowerCase();
filter = (filter == null || filter.isEmpty()) ? null : filter.toLowerCase(Locale.ENGLISH);
loop:
for (ScriptPack item : list) {
if (filter != null) {
if (!item.getClassPath().toString().toLowerCase().contains(filter)) {
if (!item.getClassPath().toString().toLowerCase(Locale.ENGLISH).contains(filter)) {
continue;
}
}
src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
+3 -2
View File
@@ -63,6 +63,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.BoxLayout;
@@ -402,7 +403,7 @@ public class ProxyFrame extends AppFrame implements CatchedListener, MouseListen
FileFilter swfFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(extension)) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(extension)) || (f.isDirectory());
}
@Override
@@ -473,7 +474,7 @@ public class ProxyFrame extends AppFrame implements CatchedListener, MouseListen
FileFilter swfFilter = new FileFilter() {
@Override
public boolean accept(File f) {
return (f.getName().toLowerCase().endsWith(extension)) || (f.isDirectory());
return (f.getName().toLowerCase(Locale.ENGLISH).endsWith(extension)) || (f.isDirectory());
}
@Override
src/com/jpexs/decompiler/flash/gui/tagtree/TagTree.java
+3 -2
View File
@@ -121,6 +121,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.swing.Icon;
import javax.swing.JTree;
@@ -146,7 +147,7 @@ public class TagTree extends JTree {
ICONS = new HashMap<>();
for (TreeNodeType treeNodeType : TreeNodeType.values()) {
if (treeNodeType != TreeNodeType.UNKNOWN && treeNodeType != TreeNodeType.SHOW_FRAME) {
String tagTypeStr = treeNodeType.toString().toLowerCase().replace("_", "");
String tagTypeStr = treeNodeType.toString().toLowerCase(Locale.ENGLISH).replace("_", "");
ICONS.put(treeNodeType, View.getIcon(tagTypeStr + "16"));
}
}
@@ -206,7 +207,7 @@ public class TagTree extends JTree {
FolderItem si = (FolderItem) val;
if (!TagTreeRoot.FOLDER_ROOT.equals(si.getName())) {
String itemName = "folder" + si.getName();
setIcon(View.getIcon(itemName.toLowerCase() + "16"));
setIcon(View.getIcon(itemName.toLowerCase(Locale.ENGLISH) + "16"));
}
} else {
setIcon(ICONS.get(type));