diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index cf0121416..ecf8e27f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -1142,7 +1142,7 @@ public class SWF { return null; } - private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, HashMap variables, List functions, List visited) { + private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, HashMap variables, List functions, List visited) { boolean debugMode = false; while ((ip > -1) && ip < code.size()) { if (visited.contains(ip)) { @@ -1243,7 +1243,7 @@ public class SWF { } private static void getVariables(HashMap variables, List functions, ActionGraphSource code, int addr) { - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); try { getVariables(null, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, variables, functions, new ArrayList()); } catch (Exception ex) { @@ -1255,9 +1255,7 @@ public class SWF { HashMap ret = new HashMap(); List actions = src.getActions(version); actionsMap.put(src, actions); - List ss = new ArrayList(); - ss.addAll(actions); - getVariables(variables, functions, new ActionGraphSource(ss, version, new HashMap(), new HashMap(), new HashMap()), 0); + getVariables(variables, functions, new ActionGraphSource(actions, version, new HashMap(), new HashMap(), new HashMap()), 0); return ret; } private HashMap> actionsMap = new HashMap>(); diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index fedbea697..850c9b3a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -529,7 +529,7 @@ public class SWFInputStream extends InputStream { return readActionList(listeners, address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen); } - 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) { + 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); while (((endIp == -1) || (endIp > ip)) && (ip > -1) && ip < code.size()) { @@ -556,7 +556,7 @@ public class SWFInputStream extends InputStream { output2s.add(new ArrayList()); continue; } - List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); List output2 = new ArrayList(); output2s.add(output2); getConstantPool(listeners, cpool, localData2, new Stack(), output2, code, code.adr2pos(endAddr), lastIp, constantPools, visited, version, code.adr2pos(endAddr + size)); @@ -595,7 +595,7 @@ public class SWFInputStream extends InputStream { if (ins instanceof ActionJump) { add += " change:" + (((ActionJump) ins).getJumpOffset()); } - System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList(), new ArrayList(), Helper.toList(cpool), version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool))); + System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList(), new ArrayList(), cpool.constants, version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool))); if (ip == 116) { System.err.println("kok"); } @@ -693,7 +693,7 @@ public class SWFInputStream extends InputStream { public static List getConstantPool(List listeners, ActionGraphSource code, int addr, int version) { List ret = new ArrayList(); - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); try { getConstantPool(listeners, null, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, ret, new ArrayList(), version, -1); } catch (Exception ex) { @@ -715,7 +715,7 @@ public class SWFInputStream extends InputStream { Stack stack = new Stack(); - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); SWFInputStream sis = new SWFInputStream(rri, version); @@ -737,7 +737,7 @@ public class SWFInputStream extends InputStream { } } } - List ret = new ArrayList(); + List ret = new ArrayList(); Action last = null; for (Action a : retdups) { if (a != last) { @@ -794,7 +794,7 @@ public class SWFInputStream extends InputStream { return reta; } - 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 { + 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; @@ -1047,7 +1047,7 @@ public class SWFInputStream extends InputStream { output2s.add(new ArrayList()); continue; } - List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); List output2 = new ArrayList(); readActionListAtPos(listeners, output2, containers, address, containerSWFOffset, notCompileTime, enableVariables, localData2, new Stack(), cpool, sis, rri, (int) endAddr, ret, startIp, (int) (endAddr + size)); output2s.add(output2); 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 22cc27ff8..43d825a01 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -551,7 +551,7 @@ public class AVM2Code implements Serializable { public AVM2Code() { } - public Object execute(HashMap arguments, ConstantPool constants) { + public Object execute(HashMap arguments, ConstantPool constants) { int pos = 0; LocalDataArea lda = new LocalDataArea(); lda.localRegisters = arguments; @@ -830,7 +830,7 @@ public class AVM2Code implements Serializable { cacheActual = false; } - private static String innerStackToString(List stack) { + private static String innerStackToString(List stack) { String ret = ""; for (int d = 0; d < stack.size(); d++) { Object o = stack.get(d); @@ -940,7 +940,7 @@ public class AVM2Code implements Serializable { } Stack cstack = new Stack(); cstack.push("catched " + body.exceptions[g].getVarName(constants)); - List outcatch = toSource(cstack, new Stack(), abc, constants, method_info, body, pos, endpos).output; + List outcatch = toSource(cstack, new Stack(), abc, constants, method_info, body, pos, endpos).output; output.addAll(outcatch); newip = endpos + 1; } @@ -1597,7 +1597,7 @@ public class AVM2Code implements Serializable { public int removeTraps(ConstantPool constants, MethodBody body, ABC abc, int scriptIndex, int classIndex, boolean isStatic) { removeDeadCode(constants, body); - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add((Boolean) isStatic); //isStatic localData.add((Integer) (classIndex)); //classIndex localData.add(new HashMap()); @@ -1922,8 +1922,8 @@ public class AVM2Code implements Serializable { } } - public void restoreControlFlow(int ip, HashMap> refs, int visited2[], HashMap appended) throws ConvertException { - List buf = new ArrayList(); + public void restoreControlFlow(int ip, HashMap> refs, int visited2[], HashMap> appended) throws ConvertException { + List buf = new ArrayList(); boolean cont = false; int continueip = 0; AVM2Instruction prev = null; @@ -1983,7 +1983,7 @@ public class AVM2Code implements Serializable { if ((newip < code.size()) && (refs.containsKey(newip) && refs.get(newip).size() == 1)) { if (!cont) { continueip = ip; - buf = new ArrayList(); + buf = new ArrayList(); appended.put(continueip, buf); } cont = true; @@ -2019,7 +2019,7 @@ public class AVM2Code implements Serializable { HashMap> refs; int visited2[] = new int[code.size()]; refs = visitCode(body); - HashMap appended = new HashMap(); + HashMap> appended = new HashMap>(); /*if (secondpass) { restoreControlFlow(code.size() - 1, refs, visited2, appended); } else*/ { @@ -2160,7 +2160,7 @@ public class AVM2Code implements Serializable { public boolean skipUsed = false; } - 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) { + 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; iploop: @@ -2339,7 +2339,7 @@ public class AVM2Code implements Serializable { return ret; } - public static int removeTraps(List localData, AVM2GraphSource code, int addr) { + public static int removeTraps(List localData, AVM2GraphSource code, int addr) { HashMap decisions = new HashMap(); removeTraps(false, false, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, new HashMap(), new HashMap>(), decisions); localData.set(2, new HashMap()); 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 917d8710e..3e079a29a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java @@ -23,5 +23,5 @@ public class LocalDataArea { public Stack operandStack = new Stack(); public Stack scopeStack = new Stack(); - public HashMap localRegisters = new HashMap(); + 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 9260fcfd9..cd967a843 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); @@ -1147,7 +1147,7 @@ public class AVM2Graph extends Graph { }*/ @Override - protected List check(GraphSource srcCode, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource srcCode, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { List ret = null; @@ -1268,7 +1268,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)); @@ -1492,7 +1492,7 @@ public class AVM2Graph extends Graph { } @Override - protected GraphPart checkPart(List localData, GraphPart next) { + protected GraphPart checkPart(List localData, GraphPart next) { List finallyJumps = (List) localData.get(DATA_FINALLYJUMPS); for (int f : finallyJumps) { if (next.start == f) { @@ -1563,8 +1563,8 @@ public class AVM2Graph extends Graph { } @Override - public List prepareBranchLocalData(List localData) { - List ret = new ArrayList(); + public List prepareBranchLocalData(List localData) { + List ret = new ArrayList(); ret.addAll(localData); Stack scopeStack = (Stack) ret.get(DATA_SCOPESTACK); Stack copyScopeStack = new Stack(); 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 4c2618eca..8b6b02199 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 @@ -63,7 +63,7 @@ public class AVM2GraphSource extends GraphSource { } @Override - public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { + 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()]); ret.addAll(co.output); 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 d423887ac..73cd8cf81 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 @@ -124,8 +124,8 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { return ret; } - public List getParamsAsList(ConstantPool constants) { - List s = new ArrayList(); + public List getParamsAsList(ConstantPool constants) { + List s = new ArrayList(); for (int i = 0; i < definition.operands.length; i++) { switch (definition.operands[i]) { case AVM2Code.DAT_MULTINAME_INDEX: @@ -240,10 +240,10 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { s += getParams(constants, fullyQualifiedNames) + getComment(); return s; } - public List replaceWith; + public List replaceWith; @Override - public void translate(List localData, Stack stack, List output) { + public void translate(List localData, Stack stack, List output) { definition.translate((Boolean) localData.get(0), (Integer) localData.get(13), (Integer) localData.get(1), diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java index c26b55675..42eb40861 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java @@ -68,7 +68,7 @@ public class InstructionDefinition implements Serializable { return s; } - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new UnsupportedOperationException("Instruction " + instructionName + " not implemented"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java index 9afe2c01d..3f1c3258b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java @@ -35,7 +35,7 @@ public class AddIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java index 7e5f70f95..8bbf21f9d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -35,7 +35,7 @@ public class DecrementIIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java index 77a98f406..7cb71cf3a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -35,7 +35,7 @@ public class DecrementIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java index ef2692ec4..702d0ab10 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java @@ -35,7 +35,7 @@ public class DivideIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o2 = lda.operandStack.pop(); Object o1 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java index c5c642e4b..7eba2c645 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -35,7 +35,7 @@ public class ModuloIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java index 4454de4e6..55d1dd0f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -35,7 +35,7 @@ public class MultiplyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java index a8594da75..99006b194 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java @@ -35,7 +35,7 @@ public class BitAndIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 & value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java index dfee38199..384345bba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java @@ -35,7 +35,7 @@ public class BitNotIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value = (Long) lda.operandStack.pop(); Long ret = new Long(-value.longValue()); lda.operandStack.push(ret); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java index f5a9d9255..02a0e9397 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java @@ -35,7 +35,7 @@ public class BitOrIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 | value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java index 9ac67fb8c..1e1ca81f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java @@ -35,7 +35,7 @@ public class BitXorIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 ^ value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java index d961625ca..63e74c19f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java @@ -35,7 +35,7 @@ public class EqualsIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj1 = lda.operandStack.pop(); Object obj2 = lda.operandStack.pop(); Boolean res = obj1.equals(obj2); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java index 357e75d84..fc27452b5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java @@ -46,9 +46,9 @@ public class ConstructIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java index 2dfb5316a..3f66dbe38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java @@ -39,10 +39,10 @@ public class ConstructPropIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); }*/ diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java index 53dc95a58..72a861fd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -37,9 +37,9 @@ public class ConstructSuperIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java index bcd1fa914..2f4921b4b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java @@ -37,9 +37,9 @@ public class CallIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java index d829c0ea4..c4b931861 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java @@ -37,10 +37,10 @@ public class CallMethodIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int methodIndex = (int) ((Long) arguments.get(0)).longValue(); //index of object's method int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java index 16fb2b39f..8516ca03f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -38,12 +38,12 @@ public class CallPropVoidIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //same as callproperty /* int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java index 6312c6455..e3f0a6f1f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java @@ -38,10 +38,10 @@ public class CallPropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java index e0d037f67..4c94b145a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java @@ -37,10 +37,10 @@ public class CallStaticIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int methodIndex = (int) ((Long) arguments.get(0)).longValue(); //index of method_info int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java index 649469250..9cbd912f4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java @@ -38,10 +38,10 @@ public class CallSuperIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java index d44ca49f1..6e3219570 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -38,10 +38,10 @@ public class CallSuperVoidIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java index 64144f98c..b3e2514eb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -38,7 +38,7 @@ public class DecLocalIIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int locRegIndex = (int) ((Long) arguments.get(0)).longValue(); Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java index 7cc6465d5..2d4827eb7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java @@ -38,7 +38,7 @@ public class DecLocalIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int locRegIndex = (int) ((Long) arguments.get(0)).longValue(); Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java index 7cff61c68..d19b3d835 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -37,7 +37,7 @@ public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java index b3866b335..6c2077fd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java @@ -35,7 +35,7 @@ public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(1)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java index 8b2f47d4a..3ed3c0b3b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java @@ -35,7 +35,7 @@ public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(2)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java index 6b557370d..a39b9e712 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java @@ -35,7 +35,7 @@ public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(3)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java index 26a415f2b..973c76d91 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java @@ -36,7 +36,7 @@ public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIn } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get((int) (long) (Long) arguments.get(0))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java index 1da87f7fd..7ae29ed5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java @@ -38,7 +38,7 @@ public class DeletePropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if multiname[multinameIndex] is runtime //pop(name) pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java index dfcd50003..5efd97e93 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java @@ -37,7 +37,7 @@ public class FindPropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java index 95e97c7b8..b3e15a0e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -37,7 +37,7 @@ public class FindPropertyStrictIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java index c551ce75e..9e43c0cca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java @@ -37,7 +37,7 @@ public class GetDescendantsIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java index 504cc7cca..f9fdaf2ad 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -36,7 +36,7 @@ public class GetGlobalScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new RuntimeException("getglobalscope not working"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java index 592ec7982..7086ccf81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java @@ -35,7 +35,7 @@ public class DupIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj); lda.operandStack.push(obj); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java index 464d45d6d..ba40c67a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java @@ -36,7 +36,7 @@ public class PopIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.pop(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java index 46962e732..e6222721b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java @@ -37,7 +37,7 @@ public class PopScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.scopeStack.pop(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java index d83e1b192..d9317413e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java @@ -36,7 +36,7 @@ public class PushByteIns extends InstructionDefinition implements PushIntegerTyp } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java index 177e05ebf..5c2eb12ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java @@ -36,7 +36,7 @@ public class PushDoubleIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java index 8c4ffac5a..bae43fb71 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java @@ -35,7 +35,7 @@ public class PushFalseIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(Boolean.FALSE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java index a4ca9355b..c41395bd3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java @@ -36,7 +36,7 @@ public class PushIntIns extends InstructionDefinition implements PushIntegerType } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java index faf43226d..2c846fab4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java @@ -34,7 +34,7 @@ public class PushScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.scopeStack.push(lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java index ded7601a2..84ad8ee13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java @@ -36,7 +36,7 @@ public class PushShortIns extends InstructionDefinition implements PushIntegerTy } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java index 3cf714eaf..0da81ce27 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java @@ -36,7 +36,7 @@ public class PushStringIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java index 398a6ad49..e0d06eea2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java @@ -35,7 +35,7 @@ public class PushTrueIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(Boolean.TRUE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java index 1981dd6d7..4f27a36f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java @@ -36,7 +36,7 @@ public class PushUIntIns extends InstructionDefinition implements PushIntegerTyp } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java index c2e7298a4..de70ac382 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java @@ -36,7 +36,7 @@ public class SwapIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj1 = lda.operandStack.pop(); Object obj2 = lda.operandStack.pop(); lda.operandStack.push(obj1); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java index 0872fef23..57c627dbd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java @@ -34,9 +34,9 @@ public class ApplyTypeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int argCount = (int) ((Long) arguments.get(0)).longValue(); - List params = new ArrayList(); + List params = new ArrayList(); for (int i = 0; i < argCount; i++) { params.add(lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java index a402f83d6..f90543e33 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java @@ -37,7 +37,7 @@ public class AsTypeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long typeIndex = (Long) arguments.get(0); Object obj = lda.operandStack.pop(); //if multiname[typeIndex]==obj diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java index f728e8c8c..fb5d94d81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java @@ -35,7 +35,7 @@ public class AsTypeLateIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object objClass = lda.operandStack.pop(); Object obj = lda.operandStack.pop(); //if obj.class=objClass diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java index 16f4890ba..657b0e532 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java @@ -39,7 +39,7 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //coerce any type } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java index 6496442dc..101f6b441 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java @@ -36,7 +36,7 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); //push and pop coerced value to specified type } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java index 386072cf2..18b066366 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java @@ -35,7 +35,7 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj.toString()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java index aaee52bf8..d31cb3300 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java @@ -35,7 +35,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); boolean bval; if (value instanceof Boolean) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java index 84e9a80d4..d9d91de48 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java @@ -35,7 +35,7 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); double ret; if (value == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java index 616c39fd6..ec2b4cd37 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java @@ -35,7 +35,7 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); long ret; if (value == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java index 8e7bf682c..75c678bce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java @@ -35,7 +35,7 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //throw if pop is not object } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java index 638ebd571..36cd984b8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java @@ -35,7 +35,7 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj.toString()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java index 34a9e3e7e..2bc85efed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java @@ -35,7 +35,7 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new UnsupportedOperationException("Cannot convert to uint "); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java index fbf6c29bb..be738686e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java @@ -35,7 +35,7 @@ public class CheckFilterIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //if pop() is not XML|XMLList throw } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java index f4efb98f6..fb849f241 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java @@ -38,7 +38,7 @@ public class DXNSIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int strIndex = (int) ((Long) arguments.get(0)).longValue(); String s = constants.constant_string[strIndex]; System.out.println("Set default XML space " + s); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java index 5296f4fba..75f82dd42 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java @@ -35,7 +35,7 @@ public class DXNSLateIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); System.out.println("Set default XML space " + s); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java index 681026663..878c7e662 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java @@ -35,7 +35,7 @@ public class EscXAttrIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); //escape lda.operandStack.push(s); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java index abd84af9c..4e7542e11 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java @@ -35,7 +35,7 @@ public class EscXElemIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); //escape lda.operandStack.push(s); 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 dd2ee2ada..abfe54158 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,7 +35,7 @@ public abstract class TreeItem extends GraphTargetItem { } @Override - public String toString(List localData) { + 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/avm2/treemodel/clauses/ForEachInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java index 4fff91621..e0d8f9c94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java @@ -65,7 +65,7 @@ public class ForEachInTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for each (") + expression.toString(localData) + ")\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java index 4f02a0cfd..42732fef7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java @@ -65,7 +65,7 @@ public class ForInTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for (") + expression.toString(localData) + hilight(")") + "\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java index 404ebbc77..be6a4c687 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java @@ -28,7 +28,7 @@ public class AddTreeItem extends BinaryOpItem { } @Override - public String toString(List localData) { + public String toString(List localData) { if (rightSide.precedence >= precedence) { String ret = ""; if (leftSide.precedence > precedence) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java index 5bd91405b..26645d7f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java @@ -115,7 +115,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi } public void exec() { - HashMap args = new HashMap(); + HashMap args = new HashMap(); args.put(0, new Object()); //object "this" args.put(1, new Long(466561)); //param1 Object o = abc.bodies[bodyIndex].code.execute(args, abc.constants); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index 9ca9258da..edd129156 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -71,7 +71,7 @@ public class TraitClass extends Trait implements TraitWithSlot { return "Class " + abc.constants.constant_multiname[name_index].toString(abc.constants, fullyQualifiedNames) + " slot=" + slot_id + " class_info=" + class_info + " metadata=" + Helper.intArrToString(metadata); } - private boolean parseUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { + private boolean parseUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { Namespace ns = abc.constants.constant_namespace[namespace_index]; if (name.equals("")) { name = "*"; @@ -116,7 +116,7 @@ public class TraitClass extends Trait implements TraitWithSlot { return false; } - private void parseImportsUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { + private void parseImportsUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { Namespace ns = abc.constants.constant_namespace[namespace_index]; if (name.equals("")) { name = "*"; @@ -269,7 +269,7 @@ public class TraitClass extends Trait implements TraitWithSlot { } } - private List getImportsUsages(List abcTags, ABC abc, List imports, List uses, List fullyQualifiedNames) { + private List getImportsUsages(List abcTags, ABC abc, List imports, List uses, List fullyQualifiedNames) { //constructor diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index e1f0c14df..4a0ba01b6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -21,7 +21,6 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.ValueKind; -import static com.jpexs.decompiler.flash.abc.types.traits.Trait.TRAIT_CONST; import com.jpexs.decompiler.flash.graph.Graph; import com.jpexs.decompiler.flash.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index 9698a0cda..ca34e987a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -379,19 +379,13 @@ public class Action implements GraphSourceItem { * @param hex Add hexadecimal? * @return ASM source as String */ - public static String actionsToString(List listeners, long address, List list, List importantOffsets, List constantPool, int version, boolean hex, long swfPos) { + public static String actionsToString(List listeners, long address, List list, List importantOffsets, List constantPool, int version, boolean hex, long swfPos) { long offset; if (importantOffsets == null) { //setActionsAddresses(list, 0, version); importantOffsets = getActionsAllRefs(list, version); } - List srcList = new ArrayList(); - for (Object o : list) { - if (o instanceof Action) { - srcList.add((Action) o); - } - } - List cps = SWFInputStream.getConstantPool(new ArrayList(), new ActionGraphSource(srcList, version, new HashMap(), new HashMap(), new HashMap()), 0, version); + List cps = SWFInputStream.getConstantPool(new ArrayList(), new ActionGraphSource(list, version, new HashMap(), new HashMap(), new HashMap()), 0, version); if (!cps.isEmpty()) { setConstantPool(list, cps.get(cps.size() - 1)); } @@ -401,9 +395,9 @@ public class Action implements GraphSourceItem { int pos = -1; boolean lastPush = false; StringBuilder ret = new StringBuilder(); - for (GraphSourceItem s : srcList) { + for (GraphSourceItem s : list) { for (int i = 0; i < listeners.size(); i++) { - listeners.get(i).progress("toString", pos + 2, srcList.size()); + listeners.get(i).progress("toString", pos + 2, list.size()); } Action a = null; if (s instanceof Action) { @@ -552,7 +546,7 @@ public class Action implements GraphSourceItem { * @param hex Add hexadecimal * @return String of P-code source */ - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { return toString(); } @@ -669,7 +663,7 @@ public class Action implements GraphSourceItem { } @Override - public void translate(List localData, Stack stack, List output) { + public void translate(List localData, Stack stack, List output) { translate(stack, output, (HashMap) localData.get(0), (HashMap) localData.get(1), (HashMap) localData.get(2)); } @@ -730,17 +724,11 @@ public class Action implements GraphSourceItem { logger.fine(s); } - public static List actionsPartToTree(HashMap registerNames, HashMap variables, HashMap functions, Stack stack, List src, int start, int end, int version) { - List actions = new ArrayList(); - for (GraphSourceItem s : src) { - if (s instanceof Action) { - actions.add((Action) s); - } - } + public static List actionsPartToTree(HashMap registerNames, HashMap variables, HashMap functions, Stack stack, List actions, int start, int end, int version) { if (start < actions.size() && (end > 0) && (start > 0)) { log("Entering " + start + "-" + end + (actions.size() > 0 ? (" (" + actions.get(start).toString() + " - " + actions.get(end == actions.size() ? end - 1 : end) + ")") : "")); } - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(registerNames); localData.add(variables); localData.add(functions); @@ -807,7 +795,7 @@ public class Action implements GraphSourceItem { outs.add(new ArrayList()); continue; } - List out = ActionGraph.translateViaGraph(cnt.getRegNames(), variables, functions, src.subList(adr2ip(actions, endAddr, version), adr2ip(actions, endAddr + size, version)), version); + List out = ActionGraph.translateViaGraph(cnt.getRegNames(), variables, functions, actions.subList(adr2ip(actions, endAddr, version), adr2ip(actions, endAddr + size, version)), version); outs.add(out); endAddr += size; } @@ -1251,7 +1239,7 @@ public class Action implements GraphSourceItem { return ret; } - public static void setConstantPool(List actions, ConstantPool cpool) { + public static void setConstantPool(List actions, ConstantPool cpool) { for (GraphSourceItem a : actions) { if (a instanceof ActionPush) { if (cpool != null) { @@ -1271,7 +1259,7 @@ public class Action implements GraphSourceItem { } } - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { return getASMSource(container, knownAddreses, constantPool, version, hex); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java index 635eec2ae..5b240c9bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java @@ -53,7 +53,7 @@ import java.util.Stack; */ public class ActionGraph extends Graph { - public ActionGraph(List code, HashMap registerNames, HashMap variables, HashMap functions, int version) { + public ActionGraph(List code, HashMap registerNames, HashMap variables, HashMap functions, int version) { super(new ActionGraphSource(code, version, registerNames, variables, functions), new ArrayList()); //this.version = version; /*heads = makeGraph(code, new ArrayList()); @@ -63,10 +63,10 @@ public class ActionGraph extends Graph { }*/ } - public static List translateViaGraph(HashMap registerNames, HashMap variables, HashMap functions, List code, int version) { + public static List translateViaGraph(HashMap registerNames, HashMap variables, HashMap functions, List code, int version) { ActionGraph g = new ActionGraph(code, registerNames, variables, functions, version); - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(registerNames); return g.translate(localData); } @@ -124,7 +124,7 @@ public class ActionGraph extends Graph { } @Override - protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { if (!output.isEmpty()) { if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) { StoreRegisterTreeItem str = (StoreRegisterTreeItem) output.get(output.size() - 1); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java index 55b9abb53..30bb66676 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java @@ -18,17 +18,17 @@ import java.util.logging.Logger; */ public class ActionGraphSource extends GraphSource { - private List actions; + private List actions; public int version; private HashMap registerNames; private HashMap variables; private HashMap functions; - public List getActions() { + public List getActions() { return actions; } - public ActionGraphSource(List actions, int version, HashMap registerNames, HashMap variables, HashMap functions) { + public ActionGraphSource(List actions, int version, HashMap registerNames, HashMap variables, HashMap functions) { this.actions = actions; this.version = version; this.registerNames = registerNames; @@ -56,7 +56,7 @@ public class ActionGraphSource extends GraphSource { } @Override - public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { + public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { return (Action.actionsPartToTree(registerNames, variables, functions, stack, actions, start, end, version)); } private List posCache = null; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index a78ff9cae..c7c151131 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -19,23 +19,6 @@ package com.jpexs.decompiler.flash.action.parser.script; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_BITAND; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_BITOR; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_DIVIDE; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MINUS; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MODULO; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MULTIPLY; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_PLUS; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_SHIFT_LEFT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_SHIFT_RIGHT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_USHIFT_RIGHT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_XOR; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.DECREMENT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.DO; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.INCREMENT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.PARENT_OPEN; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.SWITCH; import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; import com.jpexs.decompiler.flash.action.swf3.ActionPlay; import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index 03ca5aa5a..c90d12b15 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -82,7 +82,7 @@ public class ActionIf extends Action { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset); return "If loc" + ofsStr + (compileTime ? " ;compileTime" : ""); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index a2900d3d4..683939d03 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -81,7 +81,7 @@ public class ActionJump extends Action { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset); return "Jump loc" + ofsStr; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index 3cbe20678..bcc788cae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -199,7 +199,7 @@ public class ActionPush extends Action { } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { if (replacement == null || replacement.size() < values.size()) { return toString(); } @@ -210,7 +210,7 @@ public class ActionPush extends Action { return ts; } - public String paramsToStringReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String paramsToStringReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { if (replacement == null || replacement.size() < values.size()) { return paramsToString(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index 6ab6b9973..2af65c968 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -156,7 +156,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String paramStr = ""; for (int i = 0; i < paramNames.size(); i++) { paramStr += "\"" + Helper.escapeString(paramNames.get(i)) + "\""; @@ -167,7 +167,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index f5933e3e8..5f0410e78 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -86,7 +86,7 @@ public class ActionWith extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { return "With {"; // + "\r\n" + Action.actionsToString(getAddress() + 2, getItems(container), knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}"; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index 6a55408b1..f08019fc9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -234,7 +234,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; @@ -251,7 +251,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String paramStr = ""; for (int i = 0; i < paramNames.size(); i++) { paramStr += paramRegisters.get(i) + " \"" + Helper.escapeString(paramNames.get(i)) + "\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index dbddf217c..55d19cbc7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -153,7 +153,7 @@ public class ActionTry extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ret = ""; ret += "Try "; if (catchBlockFlag) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java index f2f41d3eb..b0513cff0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java @@ -124,7 +124,7 @@ public class DirectValueTreeItem extends TreeItem { } @Override - public String toStringNoQuotes(List localData) { + public String toStringNoQuotes(List localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { return hilight("0"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java index d63596676..3b4984d30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java @@ -35,7 +35,7 @@ public class ExtendsTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); return subclass.toString(localData) + hilight(" extends ") + stripQuotes(superclass, constants); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java index 28ff54cbe..745cc7475 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.treemodel; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java index 656c35853..c4300454a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java @@ -20,7 +20,6 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java index b0cdfaed6..9730a64f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.treemodel; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java index 6e9a9330f..ddb10f312 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java @@ -60,7 +60,7 @@ public abstract class TreeItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { if (localData.isEmpty()) { ConstantPool c = null; return toString(c); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java index 4627101ca..5dbfdbfbe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java @@ -52,7 +52,7 @@ public class TryTreeItem extends TreeItem implements Block { public String toString(ConstantPool constants) { String ret = ""; ret += "try\r\n{\r\n"; - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java index fb3db8fe9..caead584c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java @@ -43,7 +43,7 @@ public class WithTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { String ret; - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); ret = hilight("with(") + scope.toString(localData) + hilight(")\r\n{\r\n"); for (GraphTargetItem ti : items) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java index ab506abd5..b937d9359 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java @@ -41,7 +41,7 @@ public abstract class BinaryOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; if (leftSide.getPrecedence() > precedence) { ret += "(" + leftSide.toString(localData) + ")"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java index e61904a90..8ed3e4621 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java @@ -16,7 +16,7 @@ public class BreakItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return hilight("break") + " " + "loop" + loopId; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java index a3cc3d908..02dc4c6ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java @@ -16,7 +16,7 @@ public class ContinueItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return hilight("continue") + " " + "loop" + loopId; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java index 5c0b96e46..05e3ecb7f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java @@ -43,7 +43,7 @@ public class DoWhileItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("do\r\n{") + "\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java index 550e07739..f5ef95a88 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java @@ -40,7 +40,7 @@ public class DuplicateItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return value.toString(localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java index 8e87262bb..3a1576145 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java @@ -51,7 +51,7 @@ public class ForTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for("); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java index 83c12e530..06e8dde19 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java @@ -297,12 +297,12 @@ public class Graph { return part; } - public static List translateViaGraph(List localData, String path, GraphSource code, List alternateEntries) { + public static List translateViaGraph(List localData, String path, GraphSource code, List alternateEntries) { Graph g = new Graph(code, alternateEntries); return g.translate(localData); } - public List translate(List localData) { + public List translate(List localData) { List allParts = new ArrayList(); for (GraphPart head : heads) { populateParts(head, allParts); @@ -429,21 +429,21 @@ public class Graph { return false; } - protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { return null; } - protected GraphPart checkPart(List localData, GraphPart part) { + protected GraphPart checkPart(List localData, GraphPart part) { return part; } - protected GraphTargetItem translatePartGetStack(List localData, GraphPart part, Stack stack) { + protected GraphTargetItem translatePartGetStack(List localData, GraphPart part, Stack stack) { stack = (Stack) stack.clone(); translatePart(localData, part, stack); return stack.pop(); } - protected List translatePart(List localData, GraphPart part, Stack stack) { + protected List translatePart(List localData, GraphPart part, Stack stack) { List sub = part.getSubParts(); List ret = new ArrayList(); int end = 0; @@ -463,7 +463,7 @@ public class Graph { return ret; } - protected List printGraph(List visited, List localData, Stack stack, List allParts, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, HashMap> forFinalCommands) { + protected List printGraph(List visited, List localData, Stack stack, List allParts, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, HashMap> forFinalCommands) { if (visited.contains(part)) { //return new ArrayList(); } else { @@ -1355,7 +1355,7 @@ public class Graph { */ public static String graphToString(List tree, Object... localData) { StringBuilder ret = new StringBuilder(); - List localDataList = new ArrayList(); + List localDataList = new ArrayList(); for (Object o : localData) { localDataList.add(o); } @@ -1452,7 +1452,7 @@ public class Graph { return ret.toString(); } - public List prepareBranchLocalData(List localData) { + public List prepareBranchLocalData(List localData) { return localData; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java index 16c581f3b..02b1a3024 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java @@ -18,7 +18,7 @@ public abstract class GraphSource { public abstract boolean isEmpty(); - public abstract List translatePart(GraphPart part, List localData, Stack stack, int start, int end); + public abstract List translatePart(GraphPart part, List localData, Stack stack, int start, int end); private void visitCode(int ip, int lastIp, HashMap> refs, int endIp) { boolean debugMode = false; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java index de8d456b1..913c9bac8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java @@ -9,7 +9,7 @@ import java.util.Stack; */ public interface GraphSourceItem { - public void translate(List localData, Stack stack, List output); + public void translate(List localData, Stack stack, List output); public boolean isJump(); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java index 7423442c9..56d107471 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java @@ -64,12 +64,12 @@ public abstract class GraphTargetItem { return Highlighting.hilighOffset(str, src.getOffset()); } - public String toStringSemicoloned(List localData) { + public String toStringSemicoloned(List localData) { return toString(localData) + (needsSemicolon() ? ";" : ""); } public String toStringSemicoloned(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -85,10 +85,10 @@ public abstract class GraphTargetItem { return this.getClass().getName(); } - public abstract String toString(List localData); + public abstract String toString(List localData); public String toString(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -119,12 +119,12 @@ public abstract class GraphTargetItem { return Double.compare(toNumber(), 0.0) != 0; } - public String toStringNoQuotes(List localData) { + public String toStringNoQuotes(List localData) { return toString(localData); } public String toStringNoQuotes(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -144,7 +144,7 @@ public abstract class GraphTargetItem { } public String toStringNL(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java index a41697983..881a17012 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java @@ -46,7 +46,7 @@ public class IfItem extends GraphTargetItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret; ret = hilight("if(") + expression.toString(localData) + hilight(")") + "\r\n{\r\n"; for (GraphTargetItem ti : onTrue) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java index a316d875b..8ea1c69c5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java @@ -29,7 +29,7 @@ public class ScriptEndItem extends GraphTargetItem implements ExitItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return ""; } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java index dd9e2d41f..5cde68ba4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java @@ -45,7 +45,7 @@ public class SwitchItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loopswitch" + loop.id + ":\r\n"; ret += hilight("switch(") + switchedObject.toString(localData) + hilight(")") + "\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java index a6fd7b892..62f75ff04 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java @@ -32,7 +32,7 @@ public class TernarOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return expression.toString(localData) + hilight("?") + onTrue.toString(localData) + hilight(":") + onFalse.toString(localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java index 90c51f067..8c074a94d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java @@ -13,7 +13,7 @@ public class TrueItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return "true"; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java index 0f032fea8..d496d54a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java @@ -30,7 +30,7 @@ public abstract class UnaryOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { String s = (value == null ? "null" : value.toString(localData)); if (value != null) { if (value.precedence > precedence) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java index a81ccc47c..8e203f1f4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java @@ -38,7 +38,7 @@ public class WhileItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; String expStr = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java index 5bc2d292b..3a72c55ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java @@ -17,8 +17,6 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.Main; -import static com.jpexs.decompiler.flash.Main.projectPage; -import static com.jpexs.decompiler.flash.Main.shortApplicationName; import com.jpexs.decompiler.flash.Version; import java.awt.Container; import java.awt.Dimension; @@ -130,7 +128,7 @@ public class NewVersionDialog extends JDialog implements ActionListener { } } if (desktop == null) { - JOptionPane.showMessageDialog(null, "New version of " + shortApplicationName + " is available: " + latestVersion.appName + ".\r\nPlease go to " + projectPage + " to download it.", "New version", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "New version of " + Main.shortApplicationName + " is available: " + latestVersion.appName + ".\r\nPlease go to " + Main.projectPage + " to download it.", "New version", JOptionPane.INFORMATION_MESSAGE); } } setVisible(false); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java index dcdec5771..76c4d00ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java @@ -29,7 +29,7 @@ public class SHELLEXECUTEINFO extends Structure { public HANDLE hProcess; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "fMask", "hwnd", "lpVerb", "lpFile", "lpParameters", "lpDirectory", "nShow", "hInstApp", "lpIDList", "lpClass", "hKeyClass", "dwHotKey", "hMonitor", "hProcess"}); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java index cd7cb2b4f..c99a4752a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java @@ -173,7 +173,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public int dwHighDateTime; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLowDateTime", "dwHighDateTime"}); } @@ -300,7 +300,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public short wMilliseconds; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wYear", "wMonth", "wDayOfWeek", "wDay", "wHour", "wMinute", "wSecond", "wMilliseconds"}); } } @@ -395,7 +395,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public HANDLE hEvent; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Internal", "InternalHigh", "Offset", "OffsetHigh", "hEvent"}); } } @@ -429,7 +429,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public WORD wReserved; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wProcessorArchitecture", "wReserved"}); } } @@ -510,7 +510,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public WORD wProcessorRevision; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"processorArchitecture", "dwPageSize", "lpMinimumApplicationAddress", "lpMaximumApplicationAddress", "dwActiveProcessorMask", "dwNumberOfProcessors", "dwProcessorType", "dwAllocationGranularity", "wProcessorLevel", "wProcessorRevision"}); } } @@ -571,7 +571,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public DWORDLONG ullAvailExtendedVirtual; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "dwMemoryLoad", "ullTotalPhys", "ullAvailPhys", "ullTotalPageFile", "ullAvailPageFile", "ullTotalVirtual", "ullAvailVirtual", "ullAvailExtendedVirtual"}); } @@ -605,7 +605,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public boolean bInheritHandle; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "lpSecurityDescriptor", "bInheritHandle"}); } @@ -767,7 +767,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public HANDLE hStdError; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cb", "lpReserved", "lpDesktop", "lpTitle", "dwX", "dwY", "dwXSize", "dwYSize", "dwXCountChars", "dwYCountChars", "dwFillAttribute", "dwFlags", "wShowWindow", "cbReserved2", "lpReserved2", "hStdInput", "hStdOutput", "hStdError"}); } @@ -811,7 +811,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public DWORD dwThreadId; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"hProcess", "hThread", "dwProcessId", "dwThreadId"}); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java index 4b86340e3..1250bc6f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java @@ -609,7 +609,7 @@ public interface WinDef extends StdCallLibrary { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"left", "top", "right", "bottom"}); } @@ -870,7 +870,7 @@ public interface WinDef extends StdCallLibrary { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"x", "y"}); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java index cc5336824..935820f26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java @@ -228,7 +228,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD Attributes; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Luid", "Attributes"}); } @@ -258,7 +258,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public LUID_AND_ATTRIBUTES Privileges[]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"PrivilegeCount", "Privileges"}); } @@ -468,7 +468,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public char[] FileName = new char[1]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"NextEntryOffset", "Action", "FileNameLength", "FileName"}); } @@ -700,7 +700,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public int HighPart; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } } @@ -720,7 +720,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD HighPart; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } } @@ -733,7 +733,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public UNION u; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"u"}); } @@ -1235,7 +1235,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public char szCSDVersion[]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion"}); } @@ -1312,7 +1312,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public byte wReserved; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion", "wServicePackMajor", "wServicePackMinor", "wSuiteMask", "wProductType", "wReserved"}); } @@ -1489,7 +1489,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD DataOffset; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Length", "Reserved", "RecordNumber", "TimeGenerated", "TimeWritten", "EventID", "EventType", "NumStrings", "EventCategory", "ReservedFlags", "ClosingRecordNumber", "StringOffset", "UserSidLength", "UserSidOffset", "DataLength", "DataOffset"}); } @@ -1588,7 +1588,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public byte[] data; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"data"}); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java index 9e3ab2450..2c2aef8d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java @@ -88,7 +88,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public RECT rcCaret; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "flags", "hwndActive", "hwndFocus", "hwndCapture", "hwndMenuOwner", "hwndMoveSize", "hwndCaret", "rcCaret"}); @@ -109,7 +109,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public short wCreatorVersion; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "rcWindow", "rcClient", "dwStyle", "dwExStyle", "dwWindowStatus", "cxWindowBorders", "cyWindowBorders", "atomWindowType", @@ -155,7 +155,7 @@ public interface WinUser extends StdCallLibrary, WinDef { } @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"x", "y"}); } } @@ -170,7 +170,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public POINT pt; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"hWnd", "message", "wParam", "lParam", "time", "pt"}); } @@ -185,7 +185,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int dwTimeout; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "hWnd", "dwFlags", "uCount", "dwTimeout"}); } @@ -220,7 +220,7 @@ public interface WinUser extends StdCallLibrary, WinDef { } @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cx", "cy"}); } } @@ -237,7 +237,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public byte AlphaFormat; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"BlendOp", "BlendFlags", "SourceConstantAlpha", "AlphaFormat"}); } @@ -338,7 +338,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"vkCode", "scanCode", "flags", "time", "dwExtraInfo"}); } @@ -571,7 +571,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public WinDef.WORD wParamH; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"uMsg", "wParamL", "wParamH"}); } } @@ -608,7 +608,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public INPUT_UNION input = new INPUT_UNION(); @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"type", "input"}); } @@ -699,7 +699,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public BaseTSD.ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wVk", "wScan", "dwFlags", "time", "dwExtraInfo"}); } @@ -736,7 +736,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public BaseTSD.ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dx", "dy", "mouseData", "dwFlags", "time", "dwExtraInfo"}); } @@ -752,7 +752,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int dwTime; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "dwTime"}); } } @@ -845,7 +845,7 @@ public interface WinUser extends StdCallLibrary, WinDef { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "style", "lpfnWndProc", "cbClsExtra", "cbWndExtra", "hInstance", "hIcon", "hCursor", "hbrBackground", "lpszMenuName", diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java index af605921f..7169b5172 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java @@ -280,8 +280,8 @@ public class Helper { } } - public static List toList(Object... rest) { - List ret = new ArrayList(); + public static List toList(Object... rest) { + List ret = new ArrayList(); for (Object o : rest) { ret.add(o); } @@ -338,7 +338,7 @@ public class Helper { return str.replaceAll("([^\r\n]*)(\r?\n)", "; $1$2"); } - public static String stackToString(Stack stack, List localData) { + public static String stackToString(Stack stack, List localData) { String ret = "["; for (int i = stack.size() - 1; i >= 0; i--) { if (i < stack.size() - 1) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 748ba2f37..737d0c209 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import static com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag.FORMAT_24BIT_RGB; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.types.ALPHABITMAPDATA; @@ -57,7 +56,7 @@ public class DefineBitsLossless2Tag extends ImageTag implements AloneTag { public void setImage(byte data[]) throws IOException { BufferedImage image = ImageIO.read(new ByteArrayInputStream(data)); ALPHABITMAPDATA bitmapData = new ALPHABITMAPDATA(); - bitmapFormat = FORMAT_24BIT_RGB; + bitmapFormat = DefineBitsLosslessTag.FORMAT_24BIT_RGB; bitmapWidth = image.getWidth(); bitmapHeight = image.getHeight(); bitmapData.bitmapPixelData = new ARGB[bitmapWidth * bitmapHeight]; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java index a322df425..81b47d6f8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.tags.base; -import static com.jpexs.decompiler.flash.SWF.hasErrorHeader; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.Tag; import java.awt.image.BufferedImage; import java.io.IOException; @@ -43,7 +43,7 @@ public abstract class ImageTag extends CharacterTag { } public static String getImageFormat(byte data[]) { - if (hasErrorHeader(data)) { + if (SWF.hasErrorHeader(data)) { return "jpg"; } if (data.length > 2 && ((data[0] & 0xff) == 0xff) && ((data[1] & 0xff) == 0xd8)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index be3b5384f..5d1af92b6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -16,6 +16,7 @@ */ package com.jpexs.decompiler.flash.xfl; +import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.Main; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; @@ -58,7 +59,6 @@ import com.jpexs.decompiler.flash.types.BUTTONRECORD; import com.jpexs.decompiler.flash.types.CXFORM; import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA; import com.jpexs.decompiler.flash.types.FILLSTYLE; -import static com.jpexs.decompiler.flash.types.FILLSTYLE.*; import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY; import com.jpexs.decompiler.flash.types.GRADIENT; import com.jpexs.decompiler.flash.types.GRADRECORD; @@ -263,7 +263,7 @@ public class XFLConverter { String ret = ""; //ret += ""; switch (fs.fillStyleType) { - case SOLID: + case FILLSTYLE.SOLID: ret += "= 3) { ret += fs.colorA.toHexRGB(); @@ -276,10 +276,10 @@ public class XFLConverter { } ret += " />"; break; - case REPEATING_BITMAP: - case CLIPPED_BITMAP: - case NON_SMOOTHED_REPEATING_BITMAP: - case NON_SMOOTHED_CLIPPED_BITMAP: + case FILLSTYLE.REPEATING_BITMAP: + case FILLSTYLE.CLIPPED_BITMAP: + case FILLSTYLE.NON_SMOOTHED_REPEATING_BITMAP: + case FILLSTYLE.NON_SMOOTHED_CLIPPED_BITMAP: ret += ""; ret += ""; break; - case LINEAR_GRADIENT: - case RADIAL_GRADIENT: - case FOCAL_RADIAL_GRADIENT: + case FILLSTYLE.LINEAR_GRADIENT: + case FILLSTYLE.RADIAL_GRADIENT: + case FILLSTYLE.FOCAL_RADIAL_GRADIENT: - if (fs.fillStyleType == LINEAR_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.LINEAR_GRADIENT) { ret += ""; GRADRECORD records[]; - if (fs.fillStyleType == FOCAL_RADIAL_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.FOCAL_RADIAL_GRADIENT) { records = fs.focalGradient.gradientRecords; } else { records = fs.gradient.gradientRecords; @@ -359,7 +359,7 @@ public class XFLConverter { ret += " ratio=\"" + rec.getRatioFloat() + "\""; ret += " />"; } - if (fs.fillStyleType == LINEAR_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.LINEAR_GRADIENT) { ret += ""; } else { ret += "";