From 8393f063cbf59610661eb3e00e2681753a6f979a Mon Sep 17 00:00:00 2001 From: Honfika Date: Sun, 25 Aug 2013 08:47:42 +0200 Subject: [PATCH] using true/false values in getConfig methods everywhere --- .../decompiler/flash/abc/types/MethodBody.java | 2 +- .../com/jpexs/decompiler/flash/gui/Main.java | 18 +++++++++--------- .../jpexs/decompiler/flash/gui/MainFrame.java | 16 ++++++++-------- .../flash/gui/abc/DecompiledEditorPane.java | 2 +- .../flash/gui/action/ActionPanel.java | 4 ++-- .../com/jpexs/decompiler/flash/ExportTest.java | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java index b90bae53c..73d4cd6ea 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java @@ -116,7 +116,7 @@ public class MethodBody implements Cloneable, Serializable { if (pcode) { s += code.toASMSource(constants, this, false); } else { - if (!Configuration.getConfig("decompile", Boolean.TRUE)) { + if (!Configuration.getConfig("decompile", true)) { s = "//Decompilation skipped"; if (hilight) { s = Highlighting.hilighMethod(s, this.method_info); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java index d65dcdd5f..ab4d96615 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java @@ -218,7 +218,7 @@ public class Main { public void progress(int p) { startWork(translate("work.reading.swf"), p); } - }, Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)); + }, Configuration.getConfig("parallelSpeedUp", true)); locswf.addEventListener(new EventListener() { @Override public void handleEvent(String event, Object data) { @@ -604,7 +604,7 @@ public class Main { } private static void offerAssociation() { - boolean offered = 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,7 +612,7 @@ public class Main { } } } - Configuration.setConfig("offeredAssociation", Boolean.TRUE); + Configuration.setConfig("offeredAssociation", true); } public static void initLang() { @@ -914,7 +914,7 @@ public class Main { boolean exportOK; try { printHeader(); - SWF exfile = new SWF(new FileInputStream(inFile), 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, 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"), 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"), 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, 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, Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)); + exfile.exportXfl(handler, outDir.getAbsolutePath(), inFile.getName(), applicationName, applicationVerName, version, Configuration.getConfig("parallelSpeedUp", true)); exportOK = true; break; default: diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index 8cc9813ee..4121199b4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -700,7 +700,7 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel miInternalViewer.addActionListener(this); //miParallelSpeedUp = new JCheckBox(translate("menu.settings.parallelspeedup")); - miParallelSpeedUp.setSelected(Configuration.getConfig("parallelSpeedUp", Boolean.TRUE)); + miParallelSpeedUp.setSelected(Configuration.getConfig("parallelSpeedUp", true)); miParallelSpeedUp.setActionCommand("PARALLELSPEEDUP"); miParallelSpeedUp.addActionListener(this); @@ -716,18 +716,18 @@ public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSel menuBar.add(menuTools); //miDecompile = new JCheckBox(translate("menu.settings.disabledecompilation")); - miDecompile.setSelected(!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(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(Configuration.getConfig("gotoMainClassOnStartup", Boolean.FALSE)); + miGotoMainClassOnStartup.setSelected(Configuration.getConfig("gotoMainClassOnStartup", false)); miGotoMainClassOnStartup.setActionCommand("GOTODOCUMENTCLASSONSTARTUP"); miGotoMainClassOnStartup.addActionListener(this); @@ -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, Configuration.getConfig("parallelSpeedUp", Boolean.TRUE))); + ret.add(tls.export(selFile, abcList, isPcode, Configuration.getConfig("parallelSpeedUp", true))); } } else { List allNodes = new ArrayList<>(); @@ -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, 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, 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); @@ -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, 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); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java index a20996e43..0f3c5f236 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java @@ -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(), Configuration.getConfig("parallelSpeedUp", Boolean.TRUE))); + hilightedCodeBuf.append(script.traits.traits[scriptTraitIndex].convertPackaged(scriptLeaf.getPath().toString(), abcList, abc, false, false, scriptIndex, -1, true, new ArrayList(), Configuration.getConfig("parallelSpeedUp", true))); } hilightedCode = hilightedCodeBuf.toString(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index fb0cd54de..f7a155caa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -284,7 +284,7 @@ public class ActionPanel extends JPanel implements ActionListener { @Override public void run() { editor.setText("; " + translate("work.disassembling") + "..."); - if (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 (Configuration.getConfig("decompile", Boolean.TRUE)) { + if (Configuration.getConfig("decompile", true)) { decompiledEditor.setText("//" + translate("work.decompiling") + "..."); String stripped = ""; if (!useCache) { diff --git a/trunk/test/com/jpexs/decompiler/flash/ExportTest.java b/trunk/test/com/jpexs/decompiler/flash/ExportTest.java index cedd30220..e2d38b3ec 100644 --- a/trunk/test/com/jpexs/decompiler/flash/ExportTest.java +++ b/trunk/test/com/jpexs/decompiler/flash/ExportTest.java @@ -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