diff --git a/trunk/src/com/jpexs/decompiler/flash/Main.java b/trunk/src/com/jpexs/decompiler/flash/Main.java index 39b3dda4f..855760544 100644 --- a/trunk/src/com/jpexs/decompiler/flash/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/Main.java @@ -185,6 +185,7 @@ public class Main { } }); locswf.addEventListener(new EventListener() { + @Override public void handleEvent(String event, Object data) { if (event.equals("export")) { startWork((String) data); @@ -635,6 +636,7 @@ public class Main { /** * Invoked when an action occurs. */ + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("EXIT")) { Main.exit(); diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index fd2de4b38..848743bc8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -407,6 +407,7 @@ public class SWF { public boolean exportActionScript(String outdir, boolean isPcode) throws Exception { boolean asV3Found = false; final EventListener evl = new EventListener() { + @Override public void handleEvent(String event, Object data) { if (event.equals("export")) { informListeners(event, data); 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 9cfc2ff00..a2d8fff66 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -1090,6 +1090,7 @@ public class AVM2Code implements Serializable { int afterCatchAddr = pos2adr(endpos + 1) + code.get(endpos).operands[0]; int afterCatchPos = adr2pos(afterCatchAddr); Collections.sort(catchedExceptions, new Comparator() { + @Override public int compare(ABCException o1, ABCException o2) { try { return fixAddrAfterDebugLine(o1.target) - fixAddrAfterDebugLine(o2.target); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java index 72a6b597e..48bad6810 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java @@ -43,6 +43,7 @@ public class IfEqIns extends InstructionDefinition implements IfTypeIns { stack.push(new EqTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java index 85fa386f4..c4c7712ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java @@ -43,6 +43,7 @@ public class IfGeIns extends InstructionDefinition implements IfTypeIns { stack.push(new GeTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java index afc17eda0..c79002be9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java @@ -43,6 +43,7 @@ public class IfGtIns extends InstructionDefinition implements IfTypeIns { stack.push(new GtTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java index 1f0e1e0d9..2a196ce86 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java @@ -43,6 +43,7 @@ public class IfLeIns extends InstructionDefinition implements IfTypeIns { stack.push(new LeTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java index 04fbab3d9..c23be8432 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java @@ -43,6 +43,7 @@ public class IfLtIns extends InstructionDefinition implements IfTypeIns { stack.push(new LtTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java index ad31fa431..ac42c7d6c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java @@ -43,6 +43,7 @@ public class IfNGeIns extends InstructionDefinition implements IfTypeIns { stack.push(new LtTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java index 0ba20e1ad..67db57043 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java @@ -43,6 +43,7 @@ public class IfNGtIns extends InstructionDefinition implements IfTypeIns { stack.push(new LeTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java index 6412f18d5..898c8f384 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java @@ -43,6 +43,7 @@ public class IfNLeIns extends InstructionDefinition implements IfTypeIns { stack.push(new GtTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java index 3949ef031..e157fd1d3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java @@ -43,6 +43,7 @@ public class IfNLtIns extends InstructionDefinition implements IfTypeIns { stack.push(new GeTreeItem(ins, v1, v2)); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v2 = (GraphTargetItem) stack.pop(); GraphTargetItem v1 = (GraphTargetItem) stack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java index 7599f6c8d..e9cdb5e2e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java @@ -41,6 +41,7 @@ public class IfTrueIns extends InstructionDefinition implements IfTypeIns { //stack.push("(" + v1 + ")"); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { GraphTargetItem v1 = (GraphTargetItem) stack.pop(); stack.push(new NotItem(ins, v1)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java index 1a4d7ac71..015223cd4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java @@ -39,6 +39,7 @@ public class JumpIns extends InstructionDefinition implements IfTypeIns { stack.push(new BooleanTreeItem(ins, Boolean.TRUE));// + ins.operands[0]); } + @Override public void translateInverted(java.util.HashMap localRegs, Stack stack, AVM2Instruction ins) { } } 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 85f8d6883..9479b6ccd 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 @@ -49,6 +49,7 @@ public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeI } } + @Override public int getRegisterId(AVM2Instruction par0) { return 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 7529f4ecb..0f2512cf7 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 @@ -44,6 +44,7 @@ public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeI stack.push(new LocalRegTreeItem(ins, 1, localRegs.get(1))); } + @Override public int getRegisterId(AVM2Instruction par0) { return 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 ae7d12144..165cd82cd 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 @@ -44,6 +44,7 @@ public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeI stack.push(new LocalRegTreeItem(ins, 2, localRegs.get(2))); } + @Override public int getRegisterId(AVM2Instruction par0) { return 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 0ac4c8eae..4aa3102c2 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 @@ -44,6 +44,7 @@ public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeI stack.push(new LocalRegTreeItem(ins, 3, localRegs.get(3))); } + @Override public int getRegisterId(AVM2Instruction par0) { return 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 6068bac5a..2ed934b6b 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 @@ -46,6 +46,7 @@ public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIn stack.push(new LocalRegTreeItem(ins, regIndex, localRegs.get(regIndex))); } + @Override public int getRegisterId(AVM2Instruction ins) { return ins.operands[0]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java index 66dc468da..753f3e1c6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java @@ -24,6 +24,7 @@ public class SetLocal0Ins extends SetLocalTypeIns { super(0xd4, "setlocal_0", new int[]{}); } + @Override public int getRegisterId(AVM2Instruction ins) { return 0; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java index ad3250bad..218769e20 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java @@ -24,6 +24,7 @@ public class SetLocal1Ins extends SetLocalTypeIns { super(0xd5, "setlocal_1", new int[]{}); } + @Override public int getRegisterId(AVM2Instruction ins) { return 1; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java index f957245ca..1019e353d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java @@ -24,6 +24,7 @@ public class SetLocal2Ins extends SetLocalTypeIns { super(0xd6, "setlocal_2", new int[]{}); } + @Override public int getRegisterId(AVM2Instruction ins) { return 2; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java index 9911739f8..02a268e3b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java @@ -24,6 +24,7 @@ public class SetLocal3Ins extends SetLocalTypeIns { super(0xd7, "setlocal_3", new int[]{}); } + @Override public int getRegisterId(AVM2Instruction ins) { return 3; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java index 280a0461b..812750356 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java @@ -25,6 +25,7 @@ public class SetLocalIns extends SetLocalTypeIns { super(0x63, "setlocal", new int[]{AVM2Code.DAT_LOCAL_REG_INDEX}); } + @Override public int getRegisterId(AVM2Instruction ins) { return ins.operands[0]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java index 232ce0596..e65188d70 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java @@ -106,6 +106,7 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S output.add(new SetLocalTreeItem(ins, regId, value)); } + @Override public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { return TreeItem.localRegName(localRegNames, getRegisterId(ins)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java index ff162c26e..592aa192d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -41,6 +41,7 @@ public class SetGlobalSlotIns extends InstructionDefinition implements SetTypeIn output.add(new SetGlobalSlotTreeItem(ins, ins.operands[0], (GraphTargetItem) stack.pop())); } + @Override public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { return "globalslot" + ins.operands[0]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java index ad17b88c5..036b72ee2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java @@ -113,6 +113,7 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns output.add(new SetPropertyTreeItem(ins, obj, multiname, value)); } + @Override public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(0, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java index 8d24973ec..43d155662 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java @@ -136,6 +136,7 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { output.add(new SetSlotTreeItem(ins, obj, slotname, value)); } + @Override public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; ////String obj = stack.get(1); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java index b3bbb43ba..0696061b6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java @@ -47,6 +47,7 @@ public class SetSuperIns extends InstructionDefinition implements SetTypeIns { output.add(new SetSuperTreeItem(ins, value, obj, multiname)); } + @Override public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(1, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); 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 443948564..f0879ca5c 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 @@ -54,6 +54,7 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "*"; } 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 01358bdcb..07bb93c87 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 @@ -47,6 +47,7 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT stack.push(new CoerceTreeItem(ins, (GraphTargetItem) stack.pop(), constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames))); } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; return constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames); 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 12d07ff5b..ba86d75a1 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 @@ -50,6 +50,7 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "String"; } 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 7d3542c9e..783cd5674 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 @@ -60,6 +60,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "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 58816108c..781eeeacf 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 @@ -68,6 +68,7 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "Number"; } 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 67c1fe93c..4eb1b3941 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 @@ -66,6 +66,7 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "int"; } 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 bf270e89c..5d288726d 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 @@ -49,6 +49,7 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "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 887956b3b..9d0c10036 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 @@ -50,6 +50,7 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "String"; } 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 eb79658aa..e5c04737d 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 @@ -49,6 +49,7 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver return -1 + 1; } + @Override public String getTargetType(ConstantPool constants, AVM2Instruction ins, List fullyQualifiedNames) { return "uint"; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java index c5051ce4e..6b2786546 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java @@ -41,10 +41,12 @@ public class InitPropertyTreeItem extends TreeItem implements SetTypeTreeItem, A return formatProperty(constants, object, propertyName, localRegNames, fullyQualifiedNames) + hilight("=") + value.toString(constants, localRegNames, fullyQualifiedNames); } + @Override public GraphTargetItem getObject() { return new GetPropertyTreeItem(instruction, object, propertyName); } + @Override public GraphTargetItem getValue() { return value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java index 388a000c7..c9a432ecf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java @@ -30,6 +30,7 @@ public class NameSpaceTreeItem extends TreeItem { this.namespaceIndex = namespaceIndex; } + @Override public String toString(ConstantPool constants, HashMap localRegNames, List fullyQualifiedNames) { if (namespaceIndex == 0) { return "*"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java index 2187128c5..9564e5681 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java @@ -39,10 +39,12 @@ public class SetLocalTreeItem extends TreeItem implements SetTypeTreeItem, Assig return hilight(localRegName(localRegNames, regIndex) + "=") + value.toString(constants, localRegNames, fullyQualifiedNames); } + @Override public GraphTargetItem getObject() { return new LocalRegTreeItem(instruction, regIndex, null); } + @Override public GraphTargetItem getValue() { return value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java index 8294dbed9..e2eeced9e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java @@ -41,10 +41,12 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem, As return formatProperty(constants, object, propertyName, localRegNames, fullyQualifiedNames) + hilight("=") + value.toString(constants, localRegNames, fullyQualifiedNames); } + @Override public GraphTargetItem getObject() { return new GetPropertyTreeItem(instruction, object, propertyName); } + @Override public GraphTargetItem getValue() { return value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java index add353608..1a39be474 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java @@ -63,10 +63,12 @@ public class SetSlotTreeItem extends TreeItem implements SetTypeTreeItem, Assign return ret + hilight(slotName.getName(constants, fullyQualifiedNames)); } + @Override public GraphTargetItem getObject() { return new GetSlotTreeItem(instruction, scope, slotName); } + @Override public GraphTargetItem getValue() { return value; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java index 4b5daa7f2..47d64e296 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java @@ -36,6 +36,7 @@ public class WithEndTreeItem extends TreeItem { return hilight("}"); } + @Override public boolean needsSemicolon() { return false; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java index f4cdeb248..e21146fd8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java @@ -51,6 +51,7 @@ public class WithTreeItem extends TreeItem { return ret; } + @Override public boolean needsSemicolon() { return false; } 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 7995e4fcb..dae5fb5ab 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 @@ -77,6 +77,7 @@ public class ForInTreeItem extends LoopItem implements Block { return ret; } + @Override public List getContinues() { List ret = new ArrayList(); for (GraphTargetItem ti : commands) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java index b0baeb414..356602ac7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java @@ -77,6 +77,7 @@ public class TryTreeItem extends TreeItem implements Block { return ret; } + @Override public List getContinues() { List ret = new ArrayList(); for (GraphTargetItem ti : tryCommands) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java index 32285d5ee..34c7b1c4f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java @@ -33,10 +33,12 @@ public class ABCComboBoxModel implements ComboBoxModel { Collections.sort(this.list); } + @Override public int getSize() { return 1 + list.size(); } + @Override public Object getElementAt(int index) { if (index == 0) { return ROOT; @@ -44,12 +46,15 @@ public class ABCComboBoxModel implements ComboBoxModel { return list.get(index - 1); } + @Override public void addListDataListener(ListDataListener l) { } + @Override public void removeListDataListener(ListDataListener l) { } + @Override public void setSelectedItem(Object anItem) { if (anItem == ROOT) { itemIndex = 0; @@ -58,6 +63,7 @@ public class ABCComboBoxModel implements ComboBoxModel { } } + @Override public Object getSelectedItem() { return getElementAt(itemIndex); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java index 1888f5bc9..4ef6b5685 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java @@ -338,6 +338,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { decompiledTextArea.reloadClass(); } + @Override public void itemStateChanged(ItemEvent e) { if (e.getSource() == abcComboBox) { int index = ((JComboBox) e.getSource()).getSelectedIndex(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java index 02c7bc971..7b4799a61 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java @@ -32,6 +32,7 @@ class ClassIndexVisitor implements TreeVisitor { this.classIndex = classIndex; } + @Override public void onBranch(TreeElement branch) { Object o = branch.getItem(); if (o == null) { @@ -48,6 +49,7 @@ class ClassIndexVisitor implements TreeVisitor { } } + @Override public void onLeaf(TreeElement leaf) { Object o = leaf.getItem(); if (o == null) { @@ -107,38 +109,46 @@ public class ClassesListTreeModel implements TreeModel { return civ.getFound(); } + @Override public Object getRoot() { return classTree.getRoot(); } + @Override public Object getChild(Object parent, int index) { TreeElement pte = (TreeElement) parent; TreeElement te = pte.getChild(index); return te; } + @Override public int getChildCount(Object parent) { TreeElement te = (TreeElement) parent; return te.getChildCount(); } + @Override public boolean isLeaf(Object node) { TreeElement te = (TreeElement) node; return te.isLeaf(); } + @Override public void valueForPathChanged(TreePath path, Object newValue) { } + @Override public int getIndexOfChild(Object parent, Object child) { TreeElement te1 = (TreeElement) parent; TreeElement te2 = (TreeElement) child; return te1.getIndexOfChild(te2); } + @Override public void addTreeModelListener(TreeModelListener l) { } + @Override public void removeTreeModelListener(TreeModelListener l) { } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java index 5c40071bb..0f312af90 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java @@ -47,6 +47,7 @@ public class ConstantsListModel implements ListModel { return i; } + @Override public int getSize() { switch (type) { case TYPE_UINT: @@ -69,6 +70,7 @@ public class ConstantsListModel implements ListModel { return 0; } + @Override public Object getElementAt(int index) { switch (type) { case TYPE_UINT: @@ -91,9 +93,11 @@ public class ConstantsListModel implements ListModel { return null; } + @Override public void addListDataListener(ListDataListener l) { } + @Override public void removeListDataListener(ListDataListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java index 6820cf208..1638fa1ad 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java @@ -111,6 +111,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL reset = false; } + @Override public void caretUpdate(CaretEvent e) { if (abc == null) { return; @@ -235,6 +236,7 @@ public class DecompiledEditorPane extends LineMarkedEditorPane implements CaretL } final int pos = th.startPos; new Timer().schedule(new TimerTask() { + @Override public void run() { try { setCaretPosition(pos); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java index 51d04da26..ec983b0aa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java @@ -113,6 +113,7 @@ public class DetailPanel extends JPanel implements ActionListener { selectedLabel.setText(selectedCard); } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("EDITDETAIL")) { setEditMode(true); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java index 192820a8b..7f6737134 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java @@ -21,18 +21,22 @@ import javax.swing.JOptionPane; public class DialogMissingSymbolHandler implements MissingSymbolHandler { + @Override public boolean missingString(String value) { return JOptionPane.showConfirmDialog(null, "String \"" + value + "\" is not present in constants table. Do you want to add it?", "Add String", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } + @Override public boolean missingInt(long value) { return JOptionPane.showConfirmDialog(null, "Integer value \"" + value + "\" is not present in constants table. Do you want to add it?", "Add Integer", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } + @Override public boolean missingUInt(long value) { return JOptionPane.showConfirmDialog(null, "Unsigned integer value \"" + value + "\" is not present in constants table. Do you want to add it?", "Add Unsigned integer", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } + @Override public boolean missingDouble(double value) { return JOptionPane.showConfirmDialog(null, "Double value \"" + value + "\" is not present in constants table. Do you want to add it?", "Add Double", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java index 872d3b26e..36c3cb19d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java @@ -35,6 +35,7 @@ public class LineMarkedEditorPane extends JEditorPane { public LineMarkedEditorPane() { setOpaque(false); addCaretListener(new CaretListener() { + @Override public void caretUpdate(CaretEvent e) { int caretPosition = getCaretPosition(); Element root = getDocument().getDefaultRootElement(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java index a3ebf0b3b..1f8d1a849 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java @@ -110,6 +110,7 @@ public class MethodBodyParamsPanel extends JPanel implements ChangeListener { return false; } + @Override public void stateChanged(ChangeEvent e) { if (e.getSource() == autoFillCheckBox) { if (autoFillCheckBox.isSelected()) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java index 8aae7ea6b..a35b2edcc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java @@ -41,6 +41,7 @@ public class MethodTraitDetailPanel extends JTabbedPane implements TraitDetail { setSelectedIndex(1); } + @Override public boolean save() { if (!methodInfoPanel.save()) { return false; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java index a740881ed..539994d24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java @@ -67,6 +67,7 @@ public class SlotConstTraitDetailPanel extends JPanel implements TraitDetail { slotConstEditor.setText(s); } + @Override public boolean save() { try { if (!MethodInfoParser.parseSlotConst(slotConstEditor.getText(), trait, abc)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java index e1d25f2a6..c5e89cea1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java @@ -67,17 +67,21 @@ public class TraitsListModel implements ListModel { } } + @Override public int getSize() { return items.size(); } + @Override public Object getElementAt(int index) { return items.get(index); } + @Override public void addListDataListener(ListDataListener l) { } + @Override public void removeListDataListener(ListDataListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java index c7339d5b4..cde2ea9c8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java @@ -108,6 +108,7 @@ public class UsageFrame extends JFrame implements ActionListener, MouseListener } } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("GOTO")) { gotoUsage(); @@ -118,21 +119,26 @@ public class UsageFrame extends JFrame implements ActionListener, MouseListener } } + @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2) { gotoUsage(); } } + @Override public void mousePressed(MouseEvent e) { } + @Override public void mouseReleased(MouseEvent e) { } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java index 3c491efdd..81bb61558 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java @@ -39,6 +39,7 @@ public class DecimalTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class DecimalTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class DecimalTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class DecimalTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class DecimalTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class DecimalTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { if (columnIndex == 0) { return rowIndex; @@ -129,6 +135,7 @@ public class DecimalTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -138,6 +145,7 @@ public class DecimalTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -147,6 +155,7 @@ public class DecimalTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java index 7c7155c92..f2dd6f2f1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java @@ -39,6 +39,7 @@ public class DoubleTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class DoubleTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class DoubleTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class DoubleTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class DoubleTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class DoubleTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { if (columnIndex == 0) { return rowIndex; @@ -131,6 +137,7 @@ public class DoubleTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -140,6 +147,7 @@ public class DoubleTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -149,6 +157,7 @@ public class DoubleTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java index f4f5748ff..1a97a2021 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java @@ -39,6 +39,7 @@ public class IntTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class IntTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class IntTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class IntTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class IntTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class IntTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { if (columnIndex == 0) { return rowIndex; @@ -129,6 +135,7 @@ public class IntTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -138,6 +145,7 @@ public class IntTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -147,6 +155,7 @@ public class IntTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java index 16e83acf9..f9a015dc9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java @@ -40,6 +40,7 @@ public class MultinameTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -55,6 +56,7 @@ public class MultinameTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 5; } @@ -68,6 +70,7 @@ public class MultinameTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -81,6 +84,7 @@ public class MultinameTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -97,6 +101,7 @@ public class MultinameTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -110,6 +115,7 @@ public class MultinameTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { case 0: @@ -160,6 +166,7 @@ public class MultinameTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -169,6 +176,7 @@ public class MultinameTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -178,6 +186,7 @@ public class MultinameTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java index c8e789514..7196c60de 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java @@ -39,6 +39,7 @@ public class NamespaceSetTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class NamespaceSetTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class NamespaceSetTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class NamespaceSetTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class NamespaceSetTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class NamespaceSetTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { case 0: @@ -135,6 +141,7 @@ public class NamespaceSetTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -144,6 +151,7 @@ public class NamespaceSetTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -153,6 +161,7 @@ public class NamespaceSetTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java index c597270dd..190f7762d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java @@ -39,6 +39,7 @@ public class NamespaceTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class NamespaceTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 3; } @@ -67,6 +69,7 @@ public class NamespaceTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class NamespaceTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class NamespaceTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class NamespaceTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { switch (columnIndex) { case 0: @@ -140,6 +146,7 @@ public class NamespaceTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -149,6 +156,7 @@ public class NamespaceTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -158,6 +166,7 @@ public class NamespaceTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java index d2b043903..e35a05d3f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java @@ -39,6 +39,7 @@ public class StringTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class StringTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class StringTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class StringTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class StringTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class StringTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { if (columnIndex == 0) { return rowIndex; @@ -129,6 +135,7 @@ public class StringTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -138,6 +145,7 @@ public class StringTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -147,6 +155,7 @@ public class StringTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java index 51db8fff6..e2b4cad89 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java @@ -39,6 +39,7 @@ public class UIntTableModel implements TableModel { * @return the number of rows in the model * @see #getColumnCount */ + @Override public int getRowCount() { if (abc == null) { return 0; @@ -54,6 +55,7 @@ public class UIntTableModel implements TableModel { * @return the number of columns in the model * @see #getRowCount */ + @Override public int getColumnCount() { return 2; } @@ -67,6 +69,7 @@ public class UIntTableModel implements TableModel { * @param columnIndex the index of the column * @return the name of the column */ + @Override public String getColumnName(int columnIndex) { return columnNames[columnIndex]; } @@ -80,6 +83,7 @@ public class UIntTableModel implements TableModel { * @param columnIndex the index of the column * @return the common ancestor class of the object values in the model. */ + @Override public Class getColumnClass(int columnIndex) { return classes[columnIndex]; } @@ -96,6 +100,7 @@ public class UIntTableModel implements TableModel { * @return true if the cell is editable * @see #setValueAt */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return false; } @@ -109,6 +114,7 @@ public class UIntTableModel implements TableModel { * @param columnIndex the column whose value is to be queried * @return the value Object at the specified cell */ + @Override public Object getValueAt(int rowIndex, int columnIndex) { if (columnIndex == 0) { return rowIndex; @@ -129,6 +135,7 @@ public class UIntTableModel implements TableModel { * @see #getValueAt * @see #isCellEditable */ + @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { } @@ -138,6 +145,7 @@ public class UIntTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void addTableModelListener(TableModelListener l) { } @@ -147,6 +155,7 @@ public class UIntTableModel implements TableModel { * * @param l the TableModelListener */ + @Override public void removeTableModelListener(TableModelListener l) { } } 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 e3159f23f..c675f4794 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 @@ -444,6 +444,7 @@ public class TraitClass extends Trait { return baos.toString(); } + @Override public Multiname getName(ABC abc) { return abc.constants.constant_multiname[abc.instance_info[class_info].name_index]; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java index 73f859070..fc3d5ebfa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java @@ -34,6 +34,7 @@ public abstract class InsideClassMultinameUsage extends MultinameUsage { this.classIndex = classIndex; } + @Override public String toString(List abcTags, ABC abc) { return "class " + abc.constants.constant_multiname[abc.instance_info[classIndex].name_index].getNameWithNamespace(abc.constants); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java index 8e6fca179..3d02808cc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java @@ -300,6 +300,7 @@ public class ActionPanel extends JPanel implements ActionListener { editMode = val; } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("GRAPH")) { if (lastCode != null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java index 38d10a1f1..4c8ada950 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java @@ -28,6 +28,7 @@ public class GetURL2TreeItem extends TreeItem { public boolean loadTargetFlag; public boolean loadVariablesFlag; + @Override public String toString(ConstantPool constants) { String methodStr = ""; if (method == 1) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java index 808605bd2..c7b81b3c1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java @@ -24,6 +24,7 @@ public class GetURLTreeItem extends TreeItem { public String urlString; public String targetString; + @Override public String toString(ConstantPool constants) { return hilight("getUrl(\"") + Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString) + hilight("\")"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java index 398203bf9..9a6cccce1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java @@ -29,6 +29,7 @@ public class DoWhileItem extends LoopItem implements Block { return false; } + @Override public List> getSubs() { List> ret = new ArrayList>(); ret.add(commands); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java index fdd4c3d2a..3233b6c74 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java @@ -26,6 +26,7 @@ public class ForTreeItem extends LoopItem implements Block { public List finalCommands; public List commands; + @Override public List> getSubs() { List> ret = new ArrayList>(); ret.add(firstCommands); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java index 7f9c50fd2..7386344b6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java @@ -27,6 +27,7 @@ public class SwitchItem extends LoopItem implements Block { public List defaultCommands; public List valuesMapping; + @Override public List> getSubs() { List> ret = new ArrayList>(); ret.addAll(caseCommands); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java index 1829d725c..5541b4ea5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java @@ -90,6 +90,7 @@ public class AboutDialog extends JDialog { JButton okButton = new JButton("OK"); cp.add(okButton); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java index b531b6638..abfc7f884 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/GraphTreeFrame.java @@ -37,32 +37,40 @@ public class GraphTreeFrame extends JFrame { public GraphTreeFrame(final AVM2Graph graph) { setSize(400, 400); graphTree = new JTree(new TreeModel() { + @Override public Object getRoot() { return graph.heads.get(0); } + @Override public Object getChild(Object parent, int index) { return ((GraphPart) parent).nextParts.get(index); } + @Override public int getChildCount(Object parent) { return ((GraphPart) parent).nextParts.size(); } + @Override public boolean isLeaf(Object node) { return getChildCount(node) == 0; } + @Override public void valueForPathChanged(TreePath path, Object newValue) { } + @Override public int getIndexOfChild(Object parent, Object child) { return ((GraphPart) parent).nextParts.indexOf(child); } + @Override public void addTreeModelListener(TreeModelListener l) { } + @Override public void removeTreeModelListener(TreeModelListener l) { } }); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java index af529c3c4..3510f9a1f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java @@ -46,6 +46,7 @@ public class LoadingPanel extends JPanel { animationImage = icon.getImage(); java.util.Timer timer = new java.util.Timer(); timer.schedule(new java.util.TimerTask() { + @Override public void run() { pos = (pos + 1) % 12; repaint(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index ec39e98ad..3ad8542ec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -955,6 +955,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi return JOptionPane.showConfirmDialog(null, "Following procedure can damage SWF file which can be then unplayable.\r\nUSE IT ON YOUR OWN RISK. Do you want to continue?", "Warning", JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION; } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("EXIT")) { setVisible(false); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java index ea94a01ff..dcca63116 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java @@ -77,6 +77,7 @@ public class ModeFrame extends JFrame implements ActionListener { * * @param e event */ + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("OPEN")) { setVisible(false); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java index 3f2b95513..330e1fdce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java @@ -38,10 +38,12 @@ public class TagTreeModel implements TreeModel { return list; } + @Override public Object getRoot() { return root; } + @Override public Object getChild(Object parent, int index) { if (parent instanceof TagNode) { if (((TagNode) parent).tag instanceof ClassesListTreeModel) { @@ -58,6 +60,7 @@ public class TagTreeModel implements TreeModel { } } + @Override public int getChildCount(Object parent) { if (parent == root) { return list.size(); @@ -76,13 +79,16 @@ public class TagTreeModel implements TreeModel { } } + @Override public boolean isLeaf(Object node) { return (getChildCount(node) == 0); } + @Override public void valueForPathChanged(TreePath path, Object newValue) { } + @Override public int getIndexOfChild(Object parent, Object child) { if (parent instanceof TagNode) { if (((TagNode) parent).tag instanceof ClassesListTreeModel) { @@ -114,9 +120,11 @@ public class TagTreeModel implements TreeModel { } } + @Override public void addTreeModelListener(TreeModelListener l) { } + @Override public void removeTreeModelListener(TreeModelListener l) { } } 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 75055113b..0eaab89be 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 @@ -171,6 +171,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public int dwLowDateTime; public int dwHighDateTime; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLowDateTime", "dwHighDateTime"}); } @@ -248,6 +249,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { return toDate().getTime(); } + @Override public String toString() { return super.toString() + ": " + toDate().toString(); //$NON-NLS-1$ } @@ -295,6 +297,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { // The millisecond. The valid values for this member are 0 through 999. public short wMilliseconds; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"wYear", "wMonth", "wDayOfWeek", "wDay", "wHour", "wMinute", "wSecond", "wMilliseconds"}); } @@ -389,6 +392,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public int OffsetHigh; public HANDLE hEvent; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"Internal", "InternalHigh", "Offset", "OffsetHigh", "hEvent"}); } @@ -422,6 +426,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public WORD wReserved; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"wProcessorArchitecture", "wReserved"}); } @@ -501,6 +506,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public WORD wProcessorRevision; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"processorArchitecture", "dwPageSize", "lpMinimumApplicationAddress", "lpMaximumApplicationAddress", "dwActiveProcessorMask", "dwNumberOfProcessors", "dwProcessorType", "dwAllocationGranularity", "wProcessorLevel", "wProcessorRevision"}); } @@ -561,6 +567,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public DWORDLONG ullAvailExtendedVirtual; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "dwMemoryLoad", "ullTotalPhys", "ullAvailPhys", "ullTotalPageFile", "ullAvailPageFile", "ullTotalVirtual", "ullAvailVirtual", "ullAvailExtendedVirtual"}); } @@ -594,6 +601,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public boolean bInheritHandle; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "lpSecurityDescriptor", "bInheritHandle"}); } @@ -752,6 +760,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public HANDLE hStdError; + @Override 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"}); } @@ -795,6 +804,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { */ public DWORD dwThreadId; + @Override 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 3c7328e49..827cabf4f 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 @@ -608,6 +608,7 @@ public interface WinDef extends StdCallLibrary { * * @see com.sun.jna.Structure#getFieldOrder() */ + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"left", "top", "right", "bottom"}); @@ -627,6 +628,7 @@ public interface WinDef extends StdCallLibrary { * * @see com.sun.jna.Structure#toString() */ + @Override public String toString() { return "[(" + left + "," + top + ")(" + right + "," + bottom + ")]"; } @@ -867,6 +869,7 @@ public interface WinDef extends StdCallLibrary { * * @see com.sun.jna.Structure#getFieldOrder() */ + @Override 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 4b9e15446..d610675ea 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 @@ -226,6 +226,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { */ public DWORD Attributes; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"Luid", "Attributes"}); } @@ -255,6 +256,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { */ public LUID_AND_ATTRIBUTES Privileges[]; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"PrivilegeCount", "Privileges"}); } @@ -464,6 +466,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { // filename is not nul-terminated, so we can't use a String/WString public char[] FileName = new char[1]; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"NextEntryOffset", "Action", "FileNameLength", "FileName"}); } @@ -487,6 +490,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { return new String(FileName, 0, FileNameLength / 2); } + @Override public void read() { // avoid reading filename until we know how long it is FileName = new char[0]; @@ -694,6 +698,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public int LowPart; public int HighPart; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } @@ -713,6 +718,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD LowPart; public DWORD HighPart; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } @@ -725,6 +731,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { } public UNION u; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"u"}); } @@ -776,6 +783,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { /** * Override to the appropriate object for INVALID_HANDLE_VALUE. */ + @Override public Object fromNative(Object nativeValue, FromNativeContext context) { Object o = super.fromNative(nativeValue, context); if (WinBase.INVALID_HANDLE_VALUE.equals(o)) { @@ -784,6 +792,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { return o; } + @Override public void setPointer(Pointer p) { if (immutable) { throw new UnsupportedOperationException("immutable reference"); @@ -1222,6 +1231,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { */ public char szCSDVersion[]; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion"}); } @@ -1296,6 +1306,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { */ public byte wReserved; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion", "wServicePackMajor", "wServicePackMinor", "wSuiteMask", "wProductType", "wReserved"}); } @@ -1472,6 +1483,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { */ public DWORD DataOffset; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"Length", "Reserved", "RecordNumber", "TimeGenerated", "TimeWritten", "EventID", "EventType", "NumStrings", "EventCategory", "ReservedFlags", "ClosingRecordNumber", "StringOffset", "UserSidLength", "UserSidOffset", "DataLength", "DataOffset"}); } @@ -1570,6 +1582,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { } public byte[] data; + @Override 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 de471c541..d4c255704 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 @@ -87,6 +87,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public HWND hwndCaret; public RECT rcCaret; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "flags", "hwndActive", "hwndFocus", "hwndCapture", "hwndMenuOwner", @@ -107,6 +108,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public short atomWindowType; public short wCreatorVersion; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "rcWindow", "rcClient", "dwStyle", "dwExStyle", "dwWindowStatus", @@ -152,6 +154,7 @@ public interface WinUser extends StdCallLibrary, WinDef { this.y = y; } + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"x", "y"}); } @@ -166,6 +169,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int time; public POINT pt; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"hWnd", "message", "wParam", "lParam", "time", "pt"}); @@ -180,6 +184,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int uCount; public int dwTimeout; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "hWnd", "dwFlags", "uCount", "dwTimeout"}); @@ -214,6 +219,7 @@ public interface WinUser extends StdCallLibrary, WinDef { this.cy = h; } + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"cx", "cy"}); } @@ -230,6 +236,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public byte SourceConstantAlpha; public byte AlphaFormat; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"BlendOp", "BlendFlags", "SourceConstantAlpha", "AlphaFormat"}); @@ -330,6 +337,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int time; public ULONG_PTR dwExtraInfo; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"vkCode", "scanCode", "flags", "time", "dwExtraInfo"}); @@ -562,6 +570,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public WinDef.WORD wParamL; public WinDef.WORD wParamH; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"uMsg", "wParamL", "wParamH"}); } @@ -598,6 +607,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public WinDef.DWORD type; public INPUT_UNION input = new INPUT_UNION(); + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"type", "input"}); } @@ -688,6 +698,7 @@ public interface WinUser extends StdCallLibrary, WinDef { */ public BaseTSD.ULONG_PTR dwExtraInfo; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"wVk", "wScan", "dwFlags", "time", "dwExtraInfo"}); @@ -724,6 +735,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public WinDef.DWORD time; public BaseTSD.ULONG_PTR dwExtraInfo; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"dx", "dy", "mouseData", "dwFlags", "time", "dwExtraInfo"}); @@ -739,6 +751,7 @@ public interface WinUser extends StdCallLibrary, WinDef { // Tick count of when the last input event was received. public int dwTime; + @Override protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "dwTime"}); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java index 148c2c5bb..65061173a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java @@ -174,6 +174,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("OPEN")) { open(); @@ -260,6 +261,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void mouseClicked(MouseEvent e) { if (e.getSource() == swfList) { if (e.getClickCount() == 2) { @@ -273,6 +275,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void mousePressed(MouseEvent e) { } @@ -281,6 +284,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void mouseReleased(MouseEvent e) { } @@ -289,6 +293,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void mouseEntered(MouseEvent e) { } @@ -297,6 +302,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * * @param e event */ + @Override public void mouseExited(MouseEvent e) { } @@ -307,6 +313,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene * @param url URL of the method * @param data Data stream */ + @Override public void catched(String contentType, String url, InputStream data) { boolean swfOnly = false; if (contentType.contains(";")) { @@ -376,6 +383,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene super.setVisible(b); } + @Override public void replaced(Replacement replacement, String url, String contentType) { listModel.dataChanged(listModel.indexOf(replacement)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java index c9367a777..6e6877398 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java @@ -138,6 +138,7 @@ public class SWFListModel implements ListModel { * * @return Size of the list */ + @Override public int getSize() { return replacements.size(); } @@ -148,6 +149,7 @@ public class SWFListModel implements ListModel { * @param index Index of element * @return Element on index */ + @Override public Object getElementAt(int index) { return replacements.get(index); } @@ -157,6 +159,7 @@ public class SWFListModel implements ListModel { * * @param l list data listener */ + @Override public void addListDataListener(ListDataListener l) { listeners.add(l); } @@ -166,6 +169,7 @@ public class SWFListModel implements ListModel { * * @param l list data listener */ + @Override public void removeListDataListener(ListDataListener l) { if (listeners.contains(l)) { listeners.remove(l); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java index e7ffb7d67..8a9e5ec88 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java @@ -160,6 +160,7 @@ public class DefineButton2Tag extends CharacterTag implements Container, Bounded * * @return List of sub-items */ + @Override public List getSubItems() { List ret = new ArrayList(); ret.addAll(actions); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java index cb5df960a..9dfec8b35 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java @@ -115,6 +115,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT * @param version SWF version * @return ASM source */ + @Override public String getASMSource(int version, boolean hex) { return Action.actionsToString(getActions(version), null, version, hex); } @@ -124,6 +125,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT * * @return True when contains */ + @Override public boolean containsSource() { return true; } @@ -134,6 +136,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT * @param version Version * @return List of actions */ + @Override public List getActions(int version) { try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -153,14 +156,17 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT } } + @Override public void setActions(List actions, int version) { actionBytes = Action.actionsToBytes(actions, true, version); } + @Override public byte[] getActionBytes() { return actionBytes; } + @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = actionBytes; } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java index 5b6977963..700feab38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java @@ -78,6 +78,7 @@ public class DefineSpriteTag extends CharacterTag implements Container, BoundedT return ret; } + @Override public RECT getRect(HashMap characters) { RECT ret = new RECT(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE); HashMap depthMap = new HashMap(); @@ -164,6 +165,7 @@ public class DefineSpriteTag extends CharacterTag implements Container, BoundedT * * @return List of sub-items */ + @Override public List getSubItems() { List ret = new ArrayList(); ret.addAll(subTags); @@ -175,6 +177,7 @@ public class DefineSpriteTag extends CharacterTag implements Container, BoundedT * * @return Number of sub-items */ + @Override public int getItemCount() { return subTags.size(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java index b9815f170..1ff2ad9bf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java @@ -90,6 +90,7 @@ public class DoABCTag extends Tag implements Comparable { return new byte[0]; } + @Override public int compareTo(DoABCTag n) { int lastCmp = name.compareTo(n.name); return (lastCmp != 0 ? lastCmp diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java index 23f24e309..72eb04d52 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java @@ -80,6 +80,7 @@ public class DoActionTag extends Tag implements ASMSource { * * @return True when contains */ + @Override public boolean containsSource() { return true; } @@ -94,6 +95,7 @@ public class DoActionTag extends Tag implements ASMSource { return "DoAction"; } + @Override public List getActions(int version) { try { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -116,14 +118,17 @@ public class DoActionTag extends Tag implements ASMSource { } } + @Override public void setActions(List actions, int version) { actionBytes = Action.actionsToBytes(actions, true, version); } + @Override public byte[] getActionBytes() { return actionBytes; } + @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = actionBytes; } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java index 20a1ae500..f2fb228f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java @@ -82,6 +82,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource { * * @return True when contains */ + @Override public boolean containsSource() { return true; } @@ -123,14 +124,17 @@ public class DoInitActionTag extends CharacterTag implements ASMSource { } } + @Override public void setActions(List actions, int version) { actionBytes = Action.actionsToBytes(actions, true, version); } + @Override public byte[] getActionBytes() { return actionBytes; } + @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = actionBytes; } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java index b46d34353..a82799650 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java @@ -226,6 +226,7 @@ public class PlaceObject2Tag extends Tag implements Container, PlaceObjectTypeTa * * @return List of sub-items */ + @Override public List getSubItems() { List ret = new ArrayList(); if (placeFlagHasClipActions) { @@ -239,6 +240,7 @@ public class PlaceObject2Tag extends Tag implements Container, PlaceObjectTypeTa * * @return Number of sub-items */ + @Override public int getItemCount() { if (!placeFlagHasClipActions) { return 0; @@ -255,6 +257,7 @@ public class PlaceObject2Tag extends Tag implements Container, PlaceObjectTypeTa return ret; } + @Override public int getCharacterId() { if (placeFlagHasCharacter) { return characterId; @@ -263,10 +266,12 @@ public class PlaceObject2Tag extends Tag implements Container, PlaceObjectTypeTa } } + @Override public int getDepth() { return depth; } + @Override public MATRIX getMatrix() { if (placeFlagHasMatrix) { return matrix; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java index 6d2a068e8..82d9c8993 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java @@ -294,6 +294,7 @@ public class PlaceObject3Tag extends Tag implements Container, PlaceObjectTypeTa * * @return List of sub-items */ + @Override public List getSubItems() { List ret = new ArrayList(); if (placeFlagHasClipActions) { @@ -307,6 +308,7 @@ public class PlaceObject3Tag extends Tag implements Container, PlaceObjectTypeTa * * @return Number of sub-items */ + @Override public int getItemCount() { if (!placeFlagHasClipActions) { return 0; @@ -323,6 +325,7 @@ public class PlaceObject3Tag extends Tag implements Container, PlaceObjectTypeTa return ret; } + @Override public int getCharacterId() { if (placeFlagHasCharacter) { return characterId; @@ -331,10 +334,12 @@ public class PlaceObject3Tag extends Tag implements Container, PlaceObjectTypeTa } } + @Override public int getDepth() { return depth; } + @Override public MATRIX getMatrix() { if (placeFlagHasMatrix) { return matrix; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java index 150778470..066ed3c32 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java @@ -112,10 +112,12 @@ public class PlaceObjectTag extends Tag implements PlaceObjectTypeTag { return characterId; } + @Override public int getDepth() { return depth; } + @Override public MATRIX getMatrix() { return matrix; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java index 2bc0d79bf..ea92d9a94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java @@ -111,6 +111,7 @@ public class BUTTONCONDACTION implements ASMSource { * @param version SWF version * @return ASM source */ + @Override public String getASMSource(int version, boolean hex) { return Action.actionsToString(getActions(version), null, version, hex); } @@ -120,6 +121,7 @@ public class BUTTONCONDACTION implements ASMSource { * * @return True when contains */ + @Override public boolean containsSource() { return true; } @@ -145,10 +147,12 @@ public class BUTTONCONDACTION implements ASMSource { actionBytes = Action.actionsToBytes(actions, true, version); } + @Override public byte[] getActionBytes() { return actionBytes; } + @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = actionBytes; } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java index e525f66b0..2c7f759ed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java @@ -78,6 +78,7 @@ public class CLIPACTIONRECORD implements ASMSource { * @param version SWF version * @return ASM source */ + @Override public String getASMSource(int version, boolean hex) { return Action.actionsToString(getActions(version), null, version, hex); } @@ -87,6 +88,7 @@ public class CLIPACTIONRECORD implements ASMSource { * * @return True when contains */ + @Override public boolean containsSource() { return true; } @@ -101,14 +103,17 @@ public class CLIPACTIONRECORD implements ASMSource { } } + @Override public void setActions(List actions, int version) { actionBytes = Action.actionsToBytes(actions, true, version); } + @Override public byte[] getActionBytes() { return actionBytes; } + @Override public void setActionBytes(byte[] actionBytes) { this.actionBytes = actionBytes; }