diff --git a/trunk/build.xml b/trunk/build.xml index 6775ec079..0af929a68 100644 --- a/trunk/build.xml +++ b/trunk/build.xml @@ -9,7 +9,8 @@ - + + diff --git a/trunk/build_common.xml b/trunk/build_common.xml index b99da6da2..eff39e06a 100644 --- a/trunk/build_common.xml +++ b/trunk/build_common.xml @@ -43,8 +43,9 @@ - + @@ -63,7 +64,7 @@ - + diff --git a/trunk/src/com/jpexs/decompiler/flash/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/Configuration.java index c1e6fd42c..681210b31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/Configuration.java +++ b/trunk/src/com/jpexs/decompiler/flash/Configuration.java @@ -123,10 +123,12 @@ public class Configuration { config.putAll(map); } + @SuppressWarnings("unchecked") public static void loadFromFile(String file, String replacementsFile) { ObjectInputStream ois = null; try { ois = new ObjectInputStream(new FileInputStream(file)); + config = (HashMap) ois.readObject(); } catch (FileNotFoundException ex) { } catch (ClassNotFoundException cnf) { diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index 8b2506ba4..8d3349584 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -1244,6 +1244,7 @@ public class SWF { visited.add(ip); List branches = ins.getBranches(code); for (int b : branches) { + @SuppressWarnings("unchecked") Stack brStack = (Stack) stack.clone(); if (b >= 0) { getVariables(constantPool, localData, brStack, output, code, b, ip, variables, functions, visited); diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index af95049eb..165a2a304 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -529,6 +529,7 @@ public class SWFInputStream extends InputStream { return readActionList(listeners, address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen); } + @SuppressWarnings("unchecked") private static void getConstantPool(List listeners, ConstantPool cpool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, List constantPools, List visited, int version, int endIp) { boolean debugMode = false; boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true); @@ -669,6 +670,7 @@ public class SWFInputStream extends InputStream { visited.add(ip); List branches = ins.getBranches(code); for (int b : branches) { + @SuppressWarnings("unchecked") Stack brStack = (Stack) stack.clone(); if (b >= 0) { getConstantPool(listeners, cpool, localData, brStack, output, code, b, ip, constantPools, visited, version, endIp); @@ -794,6 +796,7 @@ public class SWFInputStream extends InputStream { return reta; } + @SuppressWarnings("unchecked") private static boolean readActionListAtPos(List listeners, List output, HashMap> containers, long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List ret, int startIp, int endip) throws IOException { boolean debugMode = false; boolean decideBranch = false; @@ -866,6 +869,7 @@ public class SWFInputStream extends InputStream { atos = a.toString(); } System.err.println("readActionListAtPos ip: " + (ip - startIp) + " (0x" + Helper.formatAddress(ip - startIp) + ") " + " action(len " + a.actionLength + "): " + atos + (a.isIgnored() ? " (ignored)" : "") + " stack:" + Helper.stackToString(stack, Helper.toList(cpool)) + " " + Helper.byteArrToString(a.getBytes(SWF.DEFAULT_VERSION))); + @SuppressWarnings("unchecked") HashMap vars = (HashMap) localData.get(1); System.err.print("variables: "); for (String v : vars.keySet()) { @@ -1082,6 +1086,7 @@ public class SWFInputStream extends InputStream { aif.ignoreUsed = true; aif.jumpUsed = true; int oldPos = rri.getPos(); + @SuppressWarnings("unchecked") Stack substack = (Stack) stack.clone(); if (readActionListAtPos(listeners, output, containers, address, containerSWFOffset, true, enableVariables, localData, substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip)) { retv = true; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index 43d825a01..f8f63a232 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -2160,6 +2160,7 @@ public class AVM2Code implements Serializable { public boolean skipUsed = false; } + @SuppressWarnings("unchecked") private static int removeTraps(boolean secondPass, boolean useVisited, List localData, Stack stack, List output, AVM2GraphSource code, int ip, int lastIp, HashMap visited, HashMap> visitedStates, HashMap decisions) { boolean debugMode = false; int ret = 0; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java index 3e079a29a..bbb22c4db 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java @@ -21,7 +21,7 @@ import java.util.Stack; public class LocalDataArea { - public Stack operandStack = new Stack(); - public Stack scopeStack = new Stack(); + public Stack operandStack = new Stack(); + public Stack scopeStack = new Stack(); public HashMap localRegisters = new HashMap(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index cd967a843..85b23177d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -109,7 +109,7 @@ public class AVM2Graph extends Graph { for (GraphPart head : g.heads) { populateParts(head, allParts); } - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add((Boolean) isStatic); localData.add((Integer) classIndex); localData.add(localRegs); @@ -1152,8 +1152,11 @@ public class AVM2Graph extends Graph { + @SuppressWarnings("unchecked") List parsedExceptions = (List) localData.get(DATA_PARSEDEXCEPTIONS); + @SuppressWarnings("unchecked") List finallyJumps = (List) localData.get(DATA_FINALLYJUMPS); + @SuppressWarnings("unchecked") List ignoredSwitches = (List) localData.get(DATA_IGNOREDSWITCHES); int ip = part.start; int addr = code.fixAddrAfterDebugLine(code.pos2adr(part.start)); @@ -1268,7 +1271,7 @@ public class AVM2Graph extends Graph { } } stack.add(new ExceptionTreeItem(catchedExceptions.get(e))); - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); localData2.addAll(localData); localData2.set(DATA_SCOPESTACK, new Stack()); catchedCommands.add(printGraph(new ArrayList(), localData2, stack, allParts, parent, npart, nepart, loops, forFinalCommands)); @@ -1493,6 +1496,7 @@ public class AVM2Graph extends Graph { @Override protected GraphPart checkPart(List localData, GraphPart next) { + @SuppressWarnings("unchecked") List finallyJumps = (List) localData.get(DATA_FINALLYJUMPS); for (int f : finallyJumps) { if (next.start == f) { @@ -1564,8 +1568,9 @@ public class AVM2Graph extends Graph { @Override public List prepareBranchLocalData(List localData) { - List ret = new ArrayList(); + List ret = new ArrayList(); ret.addAll(localData); + @SuppressWarnings("unchecked") Stack scopeStack = (Stack) ret.get(DATA_SCOPESTACK); Stack copyScopeStack = new Stack(); copyScopeStack.addAll(scopeStack); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java index 8b6b02199..b04104892 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java @@ -62,10 +62,13 @@ public class AVM2GraphSource extends GraphSource { return code.code.isEmpty(); } - @Override + @Override + @SuppressWarnings("unchecked") public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { - List ret = new ArrayList(); - ConvertOutput co = code.toSourceOutput(part, false, isStatic, scriptIndex, classIndex, localRegs, stack, (Stack) localData.get(AVM2Graph.DATA_SCOPESTACK), abc, abc.constants, abc.method_info, body, start, end, localRegNames, fullyQualifiedNames, new boolean[size()]); + List ret = new ArrayList(); + Object o=localData.get(AVM2Graph.DATA_SCOPESTACK); + Stack newstack=(Stack)o ; + ConvertOutput co = code.toSourceOutput(part, false, isStatic, scriptIndex, classIndex, localRegs, stack, newstack, abc, abc.constants, abc.method_info, body, start, end, localRegNames, fullyQualifiedNames, new boolean[size()]); ret.addAll(co.output); return ret; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index 73cd8cf81..91ff0ba68 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -243,6 +243,7 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { public List replaceWith; @Override + @SuppressWarnings("unchecked") public void translate(List localData, Stack stack, List output) { definition.translate((Boolean) localData.get(0), (Integer) localData.get(13), diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java index abfe54158..85a7335d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java @@ -35,6 +35,7 @@ public abstract class TreeItem extends GraphTargetItem { } @Override + @SuppressWarnings("unchecked") public String toString(List localData) { return toString((ConstantPool) localData.get(0), (HashMap) localData.get(1), (List) localData.get(2)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java index 6f133c4a4..f4698f106 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java @@ -22,7 +22,7 @@ import java.util.List; import javax.swing.ComboBoxModel; import javax.swing.event.ListDataListener; -public class ABCComboBoxModel implements ComboBoxModel { +public class ABCComboBoxModel implements ComboBoxModel { public List list; public int itemIndex = 0; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java index 9da64f6a7..5a675459f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java @@ -227,6 +227,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { } + @SuppressWarnings("unchecked") public ABCPanel(List list) { @@ -379,7 +380,8 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { JPanel panConstants = new JPanel(); panConstants.setLayout(new BorderLayout()); - constantTypeList = new JComboBox(new String[]{"UINT", "INT", "DOUBLE", "DECIMAL", "STRING", "NAMESPACE", "NAMESPACESET", "MULTINAME"}); + + constantTypeList = new JComboBox(new Object[]{"UINT", "INT", "DOUBLE", "DECIMAL", "STRING", "NAMESPACE", "NAMESPACESET", "MULTINAME"}); constantTable = new JTable(); if (abc != null) { autoResizeColWidth(constantTable, new UIntTableModel(abc)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java index 7f68cbb00..752972d32 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java @@ -42,6 +42,7 @@ public class DeobfuscationDialog extends JDialog implements ActionListener { public static final int LEVEL_REMOVE_TRAPS = 2; public static final int LEVEL_RESTORE_CONTROL_FLOW = 3; + @SuppressWarnings("unchecked") public DeobfuscationDialog() { setDefaultCloseOperation(HIDE_ON_CLOSE); setSize(new Dimension(300, 270)); @@ -58,6 +59,7 @@ public class DeobfuscationDialog extends JDialog implements ActionListener { cp.add(lab1); Hashtable labelTable = new Hashtable(); //labelTable.put(new Integer(LEVEL_NONE), new JLabel("None")); + labelTable.put(new Integer(LEVEL_REMOVE_DEAD_CODE), new JLabel("Remove dead code")); labelTable.put(new Integer(LEVEL_REMOVE_TRAPS), new JLabel("Remove traps")); labelTable.put(new Integer(LEVEL_RESTORE_CONTROL_FLOW), new JLabel("Restore control flow")); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java index 5895effad..391fb9480 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java @@ -20,8 +20,7 @@ import com.jpexs.decompiler.flash.gui.View; import java.awt.Component; import javax.swing.*; -public class IconListRenderer - extends DefaultListCellRenderer { +public class IconListRenderer extends DefaultListCellRenderer { private Icon constIcon; private Icon functionIcon; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java index 00cd4dd59..1c5206c3e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java @@ -24,7 +24,7 @@ import javax.swing.JList; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -public class TraitsList extends JList implements ListSelectionListener { +public class TraitsList extends JList implements ListSelectionListener { ABC abc; List abcTags; @@ -49,13 +49,15 @@ public class TraitsList extends JList implements ListSelectionListener { setCellRenderer(new IconListRenderer()); } + @SuppressWarnings("unchecked") public void setABC(List abcTags, ABC abc) { this.abc = abc; - this.abcTags = abcTags; + this.abcTags = abcTags; setModel(new DefaultListModel()); setClassIndex(-1, -1); } + @SuppressWarnings("unchecked") public void setClassIndex(int classIndex, int scriptIndex) { this.classIndex = classIndex; if (classIndex == -1) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java index bd0a6367b..d606db10b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java @@ -46,6 +46,7 @@ public class UsageFrame extends JFrame implements ActionListener, MouseListener private ABC abc; private ABCPanel abcPanel; + @SuppressWarnings("unchecked") public UsageFrame(List abcTags, ABC abc, int multinameIndex, ABCPanel abcPanel) { this.abcPanel = abcPanel; List usages = abc.findMultinameUsage(multinameIndex); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java index cbb280de6..027cce7ce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java @@ -26,7 +26,7 @@ import javax.swing.DefaultListModel; * * @author JPEXS */ -public class UsageListModel extends DefaultListModel { +public class UsageListModel extends DefaultListModel { private ABC abc; private List abcTags; @@ -37,15 +37,18 @@ public class UsageListModel extends DefaultListModel { } @Override + @SuppressWarnings("unchecked") public Object get(int index) { return ((MultinameUsage) super.get(index)).toString(abcTags, abc); } @Override + @SuppressWarnings("unchecked") public Object getElementAt(int index) { return ((MultinameUsage) super.getElementAt(index)).toString(abcTags, abc); } + @SuppressWarnings("unchecked") public MultinameUsage getUsage(int index) { return ((MultinameUsage) super.getElementAt(index)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index ca34e987a..186eb5c87 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -663,7 +663,8 @@ public class Action implements GraphSourceItem { } @Override - public void translate(List localData, Stack stack, List output) { + @SuppressWarnings("unchecked") + public void translate(List localData, Stack stack, List output) { translate(stack, output, (HashMap) localData.get(0), (HashMap) localData.get(1), (HashMap) localData.get(2)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/flv/FLVOutputStream.java b/trunk/src/com/jpexs/decompiler/flash/flv/FLVOutputStream.java index 525ca6d58..4e1e9479a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/flv/FLVOutputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/flv/FLVOutputStream.java @@ -188,6 +188,7 @@ public class FLVOutputStream extends OutputStream { writeSCRIPTDATASTRING((String) v.value); break; case 3: + @SuppressWarnings("unchecked") List objects = (List) v.value; for (SCRIPTDATAOBJECT o : objects) { writeSCRIPTDATAOBJECT(o); @@ -207,6 +208,7 @@ public class FLVOutputStream extends OutputStream { writeUI16((int) (Integer) v.value); break; case 8: + @SuppressWarnings("unchecked") List variables = (List) v.value; writeUI32(variables.size()); for (SCRIPTDATAVARIABLE var : variables) { @@ -218,6 +220,7 @@ public class FLVOutputStream extends OutputStream { //reserved break; case 10: + @SuppressWarnings("unchecked") List stvariables = (List) v.value; writeUI32(stvariables.size()); for (SCRIPTDATAVARIABLE var : stvariables) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java index cac2d3eec..ce6749ff2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java @@ -437,6 +437,7 @@ public class Graph { return part; } + @SuppressWarnings("unchecked") protected GraphTargetItem translatePartGetStack(List localData, GraphPart part, Stack stack) { stack = (Stack) stack.clone(); translatePart(localData, part, stack); @@ -862,7 +863,9 @@ public class Graph { } int stackSizeBefore = stack.size(); + @SuppressWarnings("unchecked") Stack trueStack = (Stack) stack.clone(); + @SuppressWarnings("unchecked") Stack falseStack = (Stack) stack.clone(); GraphTargetItem lopTrue = checkLoop(part.nextParts.get(1), stopPart, loops); GraphTargetItem lopFalse = null; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ExportDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/ExportDialog.java index 76e834e8c..3673fdcad 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/ExportDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ExportDialog.java @@ -63,7 +63,7 @@ public class ExportDialog extends JDialog { JLabel lab = new JLabel(optionNames[i]); lab.setBounds(10, top, 75, 25); cnt.add(lab); - combos[i] = new JComboBox(options[i]); + combos[i] = new JComboBox(options[i]); combos[i].setBounds(90, top, 125, 25); cnt.add(combos[i]); top += 25; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java index 3698bc7c8..1220e8570 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java @@ -71,9 +71,10 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene /** * Constructor */ + @SuppressWarnings("unchecked") public ProxyFrame() { - listModel = new SWFListModel(Configuration.getReplacements()); + listModel = new SWFListModel(Configuration.getReplacements()); swfList = new JList(listModel); swfList.addMouseListener(this); swfList.setFont(new Font("Monospaced", Font.PLAIN, 12));