LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-17 18:09:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged honfika changes

Browse Source 
chinese translation for jsyntaxpane
This commit is contained in:
Jindra Petk
2013-08-25 10:32:23 +02:00
parent 652513ce46 8393f063cb
commit 0cf5862534
23 changed files with 340 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/defaultsyntaxkit/config_zh.properties Normal file
View File

@@ -0,0 +1,118 @@
DefaultAction.copy-to-clipboard.MenuText = \u590d\u5236
DefaultAction.cut-to-clipboard.MenuText = \u526a\u5207
DefaultAction.paste-from-clipboard.MenuText = \u7c98\u8d34
DefaultAction.select-all.MenuText = \u5168\u9009
Action.find.MenuText = \u67e5\u627e
Action.find.ToolTip= \u663e\u793a\u67e5\u627e\u548c\u66ff\u6362\u5bf9\u8bdd\u6846
Action.find-next.MenuText = \u67e5\u627e\u4e0b\u4e00\u4e2a
Action.find-next.ToolTip = \u91cd\u590d\u4e0a\u6b21\u67e5\u627e
Action.goto-line.MenuText = \u8df3\u8f6c\u5230\u884c\u53f7
Action.goto-line.ToolTip = \u8df3\u8f6c\u5230\u884c\u53f7
Action.indent.MenuText = \u7f29\u8fdb
Action.unindent.MenuText = \u53cd\u7f29\u8fdb
Action.undo.MenuText = \u64a4\u9500
Action.redo.MenuText = \u6062\u590d
Action.delete-lines.MenuText = \u5220\u9664\u884c
Action.dup-lines-up.MenuText = Duplicate Lines \u4ee5\u4e0a
Action.dup-lines-down.MenuText = Duplicate Lines \u4ee5\u4e0b
Action.toggle-lines.MenuText = \u5207\u6362\u884c\u53f7
Action.show-abbs.MenuText = \u663e\u793a\u7f29\u7565
Action.show-abbs.ToolTip = \u663e\u793a\u7f29\u7565
Action.complete-word.MenuText = \u81ea\u52a8\u5b8c\u6210
Action.jump-to-pair.MenuText = \u8df3\u8f6c\u5230\u914d\u5bf9
Action.toggle-comments.MenuText = \u5207\u6362\u6ce8\u91ca
# !!!! FFDec translators - please do not edit anything below this line !!!
#==========================================================================
Components = jsyntaxpane.components.PairsMarker, \
jsyntaxpane.components.LineNumbersRuler
# This is the color to highlight tokens whenever the cursor is on them
TokenMarker.Color = 0xffeeaa
# Colors for PairMarkers
PairMarker.Color = 0xffbb77
#
# Right Margin for LineNumbers border in pixels, Default = 5
LineNumbers.RightMargin = 7
# Foreground for line numbers, Default = Black
LineNumbers.Foreground = 0x333300
# Background for line numbers, Default = White
LineNumbers.Background = 0xeeeeff
# Color to use for highlighting current line background
LineNumbers.CurrentBack = 0xccccee
# Default color for the Caret, Black
CaretColor = 0x000000
# Actions:
Action.quick-find = jsyntaxpane.actions.QuickFindAction, control F
Action.find = jsyntaxpane.actions.FindReplaceAction, control H
Action.find-next = jsyntaxpane.actions.FindNextAction, F3
Action.goto-line = jsyntaxpane.actions.GotoLineAction, control G
Action.indent = jsyntaxpane.actions.IndentAction, TAB
Action.indent.Abbreviations = ${class_path}/abbreviations.properties
Action.unindent = jsyntaxpane.actions.UnindentAction, shift TAB
Action.jindent = jsyntaxpane.actions.JIndentAction, ENTER
Action.undo = jsyntaxpane.actions.UndoAction, menu Z
Action.redo = jsyntaxpane.actions.RedoAction, menu Y
Action.delete-lines = jsyntaxpane.actions.DeleteLinesAction, control E
Action.dup-lines-up = jsyntaxpane.actions.DuplicateLinesAction, shift control UP
Action.dup-lines-down = jsyntaxpane.actions.DuplicateLinesAction, shift control DOWN
Action.toggle-lines = jsyntaxpane.actions.ToggleComponentAction, control F2
Action.toggle-lines.Component = jsyntaxpane.components.LineNumbersRuler
Action.toggle-comments = jsyntaxpane.actions.ToggleCommentsAction, control SLASH
Action.toggle-comments.SmallIcon = comment.png
Action.jump-to-pair = jsyntaxpane.actions.JumpToPairAction, control OPEN_BRACKET
Action.complete-word = jsyntaxpane.actions.CompleteWordAction, control K
Action.smart-home = jsyntaxpane.actions.SmartHomeAction, HOME
Action.smart-home-select = jsyntaxpane.actions.SmartHomeSelectAction, shift HOME
Action.show-abbs = jsyntaxpane.actions.ShowAbbsAction, F8
#
# View configuration:
TextAA = ON
DEFAULT_EDIT_MENU= \
cut-to-clipboard , \
copy-to-clipboard , \
paste-from-clipboard , \
- , \
select-all , \
- , \
undo , \
redo , \
- , \
find , \
find-next , \
goto-line , \
jump-to-pair , \
- , \
complete-word
# Default Popup Menu
PopupMenu = \
${DEFAULT_EDIT_MENU} , \
- , \
goto-line , \
toggle-comments
# TokenType attributes
Style.OPERATOR = 0x000000, 0
Style.DELIMITER = 0x000000, 1
Style.KEYWORD = 0x3333ee, 0
Style.KEYWORD2 = 0x3333ee, 3
Style.TYPE = 0x000000, 2
Style.TYPE2 = 0x000000, 1
Style.TYPE3 = 0x000000, 3
Style.STRING = 0xcc6600, 0
Style.STRING2 = 0xcc6600, 1
Style.NUMBER = 0x999933, 1
Style.REGEX = 0xcc6600, 0
Style.IDENTIFIER = 0x000000, 0
Style.COMMENT = 0x339933, 2
Style.COMMENT2 = 0x339933, 3
Style.DEFAULT = 0x000000, 0
Style.WARNING = 0xCC0000, 0
Style.ERROR = 0xCC0000, 3

