From 2492cd9d348fd9ccaa9fdae926b44bc541f62284 Mon Sep 17 00:00:00 2001 From: honfika Date: Wed, 13 Aug 2014 19:23:43 +0200 Subject: [PATCH] unnecessary dump info setting removed --- src/com/jpexs/decompiler/flash/SWFInputStream.java | 6 +++--- .../jpexs/decompiler/flash/configuration/Configuration.java | 4 ---- .../flash/gui/locales/AdvancedSettingsDialog.properties | 3 --- .../flash/gui/locales/AdvancedSettingsDialog_cs.properties | 3 --- .../flash/gui/locales/AdvancedSettingsDialog_fr.properties | 3 --- .../flash/gui/locales/AdvancedSettingsDialog_hu.properties | 3 --- .../flash/gui/locales/AdvancedSettingsDialog_ru.properties | 3 --- 7 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/SWFInputStream.java b/src/com/jpexs/decompiler/flash/SWFInputStream.java index 2fa125693..7e78d9730 100644 --- a/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -3288,9 +3288,9 @@ public class SWFInputStream implements AutoCloseable { public SWFInputStream getLimitedStream(int limit) throws IOException { SWFInputStream sis = new SWFInputStream(swf, is.getAllRead(), startingPos, (int) (is.getPos() + limit)); - if (Configuration.lazyDumpInfoCollecting.get()) { - sis.dumpInfo = dumpInfo; - } + + // uncomment the following line to turn off lazy dump info collecting + //sis.dumpInfo = dumpInfo; sis.seek(is.getPos() + startingPos); return sis; } diff --git a/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/src/com/jpexs/decompiler/flash/configuration/Configuration.java index 9536491d1..7fe65dfef 100644 --- a/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -96,10 +96,6 @@ public class Configuration { @ConfigurationCategory("display") public static final ConfigurationItem dumpView = null; - @ConfigurationDefaultBoolean(false) - @ConfigurationCategory("display") - public static final ConfigurationItem lazyDumpInfoCollecting = null; - @ConfigurationDefaultBoolean(false) @ConfigurationCategory("ui") public static final ConfigurationItem gotoMainClassOnStartup = null; diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index 3650aed90..dd7682928 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -60,9 +60,6 @@ config.description.decompile = You can disable AS decompilation, then only P-cod config.name.dumpView = Dump View config.description.dumpView = View raw data dump -config.name.lazyDumpInfoCollecting = Dump Info Collecting -config.description.lazyDumpInfoCollecting = Enable/disable information collecting for raw data view - config.name.parallelSpeedUp = Parallel SpeedUp config.description.parallelSpeedUp = Parallelism can speed up decompilation diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties index ada708e7f..53031c72d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties @@ -255,6 +255,3 @@ config.description.textExportExportFontFace = Vkl\u00e1dat soubory p\u00edsem do config.name.dumpView = Dump zobrazen\u00ed config.description.dumpView = Zobrazit dump raw dat - -config.name.lazyDumpInfoCollecting = Sb\u011br informac\u00ed pro dump -config.description.lazyDumpInfoCollecting = Povolit/Zak\u00e1zat sb\u011br informac\u00ed pro zobrazen\u00ed raw dat \ No newline at end of file diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index 7af586716..530b44553 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -60,9 +60,6 @@ config.description.decompile = Vous pouvez d\u00e9sactiver la d\u00e9compilation config.name.dumpView = Donn\u00e9es brutes config.description.dumpView = Voir les donn\u00e9es brutes -config.name.lazyDumpInfoCollecting = Recueillir les donn\u00e9es d'informations brutes -config.description.lazyDumpInfoCollecting = Activer/d\u00e9sactiver l'affichage des donn\u00e9es brutes - config.name.parallelSpeedUp = Acc\u00e9l\u00e9ration parall\u00e8le config.description.parallelSpeedUp = Le parall\u00e9lisme peut augmenter la vitesse de d\u00e9ompilation diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties index 0d951e1c0..b95916f88 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties @@ -60,9 +60,6 @@ config.description.decompile = Kikapcsolhatja az AS visszaford\u00edt\u00e1s\u00 config.name.dumpView = Dump N\u00e9zet config.description.dumpView = Nyers adatok mutat\u00e1sa -config.name.lazyDumpInfoCollecting = Dump Info Gy\u0171jt\u00e9s -config.description.lazyDumpInfoCollecting = Nyers adat n\u00e9zethez sz\u00fcks\u00e9ges inform\u00e1ci\u00f3k gy\u0171jt\u00e9s\u00e9nek enged\u00e9lyez\u00e9se/letilt\u00e1sa - config.name.parallelSpeedUp = P\u00e1rhuzamos gyors\u00edt\u00e1s config.description.parallelSpeedUp = P\u00e1rhuzamos\u00edt\u00e1s fel tudja gyors\u00edtani a visszaford\u00edt\u00e1st diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ru.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ru.properties index 08aed5a8d..6e1eeaa84 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ru.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ru.properties @@ -60,9 +60,6 @@ config.description.decompile = \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 config.name.dumpView = \u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043e\u0431\u0440\u0430\u0437\u0430 config.description.dumpView = \u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0441\u044b\u0440\u043e\u0433\u043e \u043e\u0431\u0440\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 -config.name.lazyDumpInfoCollecting = \u0421\u0431\u043e\u0440 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u0440\u0438 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435 \u043e\u0431\u0440\u0430\u0437\u0430 -config.description.lazyDumpInfoCollecting = \u0412\u043a\u043b / \u0412\u044b\u043a\u043b \u0441\u0431\u043e\u0440 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u0440\u0438 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435 \u043e\u0431\u0440\u0430\u0437\u0430 - config.name.parallelSpeedUp = Parallel SpeedUp config.description.parallelSpeedUp = \u0420\u0430\u0441\u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u0438\u0432\u0430\u043d\u0438\u0435 \u0432\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u0439 \u043f\u0440\u0438 \u0434\u0435\u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438 \u043c\u043e\u0436\u0435\u0442 \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u0435\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c