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

logger classes fixed, added new events (swf, abc, method body parsed)

Browse Source
This commit is contained in:
[email protected]
2014-09-01 13:33:35 +02:00
parent c27eeafce4
commit 8325d07b24
26 changed files with 186 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+1 -3
View File
@@ -750,9 +750,7 @@ public class CommandLineArgumentParser {
} else {
classes = new String[]{classesStr};
}
for (String c : classes) {
ret.add(c);
}
ret.addAll(Arrays.asList(classes));
return ret;
}
src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
+2 -2
View File
@@ -443,7 +443,7 @@ public class GenericTagTreePanel extends GenericTagPanel {
val = ReflectionTools.newInstanceOf(field.getType());
ReflectionTools.setValue(obj, field, index, val);
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(GenericTagPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(GenericTagTreePanel.class.getName()).log(Level.SEVERE, null, ex);
return null;
}
}
@@ -695,7 +695,7 @@ public class GenericTagTreePanel extends GenericTagPanel {
try {
f.set(t, f.get(assigned));
} catch (IllegalArgumentException | IllegalAccessException ex) {
Logger.getLogger(GenericTagPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(GenericTagTreePanel.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
src/com/jpexs/decompiler/flash/gui/Main.java
+1 -1
View File
@@ -777,7 +777,7 @@ public class Main {
field.setAccessible(true);
field.set(null, null);
} catch (Throwable ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
logger.log(Level.SEVERE, null, ex);
}
UIManager.put("OptionPane.okButtonText", AppStrings.translate("button.ok"));
src/com/jpexs/decompiler/flash/gui/MainFrameClassicMenu.java
+1 -1
View File
@@ -492,7 +492,7 @@ public class MainFrameClassicMenu implements MainFrameMenu, ActionListener {
snode.binaryData.setModified(true);
saved = true;
} catch (IOException ex) {
Logger.getLogger(MainFrameRibbonMenu.class.getName()).log(Level.SEVERE, "Cannot save SWF", ex);
Logger.getLogger(MainFrameClassicMenu.class.getName()).log(Level.SEVERE, "Cannot save SWF", ex);
}
} else if (swf.file == null) {
saved = saveAs(swf, SaveFileMode.SAVEAS);
src/com/jpexs/decompiler/flash/gui/MainPanel.java
+8 -8
View File
@@ -628,7 +628,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
updateClassesList();
} catch (InterruptedException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
logger.log(Level.SEVERE, null, ex);
}
}
@@ -1347,7 +1347,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
try {
renameIdentifier(swf, identifier);
} catch (InterruptedException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
logger.log(Level.SEVERE, null, ex);
}
return null;
}
@@ -1463,7 +1463,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
try {
Desktop.getDesktop().open(selfile.getAbsoluteFile().getParentFile());
} catch (IOException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
logger.log(Level.SEVERE, null, ex);
}
}
}
@@ -1686,7 +1686,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
swf.exportActionScript(errorHandler, selFile, exportMode, Configuration.parallelSpeedUp.get());
}
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, "Error during export", ex);
logger.log(Level.SEVERE, "Error during export", ex);
View.showMessageDialog(null, translate("error.export") + ": " + ex.getClass().getName() + " " + ex.getLocalizedMessage());
}
return null;
@@ -1784,7 +1784,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
updateClassesList();
reload(true);
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, "Error during renaming identifiers", ex);
logger.log(Level.SEVERE, "Error during renaming identifiers", ex);
Main.stopWork();
View.showMessageDialog(null, translate("error.occured").replace("%error%", ex.getClass().getSimpleName()));
}
@@ -1834,7 +1834,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
abcPanel.detailPanel.methodTraitPanel.methodCodePanel.setBodyIndex(bi, abcPanel.abc, t);
}
} catch (Exception ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, "Deobfuscation error", ex);
logger.log(Level.SEVERE, "Deobfuscation error", ex);
}
return true;
}
@@ -2041,7 +2041,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
}
SWF.clearImageCache();
} catch (IOException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, "Invalid image", ex);
logger.log(Level.SEVERE, "Invalid image", ex);
View.showMessageDialog(null, translate("error.image.invalid"), translate("error"), JOptionPane.ERROR_MESSAGE);
}
reload(true);
@@ -2346,7 +2346,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
previewPanel.setMedia(soundThread);
soundThread.play();
} catch (LineUnavailableException | IOException | UnsupportedAudioFileException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
logger.log(Level.SEVERE, null, ex);
}
} else if (((tagObj instanceof FrameNodeItem) && ((FrameNodeItem) tagObj).isDisplayed()) || ((tagObj instanceof CharacterTag) || (tagObj instanceof FontTag)) && (tagObj instanceof Tag) || (tagObj instanceof SoundStreamHeadTypeTag)) {
showCard(CARDPREVIEWPANEL);
src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+1 -1
View File
@@ -830,7 +830,7 @@ public class PreviewPanel extends JSplitPane implements ActionListener {
}
showFlashViewerPanel();
} catch (IOException | com.jpexs.decompiler.flash.action.parser.ParseException ex) {
Logger.getLogger(MainPanel.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(PreviewPanel.class.getName()).log(Level.SEVERE, null, ex);
}
}
src/com/jpexs/decompiler/flash/gui/View.java
+1 -2
View File
@@ -17,7 +17,6 @@
package com.jpexs.decompiler.flash.gui;
import com.jpexs.decompiler.flash.configuration.ConfigurationItem;
import com.jpexs.helpers.Helper;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -534,7 +533,7 @@ public class View {
desktop.browse(uri);
return true;
} catch (URISyntaxException | IOException ex) {
Logger.getLogger(Helper.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(View.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java
+1 -1
View File
@@ -199,7 +199,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi
mb.code = new AVM2Code(ais);
} catch (UnknownInstructionCode re) {
mb.code = new AVM2Code();
Logger.getLogger(ABC.class.getName()).log(Level.SEVERE, null, re);
Logger.getLogger(ASMSourceEditorPane.class.getName()).log(Level.SEVERE, null, re);
}
mb.code.compact();
} else {