35
trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3methodinfosyntaxkit/config_zh.properties Normal file
View File

@@ -0,0 +1,35 @@
Action.toggle-token-marker.MenuText = \u5207\u6362\u4ee4\u724c\u6807\u8bb0
# !!!! FFDec translators - please do not edit anything below this line !!!
#==========================================================================
#
# JavaSyntaxKit Specific properties.
#
Components = jsyntaxpane.components.LineNumbersRuler, \
jsyntaxpane.components.TokenMarker
TokenMarker.TokenTypes = IDENTIFIER, TYPE, TYPE2, TYPE3
#
# Performs single color selection (Default = false)
#
SingleColorSelect = true
RightMarginColumn = 80
RightMarginColor = 0xdddddd
#
# Java Actions
Action.indent.WordRegex=\\w+|\\/(\\*)+
#Action.parenthesis = jsyntaxpane.actions.PairAction, typed (
Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3
Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker
#Action.brackets = jsyntaxpane.actions.PairAction, typed [
Action.quotes = jsyntaxpane.actions.PairAction, typed '
Action.double-quotes = jsyntaxpane.actions.PairAction, typed "
#
# These are the completions to be in the IntelliSense completion dialog
# comma separated values.
# Vertical bars: if there is one, it will position the cursor. If there are
# two, they will be start and end of selection
PopupMenu = \
${DEFAULT_EDIT_MENU} , \
- , \
toggle-lines , \
toggle-token-marker

40
trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasm3syntaxkit/config_zh.properties Normal file
View File

@@ -0,0 +1,40 @@
Action.combo-completion.MenuText = \u83b7\u53d6\u4e00\u4e2a\u6307\u4ee4
Action.toggle-token-marker.MenuText = \u5207\u6362\u4ee4\u724c\u6807\u8bb0
# !!!! FFDec translators - please do not edit anything below this line !!!
#==========================================================================
#
# JavaSyntaxKit Specific properties.
#
Components = jsyntaxpane.components.LineNumbersRuler, \
jsyntaxpane.components.TokenMarker
TokenMarker.TokenTypes = IDENTIFIER, TYPE, TYPE2, TYPE3
#
# Performs single color selection (Default = false)
#
SingleColorSelect = true
RightMarginColumn = 80
RightMarginColor = 0xdddddd
#
# Java Actions
Action.indent.WordRegex=\\w+|\\/(\\*)+
#Action.parenthesis = jsyntaxpane.actions.PairAction, typed (
Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3
Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker
#Action.brackets = jsyntaxpane.actions.PairAction, typed [
Action.quotes = jsyntaxpane.actions.PairAction, typed '
Action.double-quotes = jsyntaxpane.actions.PairAction, typed "
# For completions, you have to define the Action (key to trigger completions):
Action.combo-completion = jsyntaxpane.actions.ComboCompletionAction, control SPACE
Action.combo-completion.ItemsURL=${class_path}/combocompletions.txt
#
# These are the completions to be in the IntelliSense completion dialog
# comma separated values.
# Vertical bars: if there is one, it will position the cursor. If there are
# two, they will be start and end of selection
PopupMenu = \
${DEFAULT_EDIT_MENU} , \
- , \
toggle-lines , \
toggle-token-marker

40
trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/META-INF/services/jsyntaxpane/syntaxkits/flasmsyntaxkit/config_zh.properties Normal file
View File

@@ -0,0 +1,40 @@
Action.toggle-token-marker.MenuText = \u5207\u6362\u4ee4\u724c\u6807\u8bb0
# !!!! FFDec translators - please do not edit anything below this line !!!
#==========================================================================
#
# JavaSyntaxKit Specific properties.
#
Components = jsyntaxpane.components.LineNumbersRuler, \
jsyntaxpane.components.TokenMarker
TokenMarker.TokenTypes = IDENTIFIER, TYPE, TYPE2, TYPE3
#
# Performs single color selection (Default = false)
#
SingleColorSelect = true
RightMarginColumn = 80
RightMarginColor = 0xdddddd
#
# Java Actions
Action.indent.WordRegex=\\w+|\\/(\\*)+
#Action.parenthesis = jsyntaxpane.actions.PairAction, typed (
Action.toggle-token-marker = jsyntaxpane.actions.ToggleComponentAction, control F3
Action.toggle-token-marker.Component = jsyntaxpane.components.TokenMarker
#Action.brackets = jsyntaxpane.actions.PairAction, typed [
Action.quotes = jsyntaxpane.actions.PairAction, typed '
Action.double-quotes = jsyntaxpane.actions.PairAction, typed "
# For completions, you have to define the Action (key to trigger completions):
Action.combo-completion = jsyntaxpane.actions.ComboCompletionAction, control SPACE
Action.combo-completion.MenuText = Completions
Action.combo-completion.ItemsURL=${class_path}/combocompletions.txt
#
# These are the completions to be in the IntelliSense completion dialog
# comma separated values.
# Vertical bars: if there is one, it will position the cursor. If there are
# two, they will be start and end of selection
PopupMenu = \
${DEFAULT_EDIT_MENU} , \
- , \
toggle-lines , \
toggle-token-marker

39
trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/resources/jsyntaxpane/Bundle_zh.properties Normal file
View File

@@ -0,0 +1,39 @@
SyntaxTester.title=JSyntaxPane Tester
SyntaxTester.lblCaretPos.text=Caret Position
SyntaxTester.lblToken.text=Token under cursor
SyntaxTester.jEdtTest.contentType=
NO_TOKEN_AT_CURSOR=NO Token at cursor
HTMLPreviewFrame.title=HTML Preview
HTMLPreviewFrame.jEdtHtml.contentType=text/html
QuickFindDialog.jChkWrap.text=Wrap
QuickFindDialog.jChkRegExp.text=Reg Exp
QuickFindDialog.jChkIgnoreCase.text=Ignore Case
QuickFindDialog.jLabel1.text=Quick Find
QuickFindDialog.NotFound=not found
ReplaceDialog.jChkRegex.text=Regular Expression
ReplaceDialog.jChkIgnoreCase.text=Ignore Case
ReplaceDialog.jLblReplace.text=Replace
ReplaceDialog.jTglHighlight.text=Highlight
ReplaceDialog.jBtnReplaceAll.text=Replace All
ReplaceDialog.jBtnPrev.text=Previous
ReplaceDialog.jChkWrap.toolTipText=Wrap to beginning when end is reached
ReplaceDialog.jChkWrap.text=Wrap around
ReplaceDialog.title=Find and Replace
ReplaceDialog.jBtnNext.text=Next
ReplaceDialog.jLblFind.text=Find
ReplaceDialog.jBtnReplace.text=Replace
ShowAbbsDialog.title=Abbreviations
GotoLineDialog.title=Goto Line
GotoLineDialog.jBtnOk.text=Go
DocumentSearchData.SearchStringNotFound=Search String {0} not found
DocumentSearchData.Find=Find
ScriptAction.NoScriptConfigured=Action does not have script function configured
ScriptAction.ErrorInScript=Error in Script
ScriptAction.NoScriptFoundIn=No script is found in:
ScriptRunnerAction.ErrorExecutingScript=Error executing script:\\n
ScriptRunnerAction.ScriptError=Script Error
ScriptRunnerAction.ScriptEngineNotFound=Script Engine for [{0}] not found. Disable this Action?
ShowAbbsAction.NoAbbsForType=No Abbreviations exist for this content type

14
trunk/src/com/jpexs/decompiler/flash/Configuration.java
View File

@@ -116,22 +116,26 @@ public class Configuration {
return config.containsKey(cfg);
}
public static Object getConfig(String cfg) {
public static <T> T getConfig(String cfg) {
return getConfig(cfg, null);
}
public static Object getConfig(String cfg, Object defaultValue) {
public static <T> T getConfig(String cfg, T defaultValue) {
if (!config.containsKey(cfg)) {
return defaultValue;
}
return config.get(cfg);
@SuppressWarnings("unchecked")
T result = (T)config.get(cfg);
return result;
}
public static Object setConfig(String cfg, Object value) {
public static <T> T setConfig(String cfg, T value) {
if (cfg.equals("paralelSpeedUp")) {
cfg = "parallelSpeedUp";
}
return config.put(cfg, value);
@SuppressWarnings("unchecked")
T result = (T)config.put(cfg, value);
return result;
}
public static void unsetConfig(String cfg) {

6
trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
View File

@@ -92,7 +92,7 @@ public class SWFInputStream extends InputStream {
private long percentMax;
private List<byte[]> buffered = new ArrayList<>();
private ByteArrayOutputStream buffer;
private static boolean DEOBFUSCATION_ALL_CODE_IN_PREVIOUS_TAG = (Boolean) Configuration.getConfig("deobfuscateUsePrevTagOnly", true);
private static boolean DEOBFUSCATION_ALL_CODE_IN_PREVIOUS_TAG = Configuration.getConfig("deobfuscateUsePrevTagOnly", true);
public int getVersion() {
return version;
@@ -549,7 +549,7 @@ public class SWFInputStream extends InputStream {
@SuppressWarnings("unchecked")
private static void getConstantPool(List<DisassemblyListener> listeners, ConstantPool cpool, List<Object> localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, List<ConstantPool> constantPools, List<Integer> visited, int version, int endIp, String path) {
boolean debugMode = false;
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
while (((endIp == -1) || (endIp > ip)) && (ip > -1) && ip < code.size()) {
if (visited.contains(ip)) {
break;
@@ -805,7 +805,7 @@ public class SWFInputStream extends InputStream {
boolean debugMode = false;
boolean decideBranch = false;
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
boolean retv = false;
rri.setPos(ip);
Action a;

4
trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
View File

@@ -116,7 +116,7 @@ public class MethodBody implements Cloneable, Serializable {
if (pcode) {
s += code.toASMSource(constants, this, false);
} else {
if (!(Boolean) Configuration.getConfig("decompile", Boolean.TRUE)) {
if (!Configuration.getConfig("decompile", true)) {
s = "//Decompilation skipped";
if (hilight) {
s = Highlighting.hilighMethod(s, this.method_info);
@@ -143,7 +143,7 @@ public class MethodBody implements Cloneable, Serializable {
MethodBody b = (MethodBody) Helper.deepCopy(this);
deobfuscated = b.code;
deobfuscated.markMappedOffsets();
if ((Boolean) Configuration.getConfig("autoDeobfuscate", true)) {
if (Configuration.getConfig("autoDeobfuscate", true)) {
try {
deobfuscated.removeTraps(constants, b, abc, scriptIndex, classIndex, isStatic, path);
} catch (Exception | StackOverflowError ex) {

2
trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java
View File

@@ -62,7 +62,7 @@ public class ActionWaitForFrame extends Action implements ActionStore {
}
skipped.add(a);
}
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
if (deobfuscate) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < skipCount; i++) {

2
trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java
View File

@@ -75,7 +75,7 @@ public class ActionWaitForFrame2 extends Action implements ActionStore {
}
skipped.add(a);
}
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
if (deobfuscate) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < skipCount; i++) {

28
trunk/src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -218,7 +218,7 @@ public class Main {
public void progress(int p) {
startWork(translate("work.reading.swf"), p);
}
}, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
}, Configuration.getConfig("parallelSpeedUp", true));
locswf.addEventListener(new EventListener() {
@Override
public void handleEvent(String event, Object data) {
@@ -387,7 +387,7 @@ public class Main {
public static boolean saveFileDialog() {
JFileChooser fc = new JFileChooser();
fc.setCurrentDirectory(new File((String) Configuration.getConfig("lastSaveDir", ".")));
fc.setCurrentDirectory(new File(Configuration.getConfig("lastSaveDir", ".")));
fc.setFileFilter(new FileFilter() {
@Override
public boolean accept(File f) {
@@ -425,7 +425,7 @@ public class Main {
public static boolean openFileDialog() {
fileTitle = null;
JFileChooser fc = new JFileChooser();
fc.setCurrentDirectory(new File((String) Configuration.getConfig("lastOpenDir", ".")));
fc.setCurrentDirectory(new File(Configuration.getConfig("lastOpenDir", ".")));
fc.setFileFilter(new FileFilter() {
@Override
public boolean accept(File f) {
@@ -604,7 +604,7 @@ public class Main {
}
private static void offerAssociation() {
boolean offered = (Boolean) Configuration.getConfig("offeredAssociation", Boolean.FALSE);
boolean offered = Configuration.getConfig("offeredAssociation", false);
if (!offered) {
if (Platform.isWindows()) {
if ((!isAddedToContextMenu()) && View.showConfirmDialog(null, "Do you want to add FFDec to context menu of SWF files?\n(Can be changed later from main menu)", "Context menu", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
@@ -612,12 +612,12 @@ public class Main {
}
}
}
Configuration.setConfig("offeredAssociation", Boolean.TRUE);
Configuration.setConfig("offeredAssociation", true);
}
public static void initLang() {
if (Configuration.containsConfig("locale")) {
Locale.setDefault(Locale.forLanguageTag((String) Configuration.getConfig("locale", "en")));
Locale.setDefault(Locale.forLanguageTag(Configuration.getConfig("locale", "en")));
}
UIManager.put("OptionPane.okButtonText", AppStrings.translate("button.ok"));
UIManager.put("OptionPane.yesButtonText", AppStrings.translate("button.yes"));
@@ -751,7 +751,7 @@ public class Main {
View.setLookAndFeel();
if ((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE)) {
if (Configuration.getConfig("cacheOnDisk", Boolean.TRUE)) {
Cache.setStorageType(Cache.STORAGE_FILES);
} else {
Cache.setStorageType(Cache.STORAGE_MEMORY);
@@ -914,7 +914,7 @@ public class Main {
boolean exportOK;
try {
printHeader();
SWF exfile = new SWF(new FileInputStream(inFile), (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
SWF exfile = new SWF(new FileInputStream(inFile), Configuration.getConfig("parallelSpeedUp", true));
exfile.addEventListener(new EventListener() {
@Override
public void handleEvent(String event, Object data) {
@@ -931,7 +931,7 @@ public class Main {
System.out.println("Exporting shapes...");
exfile.exportShapes(handler, outDir.getAbsolutePath() + File.separator + "shapes");
System.out.println("Exporting scripts...");
exfile.exportActionScript(handler, outDir.getAbsolutePath() + File.separator + "scripts", false, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
exfile.exportActionScript(handler, outDir.getAbsolutePath() + File.separator + "scripts", false, Configuration.getConfig("parallelSpeedUp", true));
System.out.println("Exporting movies...");
exfile.exportMovies(handler, outDir.getAbsolutePath() + File.separator + "movies");
System.out.println("Exporting sounds...");
@@ -955,10 +955,10 @@ public class Main {
if ((pos + 5 < args.length) && (args[pos + 4].equals("-selectas3class"))) {
exportOK = true;
for (int i = pos + 5; i < args.length; i++) {
exportOK = exportOK && exfile.exportAS3Class(args[i], outDir.getAbsolutePath(), exportFormat.equals("pcode"), (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
exportOK = exportOK && exfile.exportAS3Class(args[i], outDir.getAbsolutePath(), exportFormat.equals("pcode"), Configuration.getConfig("parallelSpeedUp", true));
}
} else {
exportOK = !exfile.exportActionScript(handler, outDir.getAbsolutePath(), exportFormat.equals("pcode"), (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)).isEmpty();
exportOK = !exfile.exportActionScript(handler, outDir.getAbsolutePath(), exportFormat.equals("pcode"), Configuration.getConfig("parallelSpeedUp", true)).isEmpty();
}
break;
case "movie":
@@ -982,11 +982,11 @@ public class Main {
exportOK = true;
break;
case "fla":
exfile.exportFla(handler, outDir.getAbsolutePath(), inFile.getName(), applicationName, applicationVerName, version, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
exfile.exportFla(handler, outDir.getAbsolutePath(), inFile.getName(), applicationName, applicationVerName, version, Configuration.getConfig("parallelSpeedUp", true));
exportOK = true;
break;
case "xfl":
exfile.exportXfl(handler, outDir.getAbsolutePath(), inFile.getName(), applicationName, applicationVerName, version, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
exfile.exportXfl(handler, outDir.getAbsolutePath(), inFile.getName(), applicationName, applicationVerName, version, Configuration.getConfig("parallelSpeedUp", true));
exportOK = true;
break;
default:
@@ -1170,7 +1170,7 @@ public class Main {
}
public static void autoCheckForUpdates() {
Calendar lastUpdatesCheckDate = (Calendar) Configuration.getConfig("lastUpdatesCheckDate", null);
Calendar lastUpdatesCheckDate = Configuration.getConfig("lastUpdatesCheckDate", null);
if ((lastUpdatesCheckDate == null) || (lastUpdatesCheckDate.getTime().getTime() < Calendar.getInstance().getTime().getTime() - 1000 * 60 * 60 * 24)) {
checkForUpdates();
}

38
trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
View File

@@ -538,9 +538,9 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
rib.setApplicationMenu(mainMenu);
int w = (Integer) Configuration.getConfig("gui.window.width", 1000);
int w = Configuration.getConfig("gui.window.width", 1000);
int h = (Integer) Configuration.getConfig("gui.window.height", 700);
int h = Configuration.getConfig("gui.window.height", 700);
Dimension dim = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
if (w > dim.width) {
w = dim.width;
@@ -550,8 +550,8 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
}
setSize(w, h);
boolean maximizedHorizontal = (Boolean) Configuration.getConfig("gui.window.maximized.horizontal", false);
boolean maximizedVertical = (Boolean) Configuration.getConfig("gui.window.maximized.vertical", false);
boolean maximizedHorizontal = Configuration.getConfig("gui.window.maximized.horizontal", false);
boolean maximizedVertical = Configuration.getConfig("gui.window.maximized.vertical", false);
int state = 0;
if (maximizedHorizontal) {
@@ -659,7 +659,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
miDeobfuscation.addActionListener(this);
//autoDeobfuscateMenuItem = new JCheckBoxMenuItem(translate("menu.settings.autodeobfuscation"));
miAutoDeobfuscation.setSelected((Boolean) Configuration.getConfig("autoDeobfuscate", true));
miAutoDeobfuscation.setSelected(Configuration.getConfig("autoDeobfuscate", true));
miAutoDeobfuscation.addActionListener(this);
miAutoDeobfuscation.setActionCommand("AUTODEOBFUSCATE");
@@ -689,7 +689,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
menuTools.add(miSearchScript);
//miInternalViewer = new JCheckBox(translate("menu.settings.internalflashviewer"));
miInternalViewer.setSelected((Boolean) Configuration.getConfig("internalFlashViewer", (Boolean) (flashPanel == null)));
miInternalViewer.setSelected(Configuration.getConfig("internalFlashViewer", (Boolean) (flashPanel == null)));
if (flashPanel == null) {
miInternalViewer.setSelected(true);
miInternalViewer.setEnabled(false);
@@ -698,7 +698,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
miInternalViewer.addActionListener(this);
//miParallelSpeedUp = new JCheckBox(translate("menu.settings.parallelspeedup"));
miParallelSpeedUp.setSelected((Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
miParallelSpeedUp.setSelected(Configuration.getConfig("parallelSpeedUp", true));
miParallelSpeedUp.setActionCommand("PARALLELSPEEDUP");
miParallelSpeedUp.addActionListener(this);
@@ -714,18 +714,18 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
menuBar.add(menuTools);
//miDecompile = new JCheckBox(translate("menu.settings.disabledecompilation"));
miDecompile.setSelected(!(Boolean) Configuration.getConfig("decompile", Boolean.TRUE));
miDecompile.setSelected(!Configuration.getConfig("decompile", true));
miDecompile.setActionCommand("DISABLEDECOMPILATION");
miDecompile.addActionListener(this);
//miCacheDisk = new JCheckBox(translate("menu.settings.cacheOnDisk"));
miCacheDisk.setSelected((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE));
miCacheDisk.setSelected(Configuration.getConfig("cacheOnDisk", true));
miCacheDisk.setActionCommand("CACHEONDISK");
miCacheDisk.addActionListener(this);
// miGotoMainClassOnStartup = new JCheckBox(translate("menu.settings.gotoMainClassOnStartup"));
miGotoMainClassOnStartup.setSelected((Boolean) Configuration.getConfig("gotoMainClassOnStartup", Boolean.FALSE));
miGotoMainClassOnStartup.setSelected(Configuration.getConfig("gotoMainClassOnStartup", false));
miGotoMainClassOnStartup.setActionCommand("GOTODOCUMENTCLASSONSTARTUP");
miGotoMainClassOnStartup.addActionListener(this);
@@ -1624,8 +1624,8 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
mui.setNormalIcon(View.getResizableIcon("buttonicon_256"));
mui.setClickIcon(View.getResizableIcon("buttonicon_down_256"));
}
splitPane1.setDividerLocation((Integer) Configuration.getConfig("gui.splitPane1.dividerLocation", getWidth() / 3));
int confDivLoc = (Integer) Configuration.getConfig("gui.splitPane2.dividerLocation", splitPane2.getHeight() * 3 / 5);
splitPane1.setDividerLocation(Configuration.getConfig("gui.splitPane1.dividerLocation", getWidth() / 3));
int confDivLoc = Configuration.getConfig("gui.splitPane2.dividerLocation", splitPane2.getHeight() * 3 / 5);
if (confDivLoc > splitPane2.getHeight() - 10) { //In older releases, divider location was saved when detailPanel was invisible too
confDivLoc = splitPane2.getHeight() * 3 / 5;
}
@@ -2168,7 +2168,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
for (int i = 0; i < tlsList.size(); i++) {
ScriptPack tls = tlsList.get(i);
Main.startWork(translate("work.exporting") + " " + (i + 1) + "/" + tlsList.size() + " " + tls.getPath() + " ...");
ret.add(tls.export(selFile, abcList, isPcode, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)));
ret.add(tls.export(selFile, abcList, isPcode, Configuration.getConfig("parallelSpeedUp", true)));
}
} else {
List<TagNode> allNodes = new ArrayList<>();
@@ -2376,7 +2376,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
ImageTag it = (ImageTag) tagObj;
if (it.importSupported()) {
JFileChooser fc = new JFileChooser();
fc.setCurrentDirectory(new File((String) Configuration.getConfig("lastOpenDir", ".")));
fc.setCurrentDirectory(new File(Configuration.getConfig("lastOpenDir", ".")));
fc.setFileFilter(new FileFilter() {
@Override
public boolean accept(File f) {
@@ -2558,7 +2558,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
break;
case "EXPORTFLA":
JFileChooser fc = new JFileChooser();
String selDir = (String) Configuration.getConfig("lastOpenDir", ".");
String selDir = Configuration.getConfig("lastOpenDir", ".");
fc.setCurrentDirectory(new File(selDir));
if (!selDir.endsWith(File.separator)) {
selDir += File.separator;
@@ -2612,9 +2612,9 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
Helper.freeMem();
try {
if (compressed) {
swf.exportFla(errorHandler, selfile.getAbsolutePath(), new File(Main.file).getName(), Main.applicationName, Main.applicationVerName, Main.version, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
swf.exportFla(errorHandler, selfile.getAbsolutePath(), new File(Main.file).getName(), Main.applicationName, Main.applicationVerName, Main.version, Configuration.getConfig("parallelSpeedUp", true));
} else {
swf.exportXfl(errorHandler, selfile.getAbsolutePath(), new File(Main.file).getName(), Main.applicationName, Main.applicationVerName, Main.version, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
swf.exportXfl(errorHandler, selfile.getAbsolutePath(), new File(Main.file).getName(), Main.applicationName, Main.applicationVerName, Main.version, Configuration.getConfig("parallelSpeedUp", true));
}
} catch (IOException ex) {
View.showMessageDialog(null, translate("error.export") + ": " + ex.getLocalizedMessage(), translate("error"), JOptionPane.ERROR_MESSAGE);
@@ -2632,7 +2632,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
if (!export.cancelled) {
JFileChooser chooser = new JFileChooser();
if (Configuration.containsConfig("lastExportDir")) {
chooser.setCurrentDirectory(new java.io.File((String) Configuration.getConfig("lastExportDir", ".")));
chooser.setCurrentDirectory(new java.io.File(Configuration.getConfig("lastExportDir", ".")));
} else {
chooser.setCurrentDirectory(new File("."));
}
@@ -2661,7 +2661,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel
swf.exportMovies(errorHandler, selFile + File.separator + "movies");
swf.exportSounds(errorHandler, selFile + File.separator + "sounds", isMp3OrWav, isMp3OrWav);
swf.exportBinaryData(errorHandler, selFile + File.separator + "binaryData");
swf.exportActionScript(errorHandler, selFile, isPcode, (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE));
swf.exportActionScript(errorHandler, selFile, isPcode, Configuration.getConfig("parallelSpeedUp", true));
}
} catch (Exception ex) {
Logger.getLogger(MainFrame.class.getName()).log(Level.SEVERE, "Error during export", ex);

2
trunk/src/com/jpexs/decompiler/flash/gui/RenameDialog.java
View File

@@ -55,7 +55,7 @@ public class RenameDialog extends AppDialog implements ActionListener {
public RenameDialog() {
setSize(300, 150);
setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
int renameType = (Integer) Configuration.getConfig("lastRenameType", (Integer) 1);
int renameType = Configuration.getConfig("lastRenameType", 1);
ButtonGroup group = new ButtonGroup();
group.add(typeNumberRadioButton);
group.add(randomWordRadioButton);

2
trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java
View File

@@ -49,7 +49,7 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener {
cnt1.add(cnt, BorderLayout.CENTER);
String currentLanguage = (String) Configuration.getConfig("locale", Locale.getDefault().getLanguage());
String currentLanguage = Configuration.getConfig("locale", Locale.getDefault().getLanguage());
boolean found = false;
int enIndex = 0;
for (String code : languages) {

2
trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
View File

@@ -246,7 +246,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Fr
}
splitPane.setDividerLocation((Integer) Configuration.getConfig("gui.avm2.splitPane.dividerLocation", splitPane.getWidth() * 1 / 2));
splitPane.setDividerLocation(Configuration.getConfig("gui.avm2.splitPane.dividerLocation", splitPane.getWidth() * 1 / 2));
}

2
trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
View File

@@ -353,7 +353,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL
}
if (!cache.contains(scriptLeaf)) {
for (int scriptTraitIndex : scriptLeaf.traitIndices) {
hilightedCodeBuf.append(script.traits.traits[scriptTraitIndex].convertPackaged(scriptLeaf.getPath().toString(), abcList, abc, false, false, scriptIndex, -1, true, new ArrayList<String>(), (Boolean) Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)));
hilightedCodeBuf.append(script.traits.traits[scriptTraitIndex].convertPackaged(scriptLeaf.getPath().toString(), abcList, abc, false, false, scriptIndex, -1, true, new ArrayList<String>(), Configuration.getConfig("parallelSpeedUp", true)));
}
hilightedCode = hilightedCodeBuf.toString();

6
trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
View File

@@ -284,7 +284,7 @@ public class ActionPanel extends JPanel implements ActionListener {
@Override
public void run() {
editor.setText("; " + translate("work.disassembling") + "...");
if ((Boolean) Configuration.getConfig("decompile", Boolean.TRUE)) {
if (Configuration.getConfig("decompile", true)) {
decompiledEditor.setText("//" + translate("work.waitingfordissasembly") + "...");
}
DisassemblyListener listener = new DisassemblyListener() {
@@ -310,7 +310,7 @@ public class ActionPanel extends JPanel implements ActionListener {
srcWithHex = Helper.hexToComments(lastDisasm);
srcNoHex = Helper.stripComments(lastDisasm);
setHex(hexButton.isSelected());
if ((Boolean) Configuration.getConfig("decompile", Boolean.TRUE)) {
if (Configuration.getConfig("decompile", true)) {
decompiledEditor.setText("//" + translate("work.decompiling") + "...");
String stripped = "";
if (!useCache) {
@@ -535,7 +535,7 @@ public class ActionPanel extends JPanel implements ActionListener {
}
public void initSplits() {
int split = (Integer) Configuration.getConfig("gui.action.splitPane.dividerLocation", getWidth() / 2);
int split = Configuration.getConfig("gui.action.splitPane.dividerLocation", getWidth() / 2);
if (split == 0) {
split = getWidth() / 2;
}

2
trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
View File

@@ -169,7 +169,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
rri.setPos(prevLength);
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + hdrSize - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
if (deobfuscate) {
list = Action.removeNops(0, list, version, getPos() + hdrSize, toString()/*FIXME?*/);

2
trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
View File

@@ -115,7 +115,7 @@ public class DoActionTag extends Tag implements ASMSource {
baos.write(actionBytes);
ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
rri.setPos(prevLength);
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
if (deobfuscate) {
list = Action.removeNops(0, list, version, getPos(), toString()/*FIXME?*/);

2
trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
View File

@@ -124,7 +124,7 @@ public class DoInitActionTag extends CharacterIdTag implements ASMSource {
baos.write(actionBytes);
ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
rri.setPos(prevLength);
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + 2 - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
if (deobfuscate) {
list = Action.removeNops(0, list, version, getPos() + 2, toString()/*FIXME?*/);

2
trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
View File

@@ -169,7 +169,7 @@ public class BUTTONCONDACTION implements ASMSource, Exportable {
@Override
public List<Action> getActions(int version) {
try {
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + 4, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
if (deobfuscate) {
list = Action.removeNops(0, list, version, getPos() + 4, toString()/*FIXME?*/);

2
trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
View File

@@ -167,7 +167,7 @@ public class CLIPACTIONRECORD implements ASMSource, Exportable {
@Override
public List<Action> getActions(int version) {
try {
boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true);
boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + hdrPos, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
if (deobfuscate) {
list = Action.removeNops(0, list, version, getPos() + hdrPos, toString()/*FIXME?*/);

8
trunk/test/com/jpexs/decompiler/flash/ExportTest.java
View File

@@ -38,7 +38,7 @@ public class ExportTest {
@BeforeClass
public void addLogger() {
Configuration.setConfig("autoDeobfuscate", Boolean.TRUE);
Configuration.setConfig("autoDeobfuscate", true);
Logger logger = Logger.getLogger("");
logger.addHandler(new Handler() {
@Override
@@ -90,6 +90,12 @@ public class ExportTest {
public int handle(Throwable thrown) {
return AbortRetryIgnoreHandler.ABORT;
}
@Override
public AbortRetryIgnoreHandler getNewInstance() {
return this;
}
}, fdir.getAbsolutePath(), false, false);
} catch (Exception ex) {
fail();