diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java index a6ec79935..e361795d4 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/asdec/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,16 +52,23 @@ public class Main { public static String file; public static String maskURL; public static SWF swf; - public static final String version = "alpha8"; + public static final String version = "alpha9"; public static String applicationName = "JP ActionScript Decompiler v." + version; public static LoadingDialog loadingDialog = new LoadingDialog(); public static ModeFrame modeFrame; private static boolean working = false; private static TrayIcon trayIcon; private static MenuItem stopMenuItem; + public static boolean DEBUG_COPY = false; + /** Debug mode = throwing an error when comparing original file and recompiled */ public static boolean DEBUG_MODE = false; + /** Turn off reading unsafe tags (tags which can cause problems with recompiling)*/ public static boolean DISABLE_DANGEROUS = false; + /** Turn off resolving constants in ActionScript 2 */ + public static final boolean RESOLVE_CONSTANTS = true; + /** Turn off decompiling if needed */ + public static final boolean DO_DECOMPILE=true; public static String getFileTitle() { if (maskURL != null) return maskURL; @@ -282,7 +289,7 @@ public class Main { public static void updateLicenseInDir(File dir){ - String license="/*\r\n * Copyright (C) 2010 JPEXS\r\n * \r\n * This program is free software; you can redistribute it and/or\r\n * modify it under the terms of the GNU General Public License\r\n * as published by the Free Software Foundation; either version 2\r\n * of the License, or (at your option) any later version.\r\n * \r\n * This program is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU General Public License for more details.\r\n * \r\n * You should have received a copy of the GNU General Public License\r\n * along with this program; if not, write to the Free Software\r\n * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r\n */\r\n"; + String license="/*\r\n * Copyright (C) 2010-2011 JPEXS\r\n * \r\n * This program is free software; you can redistribute it and/or\r\n * modify it under the terms of the GNU General Public License\r\n * as published by the Free Software Foundation; either version 2\r\n * of the License, or (at your option) any later version.\r\n * \r\n * This program is distributed in the hope that it will be useful,\r\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\r\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r\n * GNU General Public License for more details.\r\n * \r\n * You should have received a copy of the GNU General Public License\r\n * along with this program; if not, write to the Free Software\r\n * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r\n */\r\n"; File files[]=dir.listFiles(); for(File f:files){ @@ -336,6 +343,8 @@ public class Main { * @param args the command line arguments */ public static void main(String[] args) throws IOException { + updateLicenseInDir(new File("src")); + System.exit(0); View.setWinLookAndFeel(); loadReplacements(); if (args.length < 1) { diff --git a/trunk/src/com/jpexs/asdec/SWF.java b/trunk/src/com/jpexs/asdec/SWF.java index ecb19e36a..1bcae1b8d 100644 --- a/trunk/src/com/jpexs/asdec/SWF.java +++ b/trunk/src/com/jpexs/asdec/SWF.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/SWFInputStream.java b/trunk/src/com/jpexs/asdec/SWFInputStream.java index 09ff0370d..063bd6a8f 100644 --- a/trunk/src/com/jpexs/asdec/SWFInputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -110,7 +110,7 @@ public class SWFInputStream extends InputStream { int r = 0; while (true) { r = read(); - if (r == 0) return new String(baos.toByteArray(), "utf8"); + if (r <= 0) return new String(baos.toByteArray(), "utf8"); baos.write(r); } } @@ -268,6 +268,7 @@ public class SWFInputStream extends InputStream { * @throws IOException */ public byte[] readBytes(long count) throws IOException { + if(count<=0) return new byte[0]; byte ret[] = new byte[(int) count]; for (int i = 0; i < count; i++) { ret[i] = (byte) read(); @@ -496,7 +497,7 @@ public class SWFInputStream extends InputStream { case 0x81: return new ActionGotoFrame(this); case 0x83: - return new ActionGetURL(actionLength, this); + return new ActionGetURL(actionLength, this,version); case 0x04: return new ActionNextFrame(); case 0x05: @@ -512,9 +513,9 @@ public class SWFInputStream extends InputStream { case 0x8A: return new ActionWaitForFrame(this); case 0x8B: - return new ActionSetTarget(actionLength, this); + return new ActionSetTarget(actionLength, this,version); case 0x8C: - return new ActionGoToLabel(actionLength, this); + return new ActionGoToLabel(actionLength, this,version); //SWF4 Actions case 0x96: return new ActionPush(actionLength, this, version); @@ -604,7 +605,7 @@ public class SWFInputStream extends InputStream { case 0x52: return new ActionCallMethod(); case 0x88: - return new ActionConstantPool(actionLength, this); + return new ActionConstantPool(actionLength, this,version); case 0x9B: return new ActionDefineFunction(actionLength, this, version); case 0x3C: @@ -811,7 +812,8 @@ public class SWFInputStream extends InputStream { ret.keyCode = readUI8(); actionRecordSize--; } - ret.actions = (new SWFInputStream(new ByteArrayInputStream(readBytes(actionRecordSize)), version)).readActionList(); + ret.actionBytes=readBytes(actionRecordSize); + //ret.actions = (new SWFInputStream(new ByteArrayInputStream(readBytes(actionRecordSize)), version)).readActionList(); return ret; } @@ -1154,7 +1156,7 @@ public class SWFInputStream extends InputStream { public BUTTONCONDACTION readBUTTONCONDACTION() throws IOException { BUTTONCONDACTION ret = new BUTTONCONDACTION(); int condActionSize = readUI16(); - ret.isLast = condActionSize == 0; + ret.isLast = condActionSize <= 0; ret.condIdleToOverDown = readUB(1) == 1; ret.condOutDownToIdle = readUB(1) == 1; ret.condOutDownToOverDown = readUB(1) == 1; @@ -1165,7 +1167,20 @@ public class SWFInputStream extends InputStream { ret.condIdleToOverUp = readUB(1) == 1; ret.condKeyPress = (int) readUB(7); ret.condOverDownToIddle = readUB(1) == 1; - ret.actions = readActionList(); + if(condActionSize<=0){ + ret.actionBytes=readBytes(available()); + }else{ + ret.actionBytes=readBytes(condActionSize-4); + } + //ret.actions = readActionList(); return ret; } + + @Override + public int available() throws IOException { + return is.available(); + } + + + } diff --git a/trunk/src/com/jpexs/asdec/SWFOutputStream.java b/trunk/src/com/jpexs/asdec/SWFOutputStream.java index b59db6ace..71225298e 100644 --- a/trunk/src/com/jpexs/asdec/SWFOutputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -601,7 +601,8 @@ public class SWFOutputStream extends OutputStream { if (value.eventFlags.clipEventKeyPress) { sos.writeUI8(value.keyCode); } - sos.write(Action.actionsToBytes(value.actions, true, version)); + sos.write(value.actionBytes); + //sos.write(Action.actionsToBytes(value.actions, true, version)); sos.close(); byte data[] = baos.toByteArray(); writeUI32(data.length); //actionRecordSize @@ -923,7 +924,8 @@ public class SWFOutputStream extends OutputStream { sos.writeUB(1, value.condIdleToOverUp ? 1 : 0); sos.writeUB(7, value.condKeyPress); sos.writeUB(1, value.condOverDownToIddle ? 1 : 0); - sos.write(Action.actionsToBytes(value.actions, true, version)); + sos.write(value.actionBytes); + //sos.write(Action.actionsToBytes(value.actions, true, version)); sos.close(); byte data[] = baos.toByteArray(); if (isLast) { diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/asdec/abc/ABC.java index 9b593594d..e475aacac 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABC.java +++ b/trunk/src/com/jpexs/asdec/abc/ABC.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + package com.jpexs.asdec.abc; import com.jpexs.asdec.Main; @@ -49,8 +50,7 @@ public class ABC { public long stringOffsets[]; public static String IDENT_STRING = " "; - public ABC(InputStream is) throws IOException { - + public ABC(InputStream is) throws IOException { ABCInputStream ais = new ABCInputStream(is); major_version = ais.readU16(); minor_version = ais.readU16(); @@ -83,7 +83,7 @@ public class ABC { constants.constant_string[0] = ""; for (int i = 1; i < constant_string_pool_count; i++) { //index 0 not used. Values 1..n-1 long pos = ais.getPosition(); - constants.constant_string[i] = ais.readString(); + constants.constant_string[i] = ais.readString(); stringOffsets[i] = pos; } @@ -92,7 +92,7 @@ public class ABC { constants.constant_namespace = new Namespace[constant_namespace_pool_count]; for (int i = 1; i < constant_namespace_pool_count; i++) { //index 0 not used. Values 1..n-1 constants.constant_namespace[i] = ais.readNamespace(); - cleanOneName(constants.constant_namespace[i].name_index); + //cleanOneName(constants.constant_namespace[i].name_index); } //constant namespace set @@ -110,10 +110,12 @@ public class ABC { //constant multiname int constant_multiname_pool_count = ais.readU30(); + //System.out.println("Reading "+constant_multiname_pool_count+" multinames"); constants.constant_multiname = new Multiname[constant_multiname_pool_count]; for (int i = 1; i < constant_multiname_pool_count; i++) { //index 0 not used. Values 1..n-1 constants.constant_multiname[i] = ais.readMultiname(); - cleanNamespace(constants.constant_multiname[i].name_index); + //System.out.println("Multiname read:"+constants.constant_multiname[i]); + //cleanNamespace(constants.constant_multiname[i].name_index); } @@ -146,7 +148,7 @@ public class ABC { for (int i = 0; i < class_count; i++) { instance_info[i] = ais.readInstanceInfo(); } - class_info = new ClassInfo[class_count]; + class_info = new ClassInfo[class_count]; for (int i = 0; i < class_count; i++) { class_info[i] = new ClassInfo(); class_info[i].cinit_index = ais.readU30(); @@ -195,7 +197,7 @@ public class ABC { bodies[i].code.clearCode(constants, bodies[i]); } catch (ConvertException ignored) { } */ - } + } } public void saveToStream(OutputStream os) throws IOException { @@ -205,12 +207,7 @@ public class ABC { aos.writeU30(constants.constant_int.length); for (int i = 1; i < constants.constant_int.length; i++) { - try { - aos.writeS32(constants.constant_int[i]); - } catch (NotSameException nex) { - System.out.println("written:" + constants.constant_int[i]); - throw nex; - } + aos.writeS32(constants.constant_int[i]); } aos.writeU30(constants.constant_uint.length); for (int i = 1; i < constants.constant_uint.length; i++) { @@ -241,6 +238,7 @@ public class ABC { } aos.writeU30(constants.constant_multiname.length); + //System.out.println("Writing "+constants.constant_multiname.length+" multinames"); for (int i = 1; i < constants.constant_multiname.length; i++) { aos.writeMultiname(constants.constant_multiname[i]); } @@ -459,6 +457,7 @@ public class ABC { private String addTabs(String s, int tabs) { String parts[] = s.split("\r\n"); + if(!s.contains("\r\n")) parts = s.split("\n"); String ret = ""; for (int i = 0; i < parts.length; i++) { for (int t = 0; t < tabs; t++) { @@ -498,7 +497,7 @@ public class ABC { } } - public String classToString(int i, boolean highlight) { + public String classToString(int i, boolean highlight,boolean pcode) { String ret = ""; ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream out = new PrintStream(baos); @@ -580,7 +579,7 @@ public class ABC { String bodyStr = ""; int bodyIndex = findBodyIndex(instance_info[i].iinit_index); if (bodyIndex != -1) { - bodyStr = addTabs(bodies[bodyIndex].toString(false, i, this, constants, method_info, highlight), 3); + bodyStr = addTabs(bodies[bodyIndex].toString(pcode,false, i, this, constants, method_info, highlight), 3); } String toPrint = IDENT_STRING + IDENT_STRING + modifier + "function " + constants.constant_multiname[instance_info[i].name_index].getName(constants) + "(" + constructorParams + ") {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}"; if (highlight) { @@ -598,7 +597,7 @@ public class ABC { String bodyStr = ""; int bodyIndex = findBodyIndex(tm.method_info); if (bodyIndex != -1) { - bodyStr = addTabs(bodies[bodyIndex].toString(true, i, this, constants, method_info, highlight), 3); + bodyStr = addTabs(bodies[bodyIndex].toString(pcode,true, i, this, constants, method_info, highlight), 3); } toPrint = IDENT_STRING + IDENT_STRING + tm.convert(constants, method_info, true) + " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}"; } @@ -627,7 +626,7 @@ public class ABC { String bodyStr = ""; int bodyIndex = findBodyIndex(tm.method_info); if (bodyIndex != -1) { - bodyStr = addTabs(bodies[bodyIndex].toString(false, i, this, constants, method_info, highlight), 3); + bodyStr = addTabs(bodies[bodyIndex].toString(pcode,false, i, this, constants, method_info, highlight), 3); } toPrint = IDENT_STRING + IDENT_STRING + tm.convert(constants, method_info, false) + " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}"; } @@ -647,7 +646,7 @@ public class ABC { return baos.toString(); } - public void export(String directory) throws IOException { + public void export(String directory,boolean pcode) throws IOException { for (int i = 0; i < instance_info.length; i++) { String packageName = instance_info[i].getName(constants).getNamespace(constants).getName(constants); String className = instance_info[i].getName(constants).getName(constants); @@ -658,7 +657,7 @@ public class ABC { } String fileName = outDir.toString() + File.separator + className + ".as"; FileOutputStream fos = new FileOutputStream(fileName); - fos.write(classToString(i, false).getBytes()); + fos.write(classToString(i, false,pcode).getBytes()); fos.close(); } diff --git a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java b/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java index 07df548d0..36b536123 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java +++ b/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,6 +24,8 @@ import com.jpexs.asdec.abc.types.traits.*; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; public class ABCInputStream extends InputStream { @@ -31,6 +33,7 @@ public class ABCInputStream extends InputStream { private InputStream is; private long bytesRead = 0; private ByteArrayOutputStream bufferOs = null; + public static boolean DEBUG_READ=false; public void startBuffer() { bufferOs = new ByteArrayOutputStream(); @@ -51,6 +54,10 @@ public class ABCInputStream extends InputStream { public int read() throws IOException { bytesRead++; int i = is.read(); + if(DEBUG_READ) + { + System.out.println("Read:0x"+Integer.toHexString(i)); + } if (bufferOs != null) { if (i != -1) bufferOs.write(i); @@ -165,27 +172,48 @@ public class ABCInputStream extends InputStream { } public Multiname readMultiname() throws IOException { - int kind = read(); + int kind = readU8(); int namespace_index = -1; int name_index = -1; int namespace_set_index = -1; + List params=new ArrayList(); if ((kind == 7) || (kind == 0xd)) { // CONSTANT_QName and CONSTANT_QNameA. namespace_index = readU30(); name_index = readU30(); } + else + if ((kind == 0xf) || (kind == 0x10)) { //CONSTANT_RTQName and CONSTANT_RTQNameA + name_index = readU30(); + }else + if((kind==0x11)||(kind==0x12))//kind==0x11,0x12 nothing CONSTANT_RTQNameL and CONSTANT_RTQNameLA. + { + + } + else if ((kind == 9) || (kind == 0xe)) { // CONSTANT_Multiname and CONSTANT_MultinameA. name_index = readU30(); namespace_set_index = readU30(); } - if ((kind == 0xf) || (kind == 0x10)) { //CONSTANT_RTQName and CONSTANT_RTQNameA - name_index = readU30(); - } + else if ((kind == 0x1B) || (kind == 0x1C)) { //CONSTANT_MultinameL and CONSTANT_MultinameLA namespace_set_index = readU30(); } - //kind==0x11,0x12 nothing CONSTANT_RTQNameL and CONSTANT_RTQNameLA. - return new Multiname(kind, name_index, namespace_index, namespace_set_index); + else if(kind==0x1D) + { + //Constant_TypeName + name_index=readU30(); + int paramsLength=readU30(); + for(int i=0;i code = new LinkedList(); + public static boolean DEBUG_REWRITE=false; public static final int OPT_U30 = 0x100; public static final int OPT_U8 = 0x200; public static final int OPT_S24 = 0x300; @@ -85,25 +87,37 @@ public class AVM2Code { public static final int DAT_CASE_BASEOFFSET = OPT_S24 + 0x11; public static InstructionDefinition instructionSet[] = new InstructionDefinition[]{ new AddIns(), + new InstructionDefinition(0x9b,"add_d",new int[]{}), new AddIIns(), + new InstructionDefinition(0x53,"applytype",new int[]{AVM2Code.OPT_U30}), new AsTypeIns(), new AsTypeLateIns(), new BitAndIns(), new BitNotIns(), new BitOrIns(), new BitXorIns(), + new InstructionDefinition(0x01,"bkpt",new int[]{}), + new InstructionDefinition(0xf2,"bkptline",new int[]{AVM2Code.OPT_U30}), new CallIns(), + new InstructionDefinition(0x4d,"callinterface",new int[]{AVM2Code.OPT_U30}), new CallMethodIns(), new CallPropertyIns(), new CallPropLexIns(), new CallPropVoidIns(), new CallStaticIns(), new CallSuperIns(), + new InstructionDefinition(0x4b,"callsuperid",new int[]{}), new CallSuperVoidIns(), new CheckFilterIns(), new CoerceIns(), new CoerceAIns(), + new InstructionDefinition(0x81,"coerce_b",new int[]{}), + new InstructionDefinition(0x84,"coerce_d",new int[]{}), + new InstructionDefinition(0x83,"coerce_i",new int[]{}), + new InstructionDefinition(0x89,"coerce_o",new int[]{}), new CoerceSIns(), + new InstructionDefinition(0x88,"coerce_u",new int[]{}), + new InstructionDefinition(0x9a,"concat",new int[]{}), new ConstructIns(), new ConstructPropIns(), new ConstructSuperIns(), @@ -121,6 +135,7 @@ public class AVM2Code { new DecrementIns(), new DecrementIIns(), new DeletePropertyIns(), + new InstructionDefinition(0x6b,"deletepropertylate",new int[]{}), new DivideIns(), new DupIns(), new DXNSIns(), @@ -128,6 +143,9 @@ public class AVM2Code { new EqualsIns(), new EscXAttrIns(), new EscXElemIns(), + new InstructionDefinition(0x5f,"finddef",new int[]{AVM2Code.DAT_MULTINAME_INDEX}), + new InstructionDefinition(0x5b,"findpropglobalstrict",new int[]{AVM2Code.DAT_MULTINAME_INDEX}), + new InstructionDefinition(0x5c,"findpropglobal",new int[]{AVM2Code.DAT_MULTINAME_INDEX}), new FindPropertyIns(), new FindPropertyStrictIns(), new GetDescendantsIns(), @@ -139,6 +157,7 @@ public class AVM2Code { new GetLocal1Ins(), new GetLocal2Ins(), new GetLocal3Ins(), + new InstructionDefinition(0x67,"getouterscope",new int[]{AVM2Code.DAT_MULTINAME_INDEX}), new GetPropertyIns(), new GetScopeObjectIns(), new GetSlotIns(), @@ -195,6 +214,7 @@ public class AVM2Code { new PopIns(), new PopScopeIns(), new PushByteIns(), + new InstructionDefinition(0x22,"pushconstant",new int[]{AVM2Code.DAT_STRING_INDEX}), new PushDoubleIns(), new PushFalseIns(), new PushIntIns(), @@ -218,6 +238,7 @@ public class AVM2Code { new SetLocal3Ins(), new SetGlobalSlotIns(), new SetPropertyIns(), + new InstructionDefinition(0x69,"setpropertylate",new int[]{}), new SetSlotIns(), new SetSuperIns(), new StrictEqualsIns(), @@ -226,7 +247,22 @@ public class AVM2Code { new SwapIns(), new ThrowIns(), new TypeOfIns(), - new URShiftIns()}; + new URShiftIns(), + new InstructionDefinition(0x35,"li8",new int[]{}), + new InstructionDefinition(0x36,"li16",new int[]{}), + new InstructionDefinition(0x37,"li32",new int[]{}), + new InstructionDefinition(0x38,"lf32",new int[]{}), + new InstructionDefinition(0x39,"lf64",new int[]{}), + new InstructionDefinition(0x3A,"si8",new int[]{}), + new InstructionDefinition(0x3B,"si16",new int[]{}), + new InstructionDefinition(0x3C,"si32",new int[]{}), + new InstructionDefinition(0x3D,"sf32",new int[]{}), + new InstructionDefinition(0x3E,"sf64",new int[]{}), + new InstructionDefinition(0x50,"sxi1",new int[]{}), + new InstructionDefinition(0x51,"sxi8",new int[]{}), + new InstructionDefinition(0x52,"sxi16",new int[]{}) + + }; //endoflist public static final String IDENTOPEN = "/*IDENTOPEN*/"; public static final String IDENTCLOSE = "/*IDENTCLOSE*/"; @@ -245,6 +281,50 @@ public class AVM2Code { public AVM2Code() { } + public Object execute(HashMap arguments,ConstantPool constants){ + int pos=0; + LocalDataArea lda=new LocalDataArea(); + lda.localRegisters=arguments; + try{ + while(true){ + AVM2Instruction ins=code.get(pos); + if(ins.definition instanceof JumpIns){ + pos=adr2pos((Long)ins.getParamsAsList(constants).get(0)); + continue; + } + if(ins.definition instanceof IfFalseIns){ + Boolean b=(Boolean)lda.operandStack.pop(); + if(b==false){ + pos=adr2pos((Long)ins.getParamsAsList(constants).get(0)); + }else{ + pos++; + } + continue; + } + if(ins.definition instanceof IfTrueIns){ + Boolean b=(Boolean)lda.operandStack.pop(); + if(b==true){ + pos=adr2pos((Long)ins.getParamsAsList(constants).get(0)); + }else{ + pos++; + } + continue; + } + if(ins.definition instanceof ReturnValueIns){ + return lda.operandStack.pop(); + } + if(ins.definition instanceof ReturnVoidIns){ + return null; + } + ins.definition.execute(lda, constants, ins.getParamsAsList(constants)); + pos++; + } + }catch(ConvertException e){ + + } + return null; + } + public AVM2Code(InputStream is) throws IOException { ABCInputStream ais = new ABCInputStream(is); while (ais.available() > 0) { @@ -297,10 +377,22 @@ public class AVM2Code { } public byte[] getBytes() { + return getBytes(null); + } + public byte[] getBytes(byte origBytes[]) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); + + OutputStream cos; + if((origBytes!=null)&&(DEBUG_REWRITE)) + { + ByteArrayInputStream origis=new ByteArrayInputStream(origBytes); + cos=new CopyOutputStream(bos,origis); + }else{ + cos=bos; + } try { for (AVM2Instruction instruction : code) { - bos.write(instruction.getBytes()); + cos.write(instruction.getBytes()); } } catch (IOException ex) { } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java b/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java index 9fe96caa5..72a03b462 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java b/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java index 982e54009..e72fb436a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java b/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java index d03826daa..bd0b06384 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java b/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java index a294940c3..e9a1835ca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,14 +18,13 @@ package com.jpexs.asdec.abc.avm2; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; import java.util.Stack; public class LocalDataArea { public Stack operandStack = new Stack(); public Stack scopeStack = new Stack(); - public List localRegisters = new ArrayList(); + public HashMap localRegisters = new HashMap(); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java index 63778842a..fd50eff96 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,7 +23,7 @@ public class UnknownInstructionCode extends RuntimeException { public int code; public UnknownInstructionCode(int code) { - super("Unknown instruction code:" + Integer.toHexString(code)); + super("Unknown instruction code: 0x" + Integer.toHexString(code)); this.code = code; } } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java index 91167745c..d7fc9f2b4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java index a016b3b5a..74364a83b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java @@ -1,358 +1,223 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -package com.jpexs.asdec.abc.avm2.flowgraph; - -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConvertException; -import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfFalseIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfTrueIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.JumpIns; -import com.jpexs.asdec.abc.avm2.instructions.localregs.GetLocalTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.localregs.SetLocalTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.other.ReturnValueIns; -import com.jpexs.asdec.abc.avm2.instructions.other.ReturnVoidIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.DupIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PopIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PushFalseIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PushTrueIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.SwapIns; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * - * @author JPEXS - */ -public class Graph { - - public List parts; - public List ignored = new ArrayList(); - private int trueReg = -1; - private int falseReg = -1; - - public Graph(AVM2Code code) { - parts = new ArrayList(); - int start = checkSWFSecureStart(code); - makeGraph(new Stack(),code, start, parts, new ArrayList()); - do { - } while (optimizeDecisions(parts) > 0); - } - - private int checkSWFSecureStart(AVM2Code code) { - if (code.code.size() < 2) { - return 0; - } - if (!((code.code.get(0).definition instanceof PushFalseIns) || (code.code.get(0).definition instanceof PushTrueIns))) { - return 0; - } - if (!((code.code.get(1).definition instanceof PushFalseIns) || (code.code.get(1).definition instanceof PushTrueIns))) { - return 0; - } - System.out.println("A"); - int pos = 2; - Stack myStack = new Stack(); - int ip = 0; - int setCount = 0; - while (ip < code.code.size()) { - if (code.code.get(ip).definition instanceof PushFalseIns) { - myStack.push(Boolean.FALSE); - } else if (code.code.get(ip).definition instanceof PushTrueIns) { - myStack.push(Boolean.TRUE); - } else if (code.code.get(ip).definition instanceof SwapIns) { - Boolean b1 = myStack.pop(); - Boolean b2 = myStack.pop(); - myStack.push(b1); - myStack.push(b2); - } else if (code.code.get(ip).definition instanceof JumpIns) { - try { - ip = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); - } catch (ConvertException ex) { - Logger.getLogger(Graph.class.getName()).log(Level.SEVERE, null, ex); - } - continue; - } else if (code.code.get(ip).definition instanceof SetLocalTypeIns) { - Boolean val = myStack.pop(); - if (val == true) { - trueReg = ((SetLocalTypeIns) code.code.get(ip).definition).getRegisterId(code.code.get(ip)); - } else { - falseReg = ((SetLocalTypeIns) code.code.get(ip).definition).getRegisterId(code.code.get(ip)); - } - setCount++; - if (setCount == 2) { - return ip + 1; - } - } - ip++; - } - return 0; - } - - private int optimizeDecisions(List parts) { - for (int p = 0; p < parts.size(); p++) { - GraphPart part = parts.get(p); - if (part instanceof GraphDecision) { - /** - * if - * onTrue: nop - * nop - * link A - * onFalse: nop - * A - * B - * - * ==> - * - * if onTrue: nop - * nop - * onFalse: nop - * A - * B - */ - if (((GraphDecision) part).onTrue.size() > 0) { - GraphPart lastTruePart = ((GraphDecision) part).onTrue.get(((GraphDecision) part).onTrue.size() - 1); - if (lastTruePart instanceof GraphLink) { - for (int f = 0; f < ((GraphDecision) part).onFalse.size(); f++) { - if (((GraphDecision) part).onFalse.get(f).start == ((GraphLink) lastTruePart).ip) { - ((GraphDecision) part).onFalse.get(f).linkCount--; - ((GraphDecision) part).onTrue.remove(((GraphDecision) part).onTrue.size() - 1); - for (int k = f; k < ((GraphDecision) part).onFalse.size(); k++) { - parts.add(p + 1, ((GraphDecision) part).onFalse.remove(k)); - } - return optimizeDecisions(parts) + 1; - } - } - } - } - - /** - * if - * onTrue: nop - * nop - * A - * B - * onFalse: nop - * link A - * - * ==> - * - * if onTrue: nop - * nop - * onFalse: nop - * A - * B - */ - if (((GraphDecision) part).onFalse.size() > 0) { - GraphPart lastFalsePart = ((GraphDecision) part).onFalse.get(((GraphDecision) part).onFalse.size() - 1); - if (lastFalsePart instanceof GraphLink) { - for (int t = 0; t < ((GraphDecision) part).onTrue.size(); t++) { - if (((GraphDecision) part).onTrue.get(t).start == ((GraphLink) lastFalsePart).ip) { - ((GraphDecision) part).onTrue.get(t).linkCount--; - ((GraphDecision) part).onFalse.remove(((GraphDecision) part).onFalse.size() - 1); - for (int k = t; k < ((GraphDecision) part).onTrue.size(); k++) { - parts.add(p + 1, ((GraphDecision) part).onTrue.remove(k)); - } - return optimizeDecisions(parts) + 1; - } - } - } - } - - /* - * if - * onTrue: nop - * link A - * onFalse: nop - * link A - * - * ==> - * if - * onTrue: nop - * onFalse: nop - * link A - * - */ - if ((((GraphDecision) part).onTrue.size() > 0)&&(((GraphDecision) part).onFalse.size() > 0)) { - GraphPart lastFalsePart = ((GraphDecision) part).onFalse.get(((GraphDecision) part).onFalse.size() - 1); - GraphPart lastTruePart = ((GraphDecision) part).onTrue.get(((GraphDecision) part).onTrue.size() - 1); - if((lastFalsePart instanceof GraphLink)&&(lastTruePart instanceof GraphLink)){ - if(((GraphLink)lastFalsePart).ip==((GraphLink)lastTruePart).ip){ - ((GraphDecision) part).onFalse.remove(((GraphDecision) part).onFalse.size()-1); - ((GraphDecision) part).onTrue.remove(((GraphDecision) part).onTrue.size()-1); - parts.add(p+1,lastTruePart); - return optimizeDecisions(parts) + 1; - } - } - } - } - } - - int optcount = 0; - for (int p = 0; p < parts.size(); p++) { - GraphPart part = parts.get(p); - if (part instanceof GraphDecision) { - optcount += optimizeDecisions(((GraphDecision) part).onTrue); - optcount += optimizeDecisions(((GraphDecision) part).onFalse); - } - } - return optcount; - } - - private GraphBlock splitBlock(GraphBlock block, int ip, List allBlocks) { - return processSplit(block, parts, ip, allBlocks); - } - - private GraphBlock processSplit(GraphBlock block, List parts, int ip, List allBlocks) { - for (int i = 0; i < parts.size(); i++) { - if (parts.get(i) == block) { - parts.remove(i); - GraphBlock gr1 = new GraphBlock(block.start, ip - 1); - parts.add(i, gr1); - gr1.linkCount=block.linkCount; - GraphBlock gr2 = new GraphBlock(ip, block.end); - parts.add(i + 1, gr2); - allBlocks.remove(block); - allBlocks.add(gr1); - allBlocks.add(gr2); - return (GraphBlock) parts.get(i + 1); - } else if (parts.get(i) instanceof GraphDecision) { - GraphBlock gr = processSplit(block, ((GraphDecision) parts.get(i)).onTrue, ip, allBlocks); - if (gr != null) { - return gr; - } - gr = processSplit(block, ((GraphDecision) parts.get(i)).onFalse, ip, allBlocks); - if (gr != null) { - return gr; - } - } - } - return null; - } - - private void makeGraph(Stack myStack,AVM2Code code, int start, List parts, List allBlocks) { - try { - int ip = start; - while (ip < code.code.size()) { - for (GraphBlock block : allBlocks) { - if (block.contains(ip)) { - if (block.start < ip) { - block = splitBlock(block, ip, allBlocks); - } - if (ip - 1 >= start) { - GraphBlock bl = new GraphBlock(start, ip - 1); - parts.add(bl); - allBlocks.add(bl); - } - parts.add(new GraphLink(block)); - return; - } - } - boolean forceJump = false; - boolean forceSkip = false; - if (code.code.get(ip).definition instanceof IfTrueIns) { - if (!myStack.empty()) { - if (myStack.pop() == true) { - forceJump = true; - } else { - forceSkip = true; - } - } - } - if (code.code.get(ip).definition instanceof IfFalseIns) { - if (!myStack.empty()) { - if (myStack.pop() == false) { - forceJump = true; - } else { - forceSkip = true; - } - } - } - if (code.code.get(ip).definition instanceof GetLocalTypeIns) { - int locreg = ((GetLocalTypeIns) code.code.get(ip).definition).getRegisterId(code.code.get(ip)); - if (locreg == trueReg) { - myStack.push(Boolean.TRUE); - ignored.add(ip); - } - if (locreg == falseReg) { - myStack.push(Boolean.FALSE); - ignored.add(ip); - } - } else if (code.code.get(ip).definition instanceof PopIns) { - if (!myStack.empty()) { - myStack.pop(); - ignored.add(ip); - } - } else if (code.code.get(ip).definition instanceof SwapIns) { - if (myStack.size() >= 2) { - Boolean b1 = myStack.pop(); - Boolean b2 = myStack.pop(); - myStack.push(b1); - myStack.push(b2); - ignored.add(ip); - } - } else if (code.code.get(ip).definition instanceof DupIns) { - if (!myStack.empty()) { - Boolean b = myStack.pop(); - myStack.push(b); - myStack.push(b); - ignored.add(ip); - } - } else if ((code.code.get(ip).definition instanceof JumpIns) || forceJump) { - if (ip - 1 >= start) { - GraphBlock bl = new GraphBlock(start, ip - 1); - parts.add(bl); - allBlocks.add(bl); - } - int jumpIp = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); - makeGraph(myStack,code, jumpIp, parts, allBlocks); - return; - } else if (code.code.get(ip).definition instanceof IfTypeIns) { - if (forceSkip) { - ip++; - continue; - } - - if (ip - 1 >= start) { - GraphBlock bl = new GraphBlock(start, ip - 1); - parts.add(bl); - allBlocks.add(bl); - } - int jumpIp = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); - GraphDecision dec = new GraphDecision(); - parts.add(dec); - dec.start = ip; - makeGraph(myStack,code, jumpIp, dec.onTrue, allBlocks); - makeGraph(myStack,code, ip + 1, dec.onFalse, allBlocks); - return; - } else if ((code.code.get(ip).definition instanceof ReturnValueIns) || (code.code.get(ip).definition instanceof ReturnVoidIns)) { - ip++; - break; - } - ip++; - } - GraphFinalBlock bl = new GraphFinalBlock(start, ip - 1); - parts.add(bl); - allBlocks.add(bl); - } catch (ConvertException ex) { - Logger.getLogger(Graph.class.getName()).log(Level.SEVERE, null, ex); - } - } -} +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.avm2.flowgraph; + +import com.jpexs.asdec.abc.avm2.AVM2Code; +import com.jpexs.asdec.abc.avm2.ConvertException; +import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; +import com.jpexs.asdec.abc.avm2.instructions.jumps.IfFalseIns; +import com.jpexs.asdec.abc.avm2.instructions.jumps.IfTrueIns; +import com.jpexs.asdec.abc.avm2.instructions.jumps.JumpIns; +import com.jpexs.asdec.abc.avm2.instructions.localregs.GetLocalTypeIns; +import com.jpexs.asdec.abc.avm2.instructions.localregs.SetLocalTypeIns; +import com.jpexs.asdec.abc.avm2.instructions.other.ReturnValueIns; +import com.jpexs.asdec.abc.avm2.instructions.other.ReturnVoidIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.DupIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.PopIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.PushFalseIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.PushTrueIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.SwapIns; +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author JPEXS + */ +public class Graph { + + public GraphPart head; + public List ignored = new ArrayList(); + private int trueReg = -1; + private int falseReg = -1; + + public Graph(AVM2Code code) { + int start = checkSWFSecureStart(code); + head=makeGraph(new Stack(), code, start, new ArrayList()); + } + + private int checkSWFSecureStart(AVM2Code code) { + if (code.code.size() < 2) { + return 0; + } + if (!((code.code.get(0).definition instanceof PushFalseIns) || (code.code.get(0).definition instanceof PushTrueIns))) { + return 0; + } + if (!((code.code.get(1).definition instanceof PushFalseIns) || (code.code.get(1).definition instanceof PushTrueIns))) { + return 0; + } + int pos = 2; + Stack myStack = new Stack(); + int ip = 0; + int setCount = 0; + while (ip < code.code.size()) { + if (code.code.get(ip).definition instanceof PushFalseIns) { + myStack.push(Boolean.FALSE); + } else if (code.code.get(ip).definition instanceof PushTrueIns) { + myStack.push(Boolean.TRUE); + } else if (code.code.get(ip).definition instanceof SwapIns) { + Boolean b1 = myStack.pop(); + Boolean b2 = myStack.pop(); + myStack.push(b1); + myStack.push(b2); + } else if (code.code.get(ip).definition instanceof JumpIns) { + try { + ip = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); + } catch (ConvertException ex) { + Logger.getLogger(Graph.class.getName()).log(Level.SEVERE, null, ex); + } + continue; + } else if (code.code.get(ip).definition instanceof SetLocalTypeIns) { + Boolean val = myStack.pop(); + if (val == true) { + trueReg = ((SetLocalTypeIns) code.code.get(ip).definition).getRegisterId(code.code.get(ip)); + } else { + falseReg = ((SetLocalTypeIns) code.code.get(ip).definition).getRegisterId(code.code.get(ip)); + } + setCount++; + if (setCount == 2) { + return ip + 1; + } + } + ip++; + } + return 0; + } + + + private GraphPart makeGraph(Stack myStack,AVM2Code code, int start, List allBlocks) { + GraphPart ret=new GraphPart(start,-1); + ret.instanceCount=1; + allBlocks.add(ret); + GraphPart actual=ret; + try { + int ip = start; + while (ip < code.code.size()) { + for (GraphPart block : allBlocks) { + if (block.containsIP(ip)) { + if(block.start= 2) { + Boolean b1 = myStack.pop(); + Boolean b2 = myStack.pop(); + myStack.push(b1); + myStack.push(b2); + ignored.add(ip); + } + } else if (code.code.get(ip).definition instanceof DupIns) { + if (!myStack.empty()) { + Boolean b = myStack.pop(); + myStack.push(b); + myStack.push(b); + ignored.add(ip); + } + } else if ((code.code.get(ip).definition instanceof JumpIns) || forceJump) { + + int jumpIp = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); + actual.end=ip; + GraphPart newActual=makeGraph(myStack,code,jumpIp,allBlocks); + actual.nextParts.add(newActual); + return ret; + } else if (code.code.get(ip).definition instanceof IfTypeIns) { + if (forceSkip) { + ip++; + continue; + } + + actual.end=ip; + int jumpIp = code.adr2pos(code.pos2adr(ip + 1) + code.code.get(ip).operands[0]); + GraphPart onTrue=makeGraph(myStack,code, jumpIp, allBlocks); + actual.nextParts.add(onTrue); + GraphPart onFalse=makeGraph(myStack,code, ip + 1, allBlocks); + actual.nextParts.add(onFalse); + return ret; + } else if ((code.code.get(ip).definition instanceof ReturnValueIns) || (code.code.get(ip).definition instanceof ReturnVoidIns)) { + ip++; + break; + } + ip++; + } + actual.end=ip-1; + return ret; + } catch (ConvertException ex) { + Logger.getLogger(Graph.class.getName()).log(Level.SEVERE, null, ex); + } + return null; + } + +} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphBlock.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphBlock.java deleted file mode 100644 index 9dad7263d..000000000 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphBlock.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.avm2.flowgraph; - -/** - * - * @author JPEXS - */ -public class GraphBlock extends GraphPart { - public int end; - - public GraphBlock(int start, int end) { - this.start = start; - this.end = end; - } - - public boolean contains(int ip){ - return ip>=start && ip<=end; - } - - @Override - public String toString() { - return "Block "+(start+1)+"-"+(end+1)+(linkCount>0?" ("+linkCount+" links)":""); - } - - -} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphDecision.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphDecision.java deleted file mode 100644 index 4182067d2..000000000 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphDecision.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.avm2.flowgraph; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author JPEXS - */ -public class GraphDecision extends GraphPart { - public List onTrue=new ArrayList(); - public List onFalse=new ArrayList(); - - @Override - public String toString() { - return "Decision "+(start+1); - } - -} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphFinalBlock.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphFinalBlock.java deleted file mode 100644 index 27b9c3ad0..000000000 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphFinalBlock.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.avm2.flowgraph; - -/** - * - * @author JPEXS - */ -public class GraphFinalBlock extends GraphBlock { - - public GraphFinalBlock(int start,int end) { - super(start,end); - } - - @Override - public String toString() { - return "Final"+super.toString(); - } -} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphLink.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphLink.java deleted file mode 100644 index 340a2b4b6..000000000 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphLink.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.avm2.flowgraph; - -/** - * - * @author JPEXS - */ -public class GraphLink extends GraphPart { - public int ip=0; - - public GraphLink(GraphPart linked) { - ip=linked.start; - linked.linkCount++; - } - - @Override - public String toString() { - return "Link to "+(ip+1); - } - -} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphPart.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphPart.java index 9536f760e..45f06e3d6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphPart.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/GraphPart.java @@ -1,28 +1,72 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.avm2.flowgraph; - -/** - * - * @author JPEXS - */ -public class GraphPart { - public int start=0; - public int linkCount=0; -} +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.avm2.flowgraph; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author JPEXS + */ +public class GraphPart { + public int start=0; + public int end=0; + public int instanceCount=0; + public List nextParts=new ArrayList(); + + public int posX=-1; + public int posY=-1; + + + public GraphPart(int start,int end) { + this.start=start; + this.end=end; + } + + @Override + public String toString() { + if(end"; + } + return ""+(start+1)+"-"+(end+1)+(instanceCount>1?"("+instanceCount+" links)":""); + } + + + + + public boolean containsIP(int ip){ + return (ip>=start)&&(ip<=end); + } + + + private boolean containsPart(GraphPart part,GraphPart what,List used){ + if(used.contains(part)) return false; + used.add(part); + for(GraphPart subpart:part.nextParts){ + if(subpart==what) return true; + if(containsPart(subpart,what,used)) return true; + } + return false; + } + + public boolean containsPart(GraphPart what){ + return containsPart(this,what,new ArrayList()); + } +} diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java index 363239ce3..09130f5c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -111,6 +111,45 @@ public class AVM2Instruction { return ret; } + public List getParamsAsList(ConstantPool constants){ + List s = new ArrayList(); + for (int i = 0; i < definition.operands.length; i++) { + switch (definition.operands[i]) { + case AVM2Code.DAT_MULTINAME_INDEX: + s.add(constants.constant_multiname[operands[i]]); + break; + case AVM2Code.DAT_STRING_INDEX: + s.add(constants.constant_string[operands[i]]); + break; + case AVM2Code.DAT_INT_INDEX: + s.add(new Long(constants.constant_int[operands[i]])); + break; + case AVM2Code.DAT_UINT_INDEX: + s.add(new Long(constants.constant_uint[operands[i]])); + break; + case AVM2Code.DAT_DOUBLE_INDEX: + s.add(new Double(constants.constant_double[operands[i]])); + break; + case AVM2Code.DAT_OFFSET: + s.add(new Long(offset + operands[i] + getBytes().length)); + break; + case AVM2Code.DAT_CASE_BASEOFFSET: + s.add(new Long(offset + operands[i])); + break; + case AVM2Code.OPT_CASE_OFFSETS: + s.add(new Long(operands[i])); + for (int j = i + 1; j < operands.length; j++) { + s.add(new Long(offset + operands[j])); + } + break; + default: + s.add(new Long(operands[i])); + } + + } + return s; + } + public String getParams(ConstantPool constants) { String s = ""; for (int i = 0; i < definition.operands.length; i++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java index c6ae422b5..cb6ae5cd6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java index 6c1ecdf65..08af6a643 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -76,6 +76,7 @@ public class InstructionDefinition { } public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + throw new UnsupportedOperationException("Instruction "+instructionName+" not implemented"); } public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java index e67e68d5a..b139e0008 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java index 0a1f766f1..54622babb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java index 3d500dc14..1b61b807a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java index 2d2800b37..26119ce6c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java index 133b120fa..d140c6121 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java index bbf5a9d3f..f2a063308 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,8 +38,8 @@ public class DivideIns extends InstructionDefinition { @Override public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { - Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); + Object o1 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { Long ret = new Long(((Long) o1).longValue() / ((Long) o2).longValue()); lda.operandStack.push(ret); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java index 64cedcf7d..93c6ae4d7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java index 3c040b33a..47753dd7d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java index 086af76a0..b1882b50b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -35,6 +36,19 @@ public class ModuloIns extends InstructionDefinition { super(0xa4, "modulo", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + Object o1 = lda.operandStack.pop(); + Object o2 = lda.operandStack.pop(); + + if ((o1 instanceof Long) && ((o2 instanceof Long))) { + Long ret = new Long(((Long) o2).longValue() % ((Long) o1).longValue()); + lda.operandStack.push(ret); + } else { + throw new RuntimeException("Cannot modulo"); + } + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem v2 = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java index b37d3811f..69e72da19 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java index 8d3b32532..0f74974f1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -35,6 +36,27 @@ public class MultiplyIns extends InstructionDefinition { super(0xa2, "multiply", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + Object o1 = lda.operandStack.pop(); + Object o2 = lda.operandStack.pop(); + if ((o1 instanceof Long) && ((o2 instanceof Long))) { + Long ret = new Long(((Long) o1).longValue() * ((Long) o2).longValue()); + lda.operandStack.push(ret); + } else if ((o1 instanceof Double) && ((o2 instanceof Double))) { + Double ret = new Double(((Double) o1).doubleValue() * ((Double) o2).doubleValue()); + lda.operandStack.push(ret); + } else if ((o1 instanceof Long) && ((o2 instanceof Double))) { + Double ret = new Double(((Long) o1).longValue() * ((Double) o2).doubleValue()); + lda.operandStack.push(ret); + } else if ((o1 instanceof Double) && ((o2 instanceof Long))) { + Double ret = new Double(((Double) o1).doubleValue() * ((Long) o2).longValue()); + lda.operandStack.push(ret); + } else { + throw new RuntimeException("Cannot multiply"); + } + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem v2 = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java index 361ab1d5b..fe612f973 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java index f97792524..dd7e4c398 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java index bee90a55c..74e0462bd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java index 6e770f071..30ef53eb0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java index 7cfafdd11..fa150669a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java index 8e17c4990..5dba41aad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java index 659e93ffc..6dbcc9645 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java index c97578175..f5cfe88bf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java index c1396d733..1c0f4565a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java index 5d7a76d22..1d8cb3fc3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java index 181d1081b..1801e6caf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java index df98232ec..79e4d2f2a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java index 8ad1ebfe7..6bdd6a7c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java index 885cf03ed..dca4499f4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java index 6cdd9ee9e..50fc94ef1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java index 3e75b7ec1..157f735a2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java index 09fc202ae..b743efc8c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java index e84e871c4..f3b1bb92a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java index d30d6a98d..ee70a5203 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java index 15ff35285..8928ec270 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java index 316e5861c..26b12c93d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java index 7e32a6627..09b55010c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java index b21cd2ce5..9d009ab88 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java index 4eb7c8533..80effcbc0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java index 5746f4195..91097eb95 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java index fc9a16241..ddd02a7e4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,7 +43,7 @@ public class NewFunctionIns extends InstructionDefinition { MethodBody mybody = abc.findBody(methodIndex); String bodyStr = ""; if (mybody != null) { - bodyStr = mybody.toString(isStatic, classIndex, abc, constants, method_info, false); + bodyStr = mybody.toString(false,isStatic, classIndex, abc, constants, method_info, false); } stack.push(new NewFunctionTreeItem(ins, method_info[methodIndex].getParamStr(constants), method_info[methodIndex].getReturnTypeStr(constants), bodyStr)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java index ab77edc03..0dcd6849d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java index 3428a6b06..0ff15e273 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java index 06d5204b7..0d9e06a2d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java index b571bfedb..98112506d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java index 75dfbff94..b5b68ebfb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java index 4f90f3775..df9cdb7a5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java index 5a78f683d..add2581f5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java index b522caee8..bbba8aa1c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java index 6173e1bde..6d8fe14b5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java index 7a96c6331..f87dad5d2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java index 06a6e7463..b8ad042aa 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java index 64438703f..f0205fdbb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java index 30193312c..4a79a47de 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java index 7e8b1184e..fd7cede6c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java index 417af05ed..fb276eeca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java index 3be304f3f..8a2dda53e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java index 06e0351ca..af49cc76a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java index f36348b82..5a0f510f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java index b5758c2c3..c90ae7400 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java index 971d4c45e..12334d19d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java index 6e6d255ce..7dff596b9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java index b9b64f674..1ede1074e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java index a79b93cf8..2edf9b509 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java index dd9c8aac9..186f1d6c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java index 10743ddc5..c0dc8d112 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java index 9a4c6304d..e116d1fff 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java index 861390d58..93d75886e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java index 643b78a9f..7d6512474 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java index cdbcc8b79..bda5605c2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,14 +43,14 @@ public class DecLocalIIns extends InstructionDefinition { Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } else if (obj instanceof Double) { Double obj2 = ((Double) obj).doubleValue() - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } if (obj instanceof String) { Double obj2 = Double.parseDouble((String) obj) - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } else { throw new RuntimeException("Cannot decrement local register"); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java index eb82b0d92..7aa42fe81 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,14 +43,14 @@ public class DecLocalIns extends InstructionDefinition { Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } else if (obj instanceof Double) { Double obj2 = ((Double) obj).doubleValue() - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } if (obj instanceof String) { Double obj2 = Double.parseDouble((String) obj) - 1; - lda.localRegisters.set(locRegIndex, obj2); + lda.localRegisters.put(locRegIndex, obj2); } else { throw new RuntimeException("Cannot decrement local register"); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java index 1821ad9b8..5019a094e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ClassTreeItem; @@ -36,6 +37,11 @@ public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeI super(0xd0, "getlocal_0", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(lda.localRegisters.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { if (isStatic) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java index 6278da758..5e6e77042 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; @@ -35,6 +36,11 @@ public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeI super(0xd1, "getlocal_1", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(lda.localRegisters.get(1)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new LocalRegTreeItem(ins, 1, localRegs.get(1))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java index ed5953552..6da267bd4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; @@ -35,6 +36,11 @@ public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeI super(0xd2, "getlocal_2", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(lda.localRegisters.get(2)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new LocalRegTreeItem(ins, 2, localRegs.get(2))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java index 4bbe7a7ff..afee148cc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; @@ -35,6 +36,13 @@ public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeI super(0xd3, "getlocal_3", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(lda.localRegisters.get(3)); + } + + + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new LocalRegTreeItem(ins, 3, localRegs.get(3))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java index 54ff59dad..f289f9764 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; @@ -36,6 +37,13 @@ public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIn super(0x62, "getlocal", new int[]{AVM2Code.DAT_LOCAL_REG_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(lda.localRegisters.get((int)(long)(Long)arguments.get(0))); + } + + + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { int regIndex = ins.operands[0]; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java index 78fa99932..769a87983 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java index a49f00a2c..0ec50d2a1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java index b55d92ea4..82bd39404 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java index 5e8af0df8..4167c089c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java index bba8a60c5..e1df496a2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; @@ -38,6 +39,11 @@ public class SetLocal0Ins extends InstructionDefinition implements SetTypeIns, S super(0xd4, "setlocal_0", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.localRegisters.put(0,lda.operandStack.pop()); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java index 077267174..18d9506a6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; @@ -38,6 +39,11 @@ public class SetLocal1Ins extends InstructionDefinition implements SetTypeIns, S super(0xd5, "setlocal_1", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.localRegisters.put(1,lda.operandStack.pop()); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java index 78f0e06d2..2b00710da 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; @@ -38,6 +39,11 @@ public class SetLocal2Ins extends InstructionDefinition implements SetTypeIns, S super(0xd6, "setlocal_2", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.localRegisters.put(2,lda.operandStack.pop()); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java index b363970eb..733f7b65b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; @@ -38,6 +39,11 @@ public class SetLocal3Ins extends InstructionDefinition implements SetTypeIns, S super(0xd7, "setlocal_3", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.localRegisters.put(3,lda.operandStack.pop()); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java index 3648622fa..a34aade93 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; @@ -39,6 +40,12 @@ public class SetLocalIns extends InstructionDefinition implements SetTypeIns, Se super(0x63, "setlocal", new int[]{AVM2Code.DAT_LOCAL_REG_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.localRegisters.put((int)(long)(Long)arguments.get(0),lda.operandStack.pop()); + } + + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java index 1c8947c72..380fa9d77 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java index 9f7031b81..b112a499c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java index c5f29ed94..9399f3e93 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java index a4b82a0a8..3d26aa185 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java index 4c0fc2075..9ffea9144 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java index f847b6016..57bb141d3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java index fa9207311..be1b57d35 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java index c06081fbb..4db5ed5bf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java index 644b3dcfa..933b3e078 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java index 79b6af83c..d9c6d6d37 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java index d0d821e34..ef16b2eba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java index 186ac609d..c815dcace 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java index 9d7b7478f..0ea4e1d80 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java index e7e049503..11b04a9cf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java index b75bce364..5b97d9e8f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java index 165a8c3ea..15c1f1920 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java index f610ceb28..00c75eaa2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java index 526546387..bd6343ef2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java index 5d926deee..bd3eef52b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java index 711c335b2..5bfe8db7e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java index 8f74b1682..f48d68f89 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java index 2247bbfb1..be5cf6b4e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java index bb398c2b0..249868ee6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java index 0a91e10d1..e8d6375e1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java index 9f2f7f32d..76b5e0b7c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java index b37a7dd4e..42d421aae 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java index d9a630eff..a4342da13 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java index 300e0b58d..10e8f8ab1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java index daa7bd3bc..0c8d63e35 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -34,6 +35,11 @@ public class PopIns extends InstructionDefinition { super(0x29, "pop", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.pop(); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { if (stack.size() > 0) diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java index 95e7610ca..90d6a0ad7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -38,6 +39,11 @@ public class PopScopeIns extends InstructionDefinition { super(0x1d, "popscope", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.scopeStack.pop(); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc) { TreeItem scope = (TreeItem) scopeStack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java index 98e0703dd..dce0b2d21 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; @@ -36,6 +37,13 @@ public class PushByteIns extends InstructionDefinition { super(0x24, "pushbyte", new int[]{AVM2Code.OPT_BYTE}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + + + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new IntegerValueTreeItem(ins, new Long(ins.operands[0]))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java index 0d4c62c99..07eb11d35 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.FloatValueTreeItem; @@ -36,6 +37,11 @@ public class PushDoubleIns extends InstructionDefinition { super(0x2f, "pushdouble", new int[]{AVM2Code.DAT_DOUBLE_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new FloatValueTreeItem(ins, constants.constant_double[ins.operands[0]])); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java index 50c3aa868..9767d9edc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; @@ -35,6 +36,11 @@ public class PushFalseIns extends InstructionDefinition { super(0x27, "pushfalse", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(Boolean.FALSE); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new BooleanTreeItem(ins, Boolean.FALSE)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java index 1249f0e46..a89cc9caa 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; @@ -36,6 +37,11 @@ public class PushIntIns extends InstructionDefinition { super(0x2d, "pushint", new int[]{AVM2Code.DAT_INT_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new IntegerValueTreeItem(ins, constants.constant_int[ins.operands[0]])); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java index 9ed6f797f..ea3a1d05e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java index b996aff06..fe6a04f41 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java index b65a03c3b..86376cc65 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java index 0ff693a10..8692988a8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -34,6 +35,11 @@ public class PushScopeIns extends InstructionDefinition { super(0x30, "pushscope", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.scopeStack.push(lda.operandStack.pop()); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { scopeStack.push(stack.pop()); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java index 7d3b2969f..1dd0b9919 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; @@ -36,6 +37,11 @@ public class PushShortIns extends InstructionDefinition { super(0x25, "pushshort", new int[]{AVM2Code.OPT_U30}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new IntegerValueTreeItem(ins, new Long(ins.operands[0]))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java index 90e626d57..1498b9c6a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem; @@ -36,6 +37,11 @@ public class PushStringIns extends InstructionDefinition { super(0x2c, "pushstring", new int[]{AVM2Code.DAT_STRING_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new StringTreeItem(ins, constants.constant_string[ins.operands[0]])); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java index 2ff313ab8..7d8991baf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,6 +19,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; @@ -34,6 +35,11 @@ public class PushTrueIns extends InstructionDefinition { public PushTrueIns() { super(0x26, "pushtrue", new int[]{}); } + + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(Boolean.TRUE); + } @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java index cb72e39e4..94124954d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; @@ -36,6 +37,11 @@ public class PushUIntIns extends InstructionDefinition { super(0x2e, "pushuint", new int[]{AVM2Code.DAT_UINT_INDEX}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + lda.operandStack.push(arguments.get(0)); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc) { stack.push(new IntegerValueTreeItem(ins, constants.constant_uint[ins.operands[0]])); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java index 0637656ee..8ec8c35fc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java index ef287763f..6fda7b891 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java index 5e6db387b..9218265c7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; @@ -36,6 +37,14 @@ public class SwapIns extends InstructionDefinition { super(0x2b, "swap", new int[]{}); } + @Override + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + Object obj1 = lda.operandStack.pop(); + Object obj2 = lda.operandStack.pop(); + lda.operandStack.push(obj1); + lda.operandStack.push(obj2); + } + @Override public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, MethodBody body, ABC abc) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java index 957b48db0..38a32c98d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java index f7f9de85d..20cd87f38 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java index 2d86c267e..cc66aa372 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java index 515b12077..dd066f642 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java index 65aef1d24..12a0cec48 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java index 4c593948e..cb58c2610 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java index 4d579e2aa..fd0588ac5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java index b1ef7a7be..36e13fe24 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java index de65125f6..9665d10ac 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java index ee0a8f1ec..f9c042ee1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java index eb0d10298..84458f8c3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java index f656a443c..9e68f0d40 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java index 049eb7348..4cbc681ea 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java index 062aada16..7fa579a45 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java index 0e433b443..4c2333478 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java index efc97c6c7..2f2382c19 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java index f1a2b14eb..b486c1113 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java index d80490fca..4882e3abf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java index 8bded8056..305cbed81 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java index 7863dcf0f..3ccf419b2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java index cfdcd16a0..874365f52 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java index 35411a0d8..d1bc0ba1d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java @@ -1,9 +1,23 @@ -/* The following code was generated by JFlex 1.4.3 on 19.9.10 10:36 */ +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.avm2.parser; -/* Flash assembler language lexer specification */ - -package com.jpexs.asdec.abc.avm2.parser; - /** * This class is a scanner generated by @@ -431,28 +445,28 @@ public final class Flasm3Lexer { private boolean zzEOFDone; /* user code: */ - - StringBuffer string = new StringBuffer(); - boolean isMultiname=false; - long multinameId=0; - - - /** - * Create an empty lexer, yyrset will be called later to reset and assign - * the reader - */ - public Flasm3Lexer() { - - } - - public int yychar() { - return yychar; - } - - public int yyline() { - return yyline+1; - } - + + StringBuffer string = new StringBuffer(); + boolean isMultiname=false; + long multinameId=0; + + + /** + * Create an empty lexer, yyrset will be called later to reset and assign + * the reader + */ + public Flasm3Lexer() { + + } + + public int yychar() { + return yychar; + } + + public int yyline() { + return yyline+1; + } + /** @@ -818,7 +832,7 @@ public final class Flasm3Lexer { } case 29: break; case 26: - { String s=yytext(); + { String s=yytext(); return new ParsedSymbol(ParsedSymbol.TYPE_EXCEPTION_TARGET,Integer.parseInt(s.substring(16,s.length()-1))); } case 30: break; @@ -827,22 +841,22 @@ public final class Flasm3Lexer { } case 31: break; case 13: - { char val = (char) Integer.parseInt(yytext().substring(1),8); + { char val = (char) Integer.parseInt(yytext().substring(1),8); string.append( val ); } case 32: break; case 25: - { String s=yytext(); + { String s=yytext(); return new ParsedSymbol(ParsedSymbol.TYPE_EXCEPTION_START,Integer.parseInt(s.substring(15,s.length()-1))); } case 33: break; case 5: - { yybegin(PARAMETERS); - // length also includes the trailing quote - if(isMultiname){ - return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME,new Long(multinameId)); - }else{ - return new ParsedSymbol(ParsedSymbol.TYPE_STRING,string.toString()); + { yybegin(PARAMETERS); + // length also includes the trailing quote + if(isMultiname){ + return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME,new Long(multinameId)); + }else{ + return new ParsedSymbol(ParsedSymbol.TYPE_STRING,string.toString()); } } case 34: break; @@ -851,7 +865,7 @@ public final class Flasm3Lexer { } case 35: break; case 2: - { yybegin(PARAMETERS); + { yybegin(PARAMETERS); return new ParsedSymbol(ParsedSymbol.TYPE_INSTRUCTION_NAME,yytext()); } case 36: break; @@ -860,7 +874,7 @@ public final class Flasm3Lexer { } case 37: break; case 24: - { String s=yytext(); + { String s=yytext(); return new ParsedSymbol(ParsedSymbol.TYPE_EXCEPTION_END,Integer.parseInt(s.substring(13,s.length()-1))); } case 38: break; @@ -873,7 +887,7 @@ public final class Flasm3Lexer { } case 40: break; case 11: - { String s=yytext(); + { String s=yytext(); return new ParsedSymbol(ParsedSymbol.TYPE_LABEL,s.substring(0,s.length()-1)); } case 41: break; @@ -882,8 +896,8 @@ public final class Flasm3Lexer { } case 42: break; case 10: - { isMultiname=false; - yybegin(STRING); + { isMultiname=false; + yybegin(STRING); string.setLength(0); } case 43: break; @@ -904,10 +918,10 @@ public final class Flasm3Lexer { } case 47: break; case 23: - { isMultiname=true; - String s=yytext(); - multinameId=Long.parseLong(s.substring(2,s.length()-2)); - yybegin(STRING); + { isMultiname=true; + String s=yytext(); + multinameId=Long.parseLong(s.substring(2,s.length()-2)); + yybegin(STRING); string.setLength(0); } case 48: break; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java index a371e7daa..2aade5321 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java index 7ab025c09..be55e79c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java index 0ab15a2ff..a9598dfcf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java index 4e3af23a7..a7fb53bbb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java index 11181960a..fb649879a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java index 620baab2b..ac20d60c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java index 0d5000f39..21e47965b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java index 5329fbdf9..33eb543ef 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java index b71e7f32a..a684d53f7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java index 203da2302..440c36007 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java index 3d3675fff..fbfba63ce 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java index 7d2f40776..71a933e57 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java index dd8af8015..46e96aeba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java index 704c80064..583399e99 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java index 6e6589826..a70708723 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java index 46f4c0255..2e2225fde 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java index 7d916c069..ff3351e23 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java index c2f7616dc..28a518f1b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java index 1706399d9..792c96157 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EachTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EachTreeItem.java index a97d6f66c..4fdb4e56e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EachTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EachTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java index 5f9645caf..8d7630c87 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java index 8d267c8ae..dbc171908 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java index 880efc539..22e1ee512 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java index 93daa9490..5f5c0bad1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java index a7ecb3ccd..a9153c5b8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java index 0ae2239f5..a8d750f5d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java index 0967407ee..431c49cf8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java index e9af437ce..9c723b032 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java index cb05be7c3..b5b3871d0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java index 3f554dfe6..48e2affbf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java index 268dd6a24..d6584e179 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java index 20ca5eb7b..a88d4f260 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java index d65f5b299..d8b32668f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java index 099ab9251..bcd149006 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java index 1d8600d1e..92fe7524e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java index 207da9ba3..a28f46a90 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java index 3f92031e3..9d605f758 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java index 486aac773..1df5f209d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java index 8ffd739a6..306165986 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java index 5abfe556b..afa25d1ad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java index 12b125d7d..004912803 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java index a68798f9b..8a81e799d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java index 3f336daab..2121efc6a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java index 941451ad7..c338a3a54 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java index c36683ab2..936748b95 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java index 45f0397e9..5aa97fcc0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java index 078a00877..21b7eace9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java index 34e9975b3..58705000c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java index d181b1fb6..86ebeec17 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java index 53466a8a7..377dedba6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java index 67e042d8f..50780a410 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java index 38907e5bd..35e5b74b3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java index 4c510444e..dea92e691 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java index 1ce512c3d..1067032bf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java index d59ce1b53..49fb76322 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java index 1ee71ebd7..992e0607a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java index 5afb8df08..e9a1f16d5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java index 73a97b859..f6850e67d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java index 9f7bdb84e..44f9cfc00 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java index 0d34a11ec..932eed820 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java index 79dad65be..54561c0a3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachTreeItem.java index 21353d855..5740ff6e2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java index d9e0ca017..9100e4e93 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java index 92efbc782..6bf204404 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java index c333be4fa..bdec5d5e8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java index 11818dce0..a794cc4f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java index cf2d549c0..06fab290f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java index 1a4f7ca2c..c228d6de2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java index f43505a16..4cab0a2c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java index 8ec389f1e..41f2c3e32 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java index 00173abc5..f9aa504c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java index 5821e1419..25a02ad66 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java index 45b914385..b6bef4ee5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java index 1d8186080..11174acdf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java index d8cff81bb..4fec8f393 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java index c13c61304..297d00e00 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java index a6efa046f..6337ccebe 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java index e74202d19..c9df7771b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java index ac9ef4209..c76dfcfd4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java index 8298a4c57..2a0a74242 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java index 99b546d44..20aab048d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java index e6df394a8..9206a22f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java index e7911d89e..b0a4f7b4b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java index 7ac1c47fb..2dd04bbc8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java index b66d783c8..308f7b814 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java index 0a81f4150..1306ebdf9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java index c0738b64d..d76bff5d5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java index 2345701aa..4505e4cb9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java index ec43fdaa4..adb5233ca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java index 56aae736e..fbfdbc7f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java index 0d07d6d2f..49fd445ba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java index 11d2030d2..7865f44f0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java index df3fbaf2b..313f614b2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java index 096c607ab..a1d352a6c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java index c2be428ed..4fcd26e6f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java index 506048e5b..2671c2938 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java index 87321efbc..bd98f6fae 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java index e8203249c..5d83e71fc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java index eefb80205..11eb8b7f3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java index 8457a3c96..c68f678c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java index 7da910259..4521b077b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java index a63aa2453..53dabc2e1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java index 00ca9b59b..e8b891aa1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java index 96daca7de..d712fdb5c 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java index 649bc6eb8..5f2a78f07 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,7 +22,6 @@ import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.ConvertException; import com.jpexs.asdec.abc.avm2.flowgraph.Graph; import com.jpexs.asdec.abc.avm2.parser.ASM3Parser; import com.jpexs.asdec.abc.avm2.parser.ParseException; @@ -30,6 +29,7 @@ import com.jpexs.asdec.abc.avm2.parser.ParseException; import javax.swing.*; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.HashMap; public class ASMSourceEditorPane extends JEditorPane { @@ -48,12 +48,23 @@ public class ASMSourceEditorPane extends JEditorPane { } public void graph(){ - (new GraphFrame(new Graph(abc.bodies[bodyIndex].code))).setVisible(true); + Graph gr=new Graph(abc.bodies[bodyIndex].code); + //(new GraphTreeFrame(gr)).setVisible(true); + (new GraphFrame(gr,"")).setVisible(true); + } + + public void exec(){ + HashMap args=new HashMap(); + args.put(0, new Object()); //object "this" + args.put(1, new Long(466561)); //param1 + Object o=abc.bodies[bodyIndex].code.execute(args,abc.constants); + JOptionPane.showMessageDialog(this, "Returned object:"+o.toString()); } public void save(ConstantPool constants) { try { AVM2Code acode = ASM3Parser.parse(new ByteArrayInputStream(getText().getBytes()), constants, new DialogMissingSymbolHandler(),abc.bodies[bodyIndex]); + acode.getBytes(abc.bodies[bodyIndex].codeBytes); abc.bodies[bodyIndex].code = acode; Main.abcMainFrame.decompiledTextArea.reloadClass(); Main.abcMainFrame.decompiledTextArea.gotoLastTrait(); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java index d734eda4f..0ed0383d6 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java index fed005956..63c99e176 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java index 46ee37a95..2f42cda4b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java index 3d0f9df23..b938b8dc0 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -91,7 +91,7 @@ public class DecompiledEditorPane extends JEditorPane implements MouseListener { String hilightedCode = ""; if (!bufferedClasses.containsKey(index)) { - hilightedCode = abc.classToString(index, true); + hilightedCode = abc.classToString(index, true,false); highlights = Highlighting.getInstrHighlights(hilightedCode); traitHighlights = Highlighting.getTraitHighlights(hilightedCode); hilightedCode = Highlighting.stripHilights(hilightedCode); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java b/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java index 8190909d1..101bdc7cd 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java index 56d989e92..3aa084c24 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java @@ -1,141 +1,126 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.gui; - -import com.jpexs.asdec.abc.avm2.flowgraph.Graph; -import com.jpexs.asdec.abc.avm2.flowgraph.GraphDecision; -import java.awt.BorderLayout; -import java.awt.Container; -import javax.swing.JFrame; -import javax.swing.JTree; -import javax.swing.event.TreeModelListener; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - -/** - * - * @author JPEXS - */ -public class GraphFrame extends JFrame { - public JTree graphTree; - - - private class DecisionItem{ - public GraphDecision decision; - public boolean isTrue; - - public DecisionItem(GraphDecision decision, boolean isTrue) { - this.decision = decision; - this.isTrue = isTrue; - } - - @Override - public String toString() { - if(isTrue){ - return "onTrue"; - }else{ - return "onFalse"; - } - } - - - } - - public GraphFrame(final Graph graph){ - setSize(400,400); - graphTree=new JTree(new TreeModel(){ - private String root="root"; - public Object getRoot() { - return root; - } - - public Object getChild(Object parent, int index) { - if(parent==root){ - return graph.parts.get(index); - }else{ - if(parent instanceof GraphDecision){ - if(index==0) return new DecisionItem((GraphDecision)parent,true); - return new DecisionItem((GraphDecision)parent,false); - } - if(parent instanceof DecisionItem){ - DecisionItem di=(DecisionItem)parent; - if(di.isTrue) return di.decision.onTrue.get(index); - return di.decision.onFalse.get(index); - } - } - return null; - } - - public int getChildCount(Object parent) { - if(parent==root){ - return graph.parts.size(); - } - if(parent instanceof GraphDecision){ - return 2; - } - if(parent instanceof DecisionItem){ - DecisionItem di=(DecisionItem)parent; - if(di.isTrue) return di.decision.onTrue.size(); - return di.decision.onFalse.size(); - } - return 0; - } - - public boolean isLeaf(Object node) { - return getChildCount(node)==0; - } - - public void valueForPathChanged(TreePath path, Object newValue) { - - } - - public int getIndexOfChild(Object parent, Object child) { - if(parent==root){ - return graph.parts.indexOf(child); - }else{ - if(parent instanceof GraphDecision){ - if(child instanceof DecisionItem){ - DecisionItem di=(DecisionItem)child; - if(di.isTrue) return 0; - return 1; - } - } - if(parent instanceof DecisionItem){ - DecisionItem di=(DecisionItem)parent; - if(di.isTrue) return di.decision.onTrue.indexOf(child); - return di.decision.onFalse.indexOf(child); - } - } - return -1; - } - - public void addTreeModelListener(TreeModelListener l) { - - } - - public void removeTreeModelListener(TreeModelListener l) { - - } - }); - - Container cnt=getContentPane(); - cnt.setLayout(new BorderLayout()); - cnt.add(graphTree,BorderLayout.CENTER); - } -} +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.gui; + +import com.jpexs.asdec.abc.avm2.flowgraph.Graph; +import com.jpexs.asdec.abc.avm2.flowgraph.GraphPart; +import com.jpexs.asdec.gui.View; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Graphics; +import java.util.ArrayList; +import java.util.List; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +/** + * + * @author JPEXS + */ +public class GraphFrame extends JFrame { + + private class GraphPanel extends JPanel { + + private static final int SPACE_VERTICAL=10; + private static final int SPACE_HORIZONTAL=10; + private static final int BLOCK_WIDTH=100; + private static final int BLOCK_HEIGHT=20; + + private Graph graph; + + public GraphPanel(Graph graph) { + this.graph = graph; + setPreferredSize(new Dimension((BLOCK_WIDTH+SPACE_HORIZONTAL)*getPartWidth(graph.head, new ArrayList()), (BLOCK_HEIGHT+SPACE_VERTICAL)*getPartHeight(graph.head, new ArrayList()))); + } + + @Override + protected void paintComponent(Graphics g) { + super.paintComponent(g); + g.setColor(Color.black); + paintPart(g,graph.head,0,getPartWidth(graph.head,new ArrayList())*(BLOCK_WIDTH+SPACE_HORIZONTAL)/2,new ArrayList()); + } + + private void paintPart(Graphics g,GraphPart part,int y,int x,List used){ + List l=new ArrayList(); + l.addAll(used); + int totalWidthParts=getPartWidth(part,l); + int totalWidth=totalWidthParts*(BLOCK_WIDTH+SPACE_HORIZONTAL); + g.drawRect(x-BLOCK_WIDTH/2-SPACE_HORIZONTAL/2, y, BLOCK_WIDTH, BLOCK_HEIGHT); + g.drawString(part.toString(), x-BLOCK_WIDTH/2, y+BLOCK_HEIGHT); + if(used.contains(part)) return; + used.add(part); + if(part.nextParts.size()>0){ + int cx=x-totalWidth/2; + for(int p=0;p(); + l.addAll(used); + int cellWidth=getPartWidth(part.nextParts.get(p),l)*(BLOCK_WIDTH+SPACE_HORIZONTAL); + g.setColor(Color.black); + g.drawLine(x, y+BLOCK_HEIGHT, cx+cellWidth/2, y+BLOCK_HEIGHT+SPACE_VERTICAL); + paintPart(g,part.nextParts.get(p),y+BLOCK_HEIGHT+SPACE_VERTICAL,cx+cellWidth/2,used); + cx+=cellWidth; + + } + } + + } + + private int getPartHeight(GraphPart part,List used){ + if (used.contains(part)) { + return 1; + } + used.add(part); + int maxH=0; + for(int p=0;pmaxH) maxH=h; + } + return 1+maxH; + } + + private int getPartWidth(GraphPart part, List used) { + + if (used.contains(part)) { + return 1; + } + used.add(part); + if (part.nextParts.size() == 0) { + return 1; + } + int w = 0; + for (GraphPart subpart : part.nextParts) { + w += getPartWidth(subpart, used); + } + return w; + } + } + + public GraphFrame(Graph graph,String name) { + setSize(500, 500); + Container cnt = getContentPane(); + cnt.setLayout(new BorderLayout()); + cnt.add(new JScrollPane(new GraphPanel(graph))); + setTitle("Graph "+name); + View.setWindowIcon(this); + View.centerScreen(this); + } +} diff --git a/trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java new file mode 100644 index 000000000..a7cb26b7b --- /dev/null +++ b/trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.gui; + +import com.jpexs.asdec.abc.avm2.flowgraph.Graph; +import com.jpexs.asdec.abc.avm2.flowgraph.GraphPart; +import java.awt.BorderLayout; +import java.awt.Container; +import javax.swing.JFrame; +import javax.swing.JTree; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; + +/** + * + * @author JPEXS + */ +public class GraphTreeFrame extends JFrame { + public JTree graphTree; + + + + public GraphTreeFrame(final Graph graph){ + setSize(400,400); + graphTree=new JTree(new TreeModel(){ + public Object getRoot() { + return graph.head; + } + + public Object getChild(Object parent, int index) { + return ((GraphPart)parent).nextParts.get(index); + } + + public int getChildCount(Object parent) { + return ((GraphPart)parent).nextParts.size(); + } + + public boolean isLeaf(Object node) { + return getChildCount(node)==0; + } + + public void valueForPathChanged(TreePath path, Object newValue) { + + } + + public int getIndexOfChild(Object parent, Object child) { + return ((GraphPart)parent).nextParts.indexOf(child); + } + + public void addTreeModelListener(TreeModelListener l) { + + } + + public void removeTreeModelListener(TreeModelListener l) { + + } + }); + + Container cnt=getContentPane(); + cnt.setLayout(new BorderLayout()); + cnt.add(graphTree,BorderLayout.CENTER); + } +} diff --git a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java b/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java index ade974e38..f42cd6b1d 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java index aac24ebf9..e024bc70c 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -186,8 +186,13 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener { graphButton.setActionCommand("GRAPH"); graphButton.addActionListener(this); + JButton execButton = new JButton("Execute"); + execButton.setActionCommand("EXEC"); + execButton.addActionListener(this); + //buttonsPan.add(graphButton); buttonsPan.add(saveButton); + // buttonsPan.add(execButton); rightPanel.add(buttonsPan, BorderLayout.SOUTH); decompiledTextArea = new DecompiledEditorPane(); @@ -270,13 +275,18 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener { JMenuItem miSaveAs = new JMenuItem("Save as..."); miSaveAs.setActionCommand("SAVEAS"); miSaveAs.addActionListener(this); - JMenuItem miExport = new JMenuItem("Export..."); + JMenuItem miExport = new JMenuItem("Export as ActionScript..."); miExport.setActionCommand("EXPORT"); miExport.addActionListener(this); + + JMenuItem miExportPCode = new JMenuItem("Export as PCode..."); + miExportPCode.setActionCommand("EXPORTPCODE"); + miExportPCode.addActionListener(this); menuFile.add(miOpen); menuFile.add(miSave); menuFile.add(miSaveAs); menuFile.add(miExport); + menuFile.add(miExportPCode); menuFile.addSeparator(); JMenuItem miClose = new JMenuItem("Exit"); miClose.setActionCommand("EXIT"); @@ -339,6 +349,11 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener { if (e.getActionCommand().equals("GRAPH")) { sourceTextArea.graph(); } + + if (e.getActionCommand().equals("EXEC")) { + sourceTextArea.exec(); + } + if (e.getActionCommand().equals("SHOWPROXY")) { Main.showProxy(); } @@ -365,7 +380,7 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener { } - if (e.getActionCommand().equals("EXPORT")) { + if (e.getActionCommand().equals("EXPORT")||e.getActionCommand().equals("EXPORTPCODE")) { JFileChooser chooser = new JFileChooser(); chooser.setCurrentDirectory(new java.io.File(".")); chooser.setDialogTitle("Select directory to export"); @@ -374,13 +389,14 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener { if (chooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { Main.startWork("Exporting..."); final String selFile = chooser.getSelectedFile().getAbsolutePath(); + final boolean isPcode=e.getActionCommand().equals("EXPORTPCODE"); (new Thread() { @Override public void run() { try { for (DoABCTag tag : list) { - tag.abc.export(selFile); + tag.abc.export(selFile,isPcode); } } catch (IOException ignored) { JOptionPane.showMessageDialog(null, "Cannot write to the file"); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java b/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java index ae00ff655..758e118cc 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java b/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java index ca13d67e4..7185dfb65 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TreePart.java b/trunk/src/com/jpexs/asdec/abc/gui/TreePart.java index 8c7fabef2..678490dcc 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TreePart.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/TreePart.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java index a84498c0e..4c8d9ffed 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java @@ -1,81 +1,81 @@ -/* - * Copyright (C) 2010 JPEXS - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -package com.jpexs.asdec.abc.gui; - -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.Usage; -import com.jpexs.asdec.abc.types.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitMethodGetterSetter; -import com.jpexs.asdec.gui.View; -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; -import javax.swing.DefaultListModel; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JScrollPane; - -/** - * - * @author JPEXS - */ -public class UsageFrame extends JFrame implements ActionListener { - private JButton gotoButton=new JButton("Go to"); - private JButton cancelButton=new JButton("Cancel"); - private JList usageList; - private DefaultListModel usageListModel=new DefaultListModel(); - public UsageFrame(ABC abc,int multinameIndex){ - List usages=abc.findMultinameUsage(multinameIndex); - for(Usage u:usages){ - usageListModel.addElement(u); - } - usageList=new JList(usageListModel); - gotoButton.setActionCommand("GOTO"); - gotoButton.addActionListener(this); - cancelButton.setActionCommand("CANCEL"); - cancelButton.addActionListener(this); - JPanel buttonsPanel=new JPanel(); - buttonsPanel.setLayout(new FlowLayout()); - //buttonsPanel.add(gotoButton); - buttonsPanel.add(cancelButton); - - Container cont=getContentPane(); - cont.setLayout(new BorderLayout()); - cont.add(new JScrollPane(usageList),BorderLayout.CENTER); - cont.add(buttonsPanel, BorderLayout.SOUTH); - setSize(400,300); - setTitle("Usages:"+abc.constants.constant_multiname[multinameIndex].getNameWithNamespace(abc.constants)); - View.centerScreen(this); - View.setWindowIcon(this); - } - - public void actionPerformed(ActionEvent e) { - if(e.getActionCommand().equals("GOTO")){ - - } - if(e.getActionCommand().equals("CANCEL")){ - setVisible(false); - } - } -} +/* + * Copyright (C) 2010-2011 JPEXS + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +package com.jpexs.asdec.abc.gui; + +import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.Usage; +import com.jpexs.asdec.abc.types.traits.Trait; +import com.jpexs.asdec.abc.types.traits.TraitMethodGetterSetter; +import com.jpexs.asdec.gui.View; +import java.awt.BorderLayout; +import java.awt.Container; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.List; +import javax.swing.DefaultListModel; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +/** + * + * @author JPEXS + */ +public class UsageFrame extends JFrame implements ActionListener { + private JButton gotoButton=new JButton("Go to"); + private JButton cancelButton=new JButton("Cancel"); + private JList usageList; + private DefaultListModel usageListModel=new DefaultListModel(); + public UsageFrame(ABC abc,int multinameIndex){ + List usages=abc.findMultinameUsage(multinameIndex); + for(Usage u:usages){ + usageListModel.addElement(u); + } + usageList=new JList(usageListModel); + gotoButton.setActionCommand("GOTO"); + gotoButton.addActionListener(this); + cancelButton.setActionCommand("CANCEL"); + cancelButton.addActionListener(this); + JPanel buttonsPanel=new JPanel(); + buttonsPanel.setLayout(new FlowLayout()); + //buttonsPanel.add(gotoButton); + buttonsPanel.add(cancelButton); + + Container cont=getContentPane(); + cont.setLayout(new BorderLayout()); + cont.add(new JScrollPane(usageList),BorderLayout.CENTER); + cont.add(buttonsPanel, BorderLayout.SOUTH); + setSize(400,300); + setTitle("Usages:"+abc.constants.constant_multiname[multinameIndex].getNameWithNamespace(abc.constants)); + View.centerScreen(this); + View.setWindowIcon(this); + } + + public void actionPerformed(ActionEvent e) { + if(e.getActionCommand().equals("GOTO")){ + + } + if(e.getActionCommand().equals("CANCEL")){ + setVisible(false); + } + } +} diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java index 1f41c730f..30d6920d6 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java index 4b9475c7b..d51de7387 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java index 3c839a7a8..6395b696f 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java index a5ee5e8a2..efb8faec3 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java index e0133e051..17486c516 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java index fb9cd15fb..64bab6a8d 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java index e803e7d55..cf9736cb0 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/ABCException.java b/trunk/src/com/jpexs/asdec/abc/types/ABCException.java index 771079bcc..572059374 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ABCException.java +++ b/trunk/src/com/jpexs/asdec/abc/types/ABCException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java b/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java index 07e5b6874..a74fd1fd2 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java b/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java index 4a300ae4c..d1b9d90ee 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java b/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java index 4a92c85c8..5604c2b69 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java b/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java index e1b241d1c..1f6bc52be 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -52,22 +52,25 @@ public class MethodBody implements Cloneable { return code; } - public String toString(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[]) { - return toString(isStatic, classIndex, abc, constants, method_info, false); + public String toString(boolean pcode,boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[]) { + return toString(pcode,isStatic, classIndex, abc, constants, method_info, false); } - public String toString(boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], boolean hilight) { + public String toString(boolean pcode,boolean isStatic, int classIndex, ABC abc, ConstantPool constants, MethodInfo method_info[], boolean hilight) { String s = ""; //s+="method_info="+method_info+" max_stack="+max_stack+" max_regs="+max_regs+" scope_depth="+scope_depth+" max_scope="+max_scope; //s+="\r\nCode:\r\n"+ - + if(pcode){ + s+=code.toASMSource(constants, this); + }else{ try { s += code.toSource(isStatic, classIndex, abc, constants, method_info, this, hilight); s = replaceParams(s, method_info); } catch (Exception ex) { s = "//error:" + ex.toString(); } + } //s+="----------- ORIGINAL ------------\r\n"; //s+=code.toString(constants); /*s+="Exceptions:"; diff --git a/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java b/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java index 0a43035e8..bfda353d4 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/Multiname.java b/trunk/src/com/jpexs/asdec/abc/types/Multiname.java index 846b4c551..86acf5a1d 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/Multiname.java +++ b/trunk/src/com/jpexs/asdec/abc/types/Multiname.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,34 +19,39 @@ package com.jpexs.asdec.abc.types; import com.jpexs.asdec.abc.avm2.ConstantPool; +import java.util.List; public class Multiname { public static final int QNAME = 7; - public static final int QNAMEA = 13; - public static final int MULTINAME = 9; - public static final int MULTINAMEA = 14; - public static final int RTQNAME = 15; - public static final int RTQNAMEA = 16; - public static final int MULTINAMEL = 27; - public static final int RTQNAMEL = 17; - public static final int RTQNAMELA = 18; - private static final int multinameKinds[] = new int[]{QNAME, QNAMEA, MULTINAME, MULTINAMEA, RTQNAME, RTQNAMEA, MULTINAMEL, RTQNAMEL, RTQNAMELA}; - private static final String multinameKindNames[] = new String[]{"Qname", "QnameA", "Multiname", "MultinameA", "RTQname", "RTQnameA", "MultinameL", "RTQnameL", "RTQnameLA"}; + public static final int QNAMEA = 0x0d; + public static final int RTQNAME = 0x0f; + public static final int RTQNAMEA = 0x10; + public static final int RTQNAMEL = 0x11; + public static final int RTQNAMELA = 0x12; + public static final int MULTINAME = 0x09; + public static final int MULTINAMEA = 0x0e; + public static final int MULTINAMEL = 0x1b; + public static final int MULTINAMELA = 0x1c; + public static final int TYPENAME = 0x1d; + private static final int multinameKinds[] = new int[]{QNAME, QNAMEA, MULTINAME, MULTINAMEA, RTQNAME, RTQNAMEA, MULTINAMEL, RTQNAMEL, RTQNAMELA,MULTINAMELA,TYPENAME}; + private static final String multinameKindNames[] = new String[]{"Qname", "QnameA", "Multiname", "MultinameA", "RTQname", "RTQnameA", "MultinameL", "RTQnameL", "RTQnameLA","MultinameLA","TypeName"}; public int kind = -1; public int name_index = -1; public int namespace_index = -1; public int namespace_set_index = -1; + public List params; - public Multiname(int kind, int name_index, int namespace_index, int namespace_set_index) { + public Multiname(int kind, int name_index, int namespace_index, int namespace_set_index,List params) { this.kind = kind; this.name_index = name_index; this.namespace_index = namespace_index; this.namespace_set_index = namespace_set_index; + this.params=params; } public boolean isAttribute() { @@ -54,6 +59,7 @@ public class Multiname { if (kind == MULTINAMEA) return true; if (kind == RTQNAMEA) return true; if (kind == RTQNAMELA) return true; + if (kind == MULTINAMELA) return true; return false; } @@ -61,6 +67,7 @@ public class Multiname { if (kind == RTQNAME) return true; if (kind == RTQNAMEA) return true; if (kind == MULTINAMEL) return true; + if (kind == MULTINAMELA) return true; return false; } @@ -68,6 +75,7 @@ public class Multiname { if (kind == RTQNAMEL) return true; if (kind == RTQNAMELA) return true; if (kind == MULTINAMEL) return true; + if (kind == MULTINAMELA) return true; return false; } diff --git a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java b/trunk/src/com/jpexs/asdec/abc/types/Namespace.java index d61726fef..a64ad5298 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java +++ b/trunk/src/com/jpexs/asdec/abc/types/Namespace.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java b/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java index f5ed2f6da..b79abf956 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java +++ b/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java b/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java index 5f8c50a78..ed755a237 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java b/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java index c77fe07bf..d88ea877d 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java +++ b/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java b/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java index eac8bcc25..92036495b 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java index 21db70290..6c4afa8f3 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java index cc7cb969b..00ab02d92 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java index 7f6c7540f..ecdcf161c 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java index 5a4b35163..630e1723f 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java b/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java index 8236b5fa4..d102695f3 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/Action.java b/trunk/src/com/jpexs/asdec/action/Action.java index 9574ff9e2..8e0f42afb 100644 --- a/trunk/src/com/jpexs/asdec/action/Action.java +++ b/trunk/src/com/jpexs/asdec/action/Action.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java b/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java index 296296738..6deecd7e9 100644 --- a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java +++ b/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java index 9e6c77145..6e81313a6 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -26,6 +26,9 @@ import com.jpexs.asdec.gui.View; import com.jpexs.asdec.helpers.Highlighting; import com.jpexs.asdec.tags.ASMSource; import com.jpexs.asdec.tags.Tag; +import java.io.FileNotFoundException; +import java.util.logging.Level; +import java.util.logging.Logger; import jsyntaxpane.DefaultSyntaxKit; import javax.swing.*; @@ -39,6 +42,8 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.util.List; @@ -51,6 +56,8 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi public JSplitPane splitPane; public JSplitPane splitPane2; public JButton saveButton = new JButton("Save"); + public JButton saveHexButton = new JButton("Save hex"); + public JButton loadHexButton = new JButton("Load hex"); public JLabel asmLabel = new JLabel("P-code source (editable)"); public JLabel decLabel = new JLabel("ActionScript source"); public JPanel statusPanel = new JPanel(); @@ -81,8 +88,14 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi JPanel buttonsPan = new JPanel(); buttonsPan.setLayout(new FlowLayout()); buttonsPan.add(saveButton); + //buttonsPan.add(saveHexButton); + //buttonsPan.add(loadHexButton); panB.add(buttonsPan, BorderLayout.SOUTH); + saveHexButton.addActionListener(this); + saveHexButton.setActionCommand("SAVEHEXACTION"); + loadHexButton.addActionListener(this); + loadHexButton.setActionCommand("LOADHEXACTION"); saveButton.addActionListener(this); saveButton.setActionCommand("SAVEACTION"); @@ -182,7 +195,8 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi @Override public void run() { editor.setText(asm.getASMSource(10)); //TODO:Ensure correct version here - decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(asm.getActions(), 10))); //TODO:Ensure correct version here + if(Main.DO_DECOMPILE) + decompiledEditor.setText(Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(asm.getActions(10), 10))); //TODO:Ensure correct version here Main.stopWork(); } }).start(); @@ -204,12 +218,48 @@ public class MainFrame extends JFrame implements TreeSelectionListener, ActionLi Main.showProxy(); } if (Main.isWorking()) return; + + if(e.getActionCommand().equals("SAVEHEXACTION")){ + TagTreeItem ti = (TagTreeItem) tagTree.getLastSelectedPathComponent(); + if (ti.tag instanceof ASMSource) { + ASMSource dat = (ASMSource) ti.tag; + FileOutputStream fos; + try { + fos = new FileOutputStream("out.hex"); + fos.write(dat.getActionBytes()); + fos.close(); + } catch (IOException ex) { + + } + + } + } + + if(e.getActionCommand().equals("LOADHEXACTION")){ + TagTreeItem ti = (TagTreeItem) tagTree.getLastSelectedPathComponent(); + if (ti.tag instanceof ASMSource) { + ASMSource dat = (ASMSource) ti.tag; + FileInputStream fis; + try { + fis = new FileInputStream("out.hex"); + byte data[]=new byte[fis.available()]; + dat.setActionBytes(data); + fis.read(data); + fis.close(); + editor.setText(dat.getASMSource(10)); + } catch (IOException ex) { + + } + + } + } + if (e.getActionCommand().equals("SAVEACTION")) { TagTreeItem ti = (TagTreeItem) tagTree.getLastSelectedPathComponent(); if (ti.tag instanceof ASMSource) { ASMSource dat = (ASMSource) ti.tag; try { - dat.setActions(ASMParser.parse(new ByteArrayInputStream(editor.getText().getBytes()), 10)); //TODO:Ensure correct version here + dat.setActions(ASMParser.parse(new ByteArrayInputStream(editor.getText().getBytes()), 10),10); //TODO:Ensure correct version here } catch (IOException ex) { } catch (ParseException ex) { JOptionPane.showMessageDialog(this, "" + ex.text + " on line " + ex.line, "Error", JOptionPane.ERROR_MESSAGE); diff --git a/trunk/src/com/jpexs/asdec/action/gui/TagTreeItem.java b/trunk/src/com/jpexs/asdec/action/gui/TagTreeItem.java index a7065c0bf..72cc8c09a 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/TagTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/gui/TagTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java b/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java index e0f8e1d37..ce29ba6ae 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java b/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java index 105051c10..cf949851a 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java +++ b/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java b/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java index 6ce7bcc88..f85ff4bad 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java +++ b/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,436 +18,426 @@ package com.jpexs.asdec.action.parser; -import com.jpexs.asdec.action.swf4.Null; +import com.jpexs.asdec.action.swf4.ConstantIndex; import com.jpexs.asdec.action.swf4.RegisterNumber; import com.jpexs.asdec.action.swf4.Undefined; +import com.jpexs.asdec.action.swf4.Null; /** - * This class is a scanner generated by + * This class is a scanner generated by * JFlex 1.4.3 - * on 10.8.10 18:06 from the specification file + * on 15.1.11 16:48 from the specification file * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/asdec/action/parser/flasm.flex */ public final class FlasmLexer { - /** - * This character denotes the end of file - */ - public static final int YYEOF = -1; + /** This character denotes the end of file */ + public static final int YYEOF = -1; - /** - * initial size of the lookahead buffer - */ - private static final int ZZ_BUFFERSIZE = 16384; + /** initial size of the lookahead buffer */ + private static final int ZZ_BUFFERSIZE = 16384; - /** - * lexical states - */ - public static final int STRING = 2; - public static final int YYINITIAL = 0; - public static final int PARAMETERS = 4; + /** lexical states */ + public static final int STRING = 2; + public static final int YYINITIAL = 0; + public static final int PARAMETERS = 4; - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0, 1, 1, 2, 2 - }; + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1, 2, 2 + }; - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\6\1\4\1\2\1\0\1\4\1\1\16\6\4\0\1\4\1\0" + - "\1\37\1\0\1\5\2\0\1\41\3\0\1\33\1\0\1\33\1\31" + - "\1\0\1\30\3\42\4\34\2\11\1\12\1\3\5\0\4\7\1\32" + - "\25\7\1\0\1\35\2\0\1\10\1\0\1\22\1\40\1\7\1\26" + - "\1\20\1\21\1\36\1\7\1\27\2\7\1\23\1\7\1\25\3\7" + - "\1\16\1\24\1\15\1\17\5\7\1\13\1\0\1\14\1\0\41\6" + - "\2\0\4\5\4\0\1\5\2\0\1\6\7\0\1\5\4\0\1\5" + - "\5\0\27\5\1\0\37\5\1\0\u013f\5\31\0\162\5\4\0\14\5" + - "\16\0\5\5\11\0\1\5\21\0\130\6\5\0\23\6\12\0\1\5" + - "\13\0\1\5\1\0\3\5\1\0\1\5\1\0\24\5\1\0\54\5" + - "\1\0\46\5\1\0\5\5\4\0\202\5\1\0\4\6\3\0\105\5" + - "\1\0\46\5\2\0\2\5\6\0\20\5\41\0\46\5\2\0\1\5" + - "\7\0\47\5\11\0\21\6\1\0\27\6\1\0\3\6\1\0\1\6" + - "\1\0\2\6\1\0\1\6\13\0\33\5\5\0\3\5\15\0\4\6" + - "\14\0\6\6\13\0\32\5\5\0\13\5\16\6\7\0\12\6\4\0" + - "\2\5\1\6\143\5\1\0\1\5\10\6\1\0\6\6\2\5\2\6" + - "\1\0\4\6\2\5\12\6\3\5\2\0\1\5\17\0\1\6\1\5" + - "\1\6\36\5\33\6\2\0\3\5\60\0\46\5\13\6\1\5\u014f\0" + - "\3\6\66\5\2\0\1\6\1\5\20\6\2\0\1\5\4\6\3\0" + - "\12\5\2\6\2\0\12\6\21\0\3\6\1\0\10\5\2\0\2\5" + - "\2\0\26\5\1\0\7\5\1\0\1\5\3\0\4\5\2\0\1\6" + - "\1\5\7\6\2\0\2\6\2\0\3\6\11\0\1\6\4\0\2\5" + - "\1\0\3\5\2\6\2\0\12\6\4\5\15\0\3\6\1\0\6\5" + - "\4\0\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0\2\5" + - "\1\0\2\5\2\0\1\6\1\0\5\6\4\0\2\6\2\0\3\6" + - "\13\0\4\5\1\0\1\5\7\0\14\6\3\5\14\0\3\6\1\0" + - "\11\5\1\0\3\5\1\0\26\5\1\0\7\5\1\0\2\5\1\0" + - "\5\5\2\0\1\6\1\5\10\6\1\0\3\6\1\0\3\6\2\0" + - "\1\5\17\0\2\5\2\6\2\0\12\6\1\0\1\5\17\0\3\6" + - "\1\0\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0\2\5" + - "\1\0\5\5\2\0\1\6\1\5\6\6\3\0\2\6\2\0\3\6" + - "\10\0\2\6\4\0\2\5\1\0\3\5\4\0\12\6\1\0\1\5" + - "\20\0\1\6\1\5\1\0\6\5\3\0\3\5\1\0\4\5\3\0" + - "\2\5\1\0\1\5\1\0\2\5\3\0\2\5\3\0\3\5\3\0" + - "\10\5\1\0\3\5\4\0\5\6\3\0\3\6\1\0\4\6\11\0" + - "\1\6\17\0\11\6\11\0\1\5\7\0\3\6\1\0\10\5\1\0" + - "\3\5\1\0\27\5\1\0\12\5\1\0\5\5\4\0\7\6\1\0" + - "\3\6\1\0\4\6\7\0\2\6\11\0\2\5\4\0\12\6\22\0" + - "\2\6\1\0\10\5\1\0\3\5\1\0\27\5\1\0\12\5\1\0" + - "\5\5\2\0\1\6\1\5\7\6\1\0\3\6\1\0\4\6\7\0" + - "\2\6\7\0\1\5\1\0\2\5\4\0\12\6\22\0\2\6\1\0" + - "\10\5\1\0\3\5\1\0\27\5\1\0\20\5\4\0\6\6\2\0" + - "\3\6\1\0\4\6\11\0\1\6\10\0\2\5\4\0\12\6\22\0" + - "\2\6\1\0\22\5\3\0\30\5\1\0\11\5\1\0\1\5\2\0" + - "\7\5\3\0\1\6\4\0\6\6\1\0\1\6\1\0\10\6\22\0" + - "\2\6\15\0\60\5\1\6\2\5\7\6\4\0\10\5\10\6\1\0" + - "\12\6\47\0\2\5\1\0\1\5\2\0\2\5\1\0\1\5\2\0" + - "\1\5\6\0\4\5\1\0\7\5\1\0\3\5\1\0\1\5\1\0" + - "\1\5\2\0\2\5\1\0\4\5\1\6\2\5\6\6\1\0\2\6" + - "\1\5\2\0\5\5\1\0\1\5\1\0\6\6\2\0\12\6\2\0" + - "\2\5\42\0\1\5\27\0\2\6\6\0\12\6\13\0\1\6\1\0" + - "\1\6\1\0\1\6\4\0\2\6\10\5\1\0\42\5\6\0\24\6" + - "\1\0\2\6\4\5\4\0\10\6\1\0\44\6\11\0\1\6\71\0" + - "\42\5\1\0\5\5\1\0\2\5\1\0\7\6\3\0\4\6\6\0" + - "\12\6\6\0\6\5\4\6\106\0\46\5\12\0\51\5\7\0\132\5" + - "\5\0\104\5\5\0\122\5\6\0\7\5\1\0\77\5\1\0\1\5" + - "\1\0\4\5\2\0\7\5\1\0\1\5\1\0\4\5\2\0\47\5" + - "\1\0\1\5\1\0\4\5\2\0\37\5\1\0\1\5\1\0\4\5" + - "\2\0\7\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0\7\5" + - "\1\0\27\5\1\0\37\5\1\0\1\5\1\0\4\5\2\0\7\5" + - "\1\0\47\5\1\0\23\5\16\0\11\6\56\0\125\5\14\0\u026c\5" + - "\2\0\10\5\12\0\32\5\5\0\113\5\3\0\3\5\17\0\15\5" + - "\1\0\4\5\3\6\13\0\22\5\3\6\13\0\22\5\2\6\14\0" + - "\15\5\1\0\3\5\1\0\2\6\14\0\64\5\40\6\3\0\1\5" + - "\3\0\2\5\1\6\2\0\12\6\41\0\3\6\2\0\12\6\6\0" + - "\130\5\10\0\51\5\1\6\126\0\35\5\3\0\14\6\4\0\14\6" + - "\12\0\12\6\36\5\2\0\5\5\u038b\0\154\5\224\0\234\5\4\0" + - "\132\5\6\0\26\5\2\0\6\5\2\0\46\5\2\0\6\5\2\0" + - "\10\5\1\0\1\5\1\0\1\5\1\0\1\5\1\0\37\5\2\0" + - "\65\5\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5\3\0" + - "\4\5\2\0\6\5\4\0\15\5\5\0\3\5\1\0\7\5\17\0" + - "\4\6\32\0\5\6\20\0\2\5\23\0\1\5\13\0\4\6\6\0" + - "\6\6\1\0\1\5\15\0\1\5\40\0\22\5\36\0\15\6\4\0" + - "\1\6\3\0\6\6\27\0\1\5\4\0\1\5\2\0\12\5\1\0" + - "\1\5\3\0\5\5\6\0\1\5\1\0\1\5\1\0\1\5\1\0" + - "\4\5\1\0\3\5\1\0\7\5\3\0\3\5\5\0\5\5\26\0" + - "\44\5\u0e81\0\3\5\31\0\11\5\6\6\1\0\5\5\2\0\5\5" + - "\4\0\126\5\2\0\2\6\2\0\3\5\1\0\137\5\5\0\50\5" + - "\4\0\136\5\21\0\30\5\70\0\20\5\u0200\0\u19b6\5\112\0\u51a6\5" + - "\132\0\u048d\5\u0773\0\u2ba4\5\u215c\0\u012e\5\2\0\73\5\225\0\7\5" + - "\14\0\5\5\5\0\1\5\1\6\12\5\1\0\15\5\1\0\5\5" + - "\1\0\1\5\1\0\2\5\1\0\2\5\1\0\154\5\41\0\u016b\5" + - "\22\0\100\5\2\0\66\5\50\0\15\5\3\0\20\6\20\0\4\6" + - "\17\0\2\5\30\0\3\5\31\0\1\5\6\0\5\5\1\0\207\5" + - "\2\0\1\6\4\0\1\5\13\0\12\6\7\0\32\5\4\0\1\5" + - "\1\0\32\5\12\0\132\5\3\0\6\5\2\0\6\5\2\0\6\5" + - "\2\0\3\5\3\0\2\5\3\0\2\5\22\0\3\6\4\0"; + /** + * Translates characters to character classes + */ + private static final String ZZ_CMAP_PACKED = + "\11\6\1\4\1\2\1\0\1\4\1\1\16\6\4\0\1\4\1\0"+ + "\1\41\1\0\1\5\2\0\1\43\3\0\1\33\1\0\1\33\1\31"+ + "\1\0\1\30\3\44\4\34\2\11\1\12\1\3\5\0\4\7\1\32"+ + "\25\7\1\0\1\35\2\0\1\10\1\0\1\22\1\42\1\37\1\26"+ + "\1\20\1\21\1\36\1\7\1\27\2\7\1\23\1\7\1\25\1\40"+ + "\2\7\1\16\1\24\1\15\1\17\5\7\1\13\1\0\1\14\1\0"+ + "\41\6\2\0\4\5\4\0\1\5\2\0\1\6\7\0\1\5\4\0"+ + "\1\5\5\0\27\5\1\0\37\5\1\0\u013f\5\31\0\162\5\4\0"+ + "\14\5\16\0\5\5\11\0\1\5\21\0\130\6\5\0\23\6\12\0"+ + "\1\5\13\0\1\5\1\0\3\5\1\0\1\5\1\0\24\5\1\0"+ + "\54\5\1\0\46\5\1\0\5\5\4\0\202\5\1\0\4\6\3\0"+ + "\105\5\1\0\46\5\2\0\2\5\6\0\20\5\41\0\46\5\2\0"+ + "\1\5\7\0\47\5\11\0\21\6\1\0\27\6\1\0\3\6\1\0"+ + "\1\6\1\0\2\6\1\0\1\6\13\0\33\5\5\0\3\5\15\0"+ + "\4\6\14\0\6\6\13\0\32\5\5\0\13\5\16\6\7\0\12\6"+ + "\4\0\2\5\1\6\143\5\1\0\1\5\10\6\1\0\6\6\2\5"+ + "\2\6\1\0\4\6\2\5\12\6\3\5\2\0\1\5\17\0\1\6"+ + "\1\5\1\6\36\5\33\6\2\0\3\5\60\0\46\5\13\6\1\5"+ + "\u014f\0\3\6\66\5\2\0\1\6\1\5\20\6\2\0\1\5\4\6"+ + "\3\0\12\5\2\6\2\0\12\6\21\0\3\6\1\0\10\5\2\0"+ + "\2\5\2\0\26\5\1\0\7\5\1\0\1\5\3\0\4\5\2\0"+ + "\1\6\1\5\7\6\2\0\2\6\2\0\3\6\11\0\1\6\4\0"+ + "\2\5\1\0\3\5\2\6\2\0\12\6\4\5\15\0\3\6\1\0"+ + "\6\5\4\0\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0"+ + "\2\5\1\0\2\5\2\0\1\6\1\0\5\6\4\0\2\6\2\0"+ + "\3\6\13\0\4\5\1\0\1\5\7\0\14\6\3\5\14\0\3\6"+ + "\1\0\11\5\1\0\3\5\1\0\26\5\1\0\7\5\1\0\2\5"+ + "\1\0\5\5\2\0\1\6\1\5\10\6\1\0\3\6\1\0\3\6"+ + "\2\0\1\5\17\0\2\5\2\6\2\0\12\6\1\0\1\5\17\0"+ + "\3\6\1\0\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0"+ + "\2\5\1\0\5\5\2\0\1\6\1\5\6\6\3\0\2\6\2\0"+ + "\3\6\10\0\2\6\4\0\2\5\1\0\3\5\4\0\12\6\1\0"+ + "\1\5\20\0\1\6\1\5\1\0\6\5\3\0\3\5\1\0\4\5"+ + "\3\0\2\5\1\0\1\5\1\0\2\5\3\0\2\5\3\0\3\5"+ + "\3\0\10\5\1\0\3\5\4\0\5\6\3\0\3\6\1\0\4\6"+ + "\11\0\1\6\17\0\11\6\11\0\1\5\7\0\3\6\1\0\10\5"+ + "\1\0\3\5\1\0\27\5\1\0\12\5\1\0\5\5\4\0\7\6"+ + "\1\0\3\6\1\0\4\6\7\0\2\6\11\0\2\5\4\0\12\6"+ + "\22\0\2\6\1\0\10\5\1\0\3\5\1\0\27\5\1\0\12\5"+ + "\1\0\5\5\2\0\1\6\1\5\7\6\1\0\3\6\1\0\4\6"+ + "\7\0\2\6\7\0\1\5\1\0\2\5\4\0\12\6\22\0\2\6"+ + "\1\0\10\5\1\0\3\5\1\0\27\5\1\0\20\5\4\0\6\6"+ + "\2\0\3\6\1\0\4\6\11\0\1\6\10\0\2\5\4\0\12\6"+ + "\22\0\2\6\1\0\22\5\3\0\30\5\1\0\11\5\1\0\1\5"+ + "\2\0\7\5\3\0\1\6\4\0\6\6\1\0\1\6\1\0\10\6"+ + "\22\0\2\6\15\0\60\5\1\6\2\5\7\6\4\0\10\5\10\6"+ + "\1\0\12\6\47\0\2\5\1\0\1\5\2\0\2\5\1\0\1\5"+ + "\2\0\1\5\6\0\4\5\1\0\7\5\1\0\3\5\1\0\1\5"+ + "\1\0\1\5\2\0\2\5\1\0\4\5\1\6\2\5\6\6\1\0"+ + "\2\6\1\5\2\0\5\5\1\0\1\5\1\0\6\6\2\0\12\6"+ + "\2\0\2\5\42\0\1\5\27\0\2\6\6\0\12\6\13\0\1\6"+ + "\1\0\1\6\1\0\1\6\4\0\2\6\10\5\1\0\42\5\6\0"+ + "\24\6\1\0\2\6\4\5\4\0\10\6\1\0\44\6\11\0\1\6"+ + "\71\0\42\5\1\0\5\5\1\0\2\5\1\0\7\6\3\0\4\6"+ + "\6\0\12\6\6\0\6\5\4\6\106\0\46\5\12\0\51\5\7\0"+ + "\132\5\5\0\104\5\5\0\122\5\6\0\7\5\1\0\77\5\1\0"+ + "\1\5\1\0\4\5\2\0\7\5\1\0\1\5\1\0\4\5\2\0"+ + "\47\5\1\0\1\5\1\0\4\5\2\0\37\5\1\0\1\5\1\0"+ + "\4\5\2\0\7\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0"+ + "\7\5\1\0\27\5\1\0\37\5\1\0\1\5\1\0\4\5\2\0"+ + "\7\5\1\0\47\5\1\0\23\5\16\0\11\6\56\0\125\5\14\0"+ + "\u026c\5\2\0\10\5\12\0\32\5\5\0\113\5\3\0\3\5\17\0"+ + "\15\5\1\0\4\5\3\6\13\0\22\5\3\6\13\0\22\5\2\6"+ + "\14\0\15\5\1\0\3\5\1\0\2\6\14\0\64\5\40\6\3\0"+ + "\1\5\3\0\2\5\1\6\2\0\12\6\41\0\3\6\2\0\12\6"+ + "\6\0\130\5\10\0\51\5\1\6\126\0\35\5\3\0\14\6\4\0"+ + "\14\6\12\0\12\6\36\5\2\0\5\5\u038b\0\154\5\224\0\234\5"+ + "\4\0\132\5\6\0\26\5\2\0\6\5\2\0\46\5\2\0\6\5"+ + "\2\0\10\5\1\0\1\5\1\0\1\5\1\0\1\5\1\0\37\5"+ + "\2\0\65\5\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5"+ + "\3\0\4\5\2\0\6\5\4\0\15\5\5\0\3\5\1\0\7\5"+ + "\17\0\4\6\32\0\5\6\20\0\2\5\23\0\1\5\13\0\4\6"+ + "\6\0\6\6\1\0\1\5\15\0\1\5\40\0\22\5\36\0\15\6"+ + "\4\0\1\6\3\0\6\6\27\0\1\5\4\0\1\5\2\0\12\5"+ + "\1\0\1\5\3\0\5\5\6\0\1\5\1\0\1\5\1\0\1\5"+ + "\1\0\4\5\1\0\3\5\1\0\7\5\3\0\3\5\5\0\5\5"+ + "\26\0\44\5\u0e81\0\3\5\31\0\11\5\6\6\1\0\5\5\2\0"+ + "\5\5\4\0\126\5\2\0\2\6\2\0\3\5\1\0\137\5\5\0"+ + "\50\5\4\0\136\5\21\0\30\5\70\0\20\5\u0200\0\u19b6\5\112\0"+ + "\u51a6\5\132\0\u048d\5\u0773\0\u2ba4\5\u215c\0\u012e\5\2\0\73\5\225\0"+ + "\7\5\14\0\5\5\5\0\1\5\1\6\12\5\1\0\15\5\1\0"+ + "\5\5\1\0\1\5\1\0\2\5\1\0\2\5\1\0\154\5\41\0"+ + "\u016b\5\22\0\100\5\2\0\66\5\50\0\15\5\3\0\20\6\20\0"+ + "\4\6\17\0\2\5\30\0\3\5\31\0\1\5\6\0\5\5\1\0"+ + "\207\5\2\0\1\6\4\0\1\5\13\0\12\6\7\0\32\5\4\0"+ + "\1\5\1\0\32\5\12\0\132\5\3\0\6\5\2\0\6\5\2\0"+ + "\6\5\2\0\3\5\3\0\2\5\3\0\2\5\22\0\3\6\4\0"; - /** - * Translates characters to character classes - */ - private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); + /** + * Translates characters to character classes + */ + private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - /** - * Translates DFA states to action switch labels. - */ - private static final int[] ZZ_ACTION = zzUnpackAction(); + /** + * Translates DFA states to action switch labels. + */ + private static final int [] ZZ_ACTION = zzUnpackAction(); - private static final String ZZ_ACTION_PACKED_0 = - "\3\0\3\1\1\2\1\3\1\4\2\5\1\1\1\6" + - "\2\7\1\10\1\11\1\12\1\13\5\11\1\12\1\1" + - "\1\14\1\0\1\15\1\16\1\17\1\20\1\21\1\22" + - "\2\23\1\24\1\25\1\26\1\27\1\0\1\30\5\11" + - "\1\30\1\23\1\30\1\0\5\11\1\31\3\11\1\32" + - "\2\11\1\33\6\11\2\34\1\35"; + private static final String ZZ_ACTION_PACKED_0 = + "\3\0\3\1\1\2\1\3\1\4\2\5\1\1\1\6"+ + "\2\7\1\10\1\11\1\12\1\13\5\11\1\12\1\1"+ + "\1\11\1\14\1\0\1\15\1\16\1\17\1\20\1\21"+ + "\1\22\2\23\1\24\1\25\1\26\1\27\1\0\1\30"+ + "\5\11\1\30\1\11\1\23\1\30\1\0\6\11\1\31"+ + "\3\11\1\32\3\11\1\33\12\11\2\34\1\35\2\36"; - private static int[] zzUnpackAction() { - int[] result = new int[73]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; + private static int [] zzUnpackAction() { + int [] result = new int[83]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAction(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackAction(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; + + /** + * Translates a state to a row index in the transition table + */ + private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); + + private static final String ZZ_ROWMAP_PACKED_0 = + "\0\0\0\45\0\112\0\157\0\224\0\271\0\336\0\157"+ + "\0\u0103\0\u0128\0\157\0\u014d\0\157\0\u0172\0\157\0\u0197"+ + "\0\u01bc\0\u01e1\0\157\0\u0206\0\u022b\0\u0250\0\u0275\0\u029a"+ + "\0\u02bf\0\u02e4\0\u0309\0\157\0\271\0\157\0\157\0\157"+ + "\0\157\0\157\0\157\0\u032e\0\u0353\0\157\0\157\0\157"+ + "\0\157\0\u0378\0\u039d\0\u03c2\0\u03e7\0\u040c\0\u0431\0\u0456"+ + "\0\u02bf\0\u047b\0\157\0\u04a0\0\u04a0\0\u04c5\0\u04ea\0\u050f"+ + "\0\u0534\0\u0559\0\u057e\0\u01bc\0\u05a3\0\u05c8\0\u05ed\0\u01bc"+ + "\0\u0612\0\u0637\0\u065c\0\u01bc\0\u0681\0\u06a6\0\u06cb\0\u06f0"+ + "\0\u0715\0\u073a\0\u075f\0\u0784\0\u07a9\0\u07ce\0\u07f3\0\u01bc"+ + "\0\u01bc\0\u0818\0\u01bc"; + + private static int [] zzUnpackRowMap() { + int [] result = new int[83]; + int offset = 0; + offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackRowMap(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int high = packed.charAt(i++) << 16; + result[j++] = high | packed.charAt(i++); } + return j; + } + /** + * The transition table of the DFA + */ + private static final int [] ZZ_TRANS = zzUnpackTrans(); - /** - * Translates a state to a row index in the transition table - */ - private static final int[] ZZ_ROWMAP = zzUnpackRowMap(); + private static final String ZZ_TRANS_PACKED_0 = + "\4\4\1\5\1\6\1\4\1\7\1\6\3\4\1\10"+ + "\13\7\2\4\1\7\3\4\3\7\1\4\1\7\2\4"+ + "\1\11\1\12\1\13\32\11\1\14\3\11\1\15\3\11"+ + "\1\4\1\16\1\17\1\20\1\4\1\21\1\4\2\21"+ + "\1\22\1\4\1\23\1\4\1\24\1\25\1\26\1\21"+ + "\1\27\3\21\1\30\2\21\1\31\1\32\1\21\1\4"+ + "\1\22\1\4\1\21\1\33\1\21\1\34\1\21\1\4"+ + "\1\22\51\0\1\5\45\0\5\35\1\36\2\0\14\35"+ + "\1\0\1\35\1\0\1\35\1\0\3\35\1\0\1\35"+ + "\1\0\1\35\5\0\2\35\3\7\1\36\2\0\14\7"+ + "\1\0\1\7\1\0\1\7\1\0\3\7\1\0\1\7"+ + "\1\0\1\7\1\11\2\0\32\11\1\0\3\11\1\0"+ + "\3\11\2\0\1\13\42\0\2\37\1\0\12\37\1\40"+ + "\1\41\2\37\1\42\3\37\1\43\2\37\1\44\3\37"+ + "\1\45\1\46\3\37\1\47\1\50\1\51\1\44\2\0"+ + "\1\17\42\0\1\20\2\0\42\20\5\0\5\21\3\0"+ + "\14\21\1\0\1\21\1\0\1\21\1\0\3\21\1\0"+ + "\1\21\1\0\1\21\11\0\1\22\6\0\1\52\7\0"+ + "\1\22\1\53\1\52\1\0\1\22\7\0\1\22\5\0"+ + "\5\21\3\0\1\21\1\54\12\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\5\21\3\0\3\21\1\55\10\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\5\21\3\0\10\21\1\56\3\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\5\21\3\0\5\21\1\57\6\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\5\21\3\0\2\21\1\60\11\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\11\0"+ + "\1\61\6\0\1\52\7\0\1\61\1\53\1\52\1\0"+ + "\1\61\7\0\1\61\11\0\1\53\16\0\1\53\3\0"+ + "\1\53\7\0\1\53\5\0\5\21\3\0\14\21\1\0"+ + "\1\21\1\0\1\21\1\0\2\21\1\62\1\0\1\21"+ + "\1\0\1\21\30\0\1\45\3\0\1\45\7\0\1\45"+ + "\30\0\1\63\3\0\1\63\7\0\1\63\11\0\1\64"+ + "\16\0\1\64\2\0\1\65\1\64\7\0\1\64\11\0"+ + "\1\53\6\0\1\52\7\0\1\53\1\0\1\52\1\0"+ + "\1\53\7\0\1\53\5\0\5\21\3\0\2\21\1\66"+ + "\11\21\1\0\1\21\1\0\1\21\1\0\3\21\1\0"+ + "\1\21\1\0\1\21\5\0\5\21\3\0\14\21\1\0"+ + "\1\21\1\0\1\21\1\0\1\67\2\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\11\21\1\70\2\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\6\21\1\71\5\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\6\21\1\72\5\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\10\21\1\73\3\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\11\0\1\64\16\0\1\64\3\0\1\64"+ + "\7\0\1\64\5\0\5\21\3\0\3\21\1\74\10\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\12\21\1\75\1\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\3\21\1\76\10\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\7\21\1\77\4\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\6\21\1\100\5\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\7\21\1\101\4\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\7\21\1\102\4\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\4\21\1\103\7\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\3\21\1\104\10\21"+ + "\1\0\1\21\1\0\1\21\1\0\3\21\1\0\1\21"+ + "\1\0\1\21\5\0\5\21\3\0\1\105\13\21\1\0"+ + "\1\21\1\0\1\21\1\0\3\21\1\0\1\21\1\0"+ + "\1\21\5\0\5\21\3\0\1\106\13\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\12\21\1\107\1\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\5\21\1\110\6\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\3\21\1\111\10\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\10\21\1\112\3\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\10\21\1\113\3\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\1\21\1\114\12\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\3\21\1\115\10\21\1\0\1\21"+ + "\1\0\1\21\1\0\3\21\1\0\1\21\1\0\1\21"+ + "\5\0\5\21\3\0\1\116\13\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\4\21\1\117\3\0\13\21\1\120\1\0\1\21\1\0"+ + "\1\117\1\0\3\21\1\0\1\21\1\0\1\117\5\0"+ + "\5\21\3\0\11\21\1\121\2\21\1\0\1\21\1\0"+ + "\1\21\1\0\3\21\1\0\1\21\1\0\1\21\5\0"+ + "\4\21\1\122\3\0\13\21\1\123\1\0\1\21\1\0"+ + "\1\122\1\0\3\21\1\0\1\21\1\0\1\122\5\0"+ + "\4\21\1\117\3\0\13\21\1\117\1\0\1\21\1\0"+ + "\1\117\1\0\3\21\1\0\1\21\1\0\1\117\5\0"+ + "\4\21\1\122\3\0\13\21\1\122\1\0\1\21\1\0"+ + "\1\122\1\0\3\21\1\0\1\21\1\0\1\122"; - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\43\0\106\0\151\0\214\0\257\0\322\0\151" + - "\0\365\0\u0118\0\151\0\u013b\0\151\0\u015e\0\151\0\u0181" + - "\0\u01a4\0\u01c7\0\151\0\u01ea\0\u020d\0\u0230\0\u0253\0\u0276" + - "\0\u0299\0\u02bc\0\151\0\257\0\151\0\151\0\151\0\151" + - "\0\151\0\151\0\u02df\0\u0302\0\151\0\151\0\151\0\151" + - "\0\u0325\0\u0348\0\u036b\0\u038e\0\u03b1\0\u03d4\0\u03f7\0\u0299" + - "\0\151\0\u041a\0\u041a\0\u043d\0\u0460\0\u0483\0\u04a6\0\u04c9" + - "\0\u01a4\0\u04ec\0\u050f\0\u0532\0\u01a4\0\u0555\0\u0578\0\u01a4" + - "\0\u059b\0\u05be\0\u05e1\0\u0604\0\u0627\0\u064a\0\u066d\0\u01a4" + - "\0\u01a4"; + private static int [] zzUnpackTrans() { + int [] result = new int[2109]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } - private static int[] zzUnpackRowMap() { - int[] result = new int[73]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; + private static int zzUnpackTrans(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + value--; + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackRowMap(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; + + /* error codes */ + private static final int ZZ_UNKNOWN_ERROR = 0; + private static final int ZZ_NO_MATCH = 1; + private static final int ZZ_PUSHBACK_2BIG = 2; + + /* error messages for the codes above */ + private static final String ZZ_ERROR_MSG[] = { + "Unkown internal scanner error", + "Error: could not match input", + "Error: pushback value was too large" + }; + + /** + * ZZ_ATTRIBUTE[aState] contains the attributes of state aState + */ + private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); + + private static final String ZZ_ATTRIBUTE_PACKED_0 = + "\3\0\1\11\3\1\1\11\2\1\1\11\1\1\1\11"+ + "\1\1\1\11\3\1\1\11\10\1\1\11\1\0\6\11"+ + "\2\1\4\11\1\0\10\1\1\11\1\1\1\0\36\1"; + + private static int [] zzUnpackAttribute() { + int [] result = new int[83]; + int offset = 0; + offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAttribute(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); } + return j; + } - /** - * The transition table of the DFA - */ - private static final int[] ZZ_TRANS = zzUnpackTrans(); + /** the input device */ + private java.io.Reader zzReader; - private static final String ZZ_TRANS_PACKED_0 = - "\4\4\1\5\1\6\1\4\1\7\1\6\3\4\1\10" + - "\13\7\2\4\1\7\3\4\1\7\1\4\1\7\2\4" + - "\1\11\1\12\1\13\32\11\1\14\1\11\1\15\3\11" + - "\1\4\1\16\1\17\1\20\1\4\1\21\1\4\2\21" + - "\1\22\1\4\1\23\1\4\1\24\1\25\1\26\1\21" + - "\1\27\3\21\1\30\2\21\1\31\1\32\1\21\1\4" + - "\1\22\1\4\1\21\1\33\1\21\1\4\1\22\47\0" + - "\1\5\43\0\5\34\1\35\2\0\14\34\1\0\1\34" + - "\1\0\1\34\1\0\1\34\1\0\1\34\1\0\1\34" + - "\5\0\2\34\3\7\1\35\2\0\14\7\1\0\1\7" + - "\1\0\1\7\1\0\1\7\1\0\1\7\1\0\1\7" + - "\1\11\2\0\32\11\1\0\1\11\1\0\3\11\2\0" + - "\1\13\40\0\2\36\1\0\12\36\1\37\1\40\2\36" + - "\1\41\3\36\1\42\2\36\1\43\3\36\1\44\1\45" + - "\1\36\1\46\1\47\1\50\1\43\2\0\1\17\40\0" + - "\1\20\2\0\40\20\5\0\5\21\3\0\14\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\11\0\1\22\6\0\1\51\7\0\1\22\1\52" + - "\1\51\1\0\1\22\5\0\1\22\5\0\5\21\3\0" + - "\1\21\1\53\12\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\5\0\5\21\3\0" + - "\3\21\1\54\10\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\5\0\5\21\3\0" + - "\10\21\1\55\3\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\5\0\5\21\3\0" + - "\5\21\1\56\6\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\5\0\5\21\3\0" + - "\2\21\1\57\11\21\1\0\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\11\0\1\60\6\0" + - "\1\51\7\0\1\60\1\52\1\51\1\0\1\60\5\0" + - "\1\60\11\0\1\52\16\0\1\52\3\0\1\52\5\0" + - "\1\52\30\0\1\44\3\0\1\44\5\0\1\44\30\0" + - "\1\61\3\0\1\61\5\0\1\61\11\0\1\62\16\0" + - "\1\62\2\0\1\63\1\62\5\0\1\62\11\0\1\52" + - "\6\0\1\51\7\0\1\52\1\0\1\51\1\0\1\52" + - "\5\0\1\52\5\0\5\21\3\0\2\21\1\64\11\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\1\0\1\21\5\0\5\21\3\0\14\21\1\0\1\21" + - "\1\0\1\21\1\0\1\65\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\11\21\1\66\2\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\6\21\1\67\5\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\6\21\1\70\5\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\11\0\1\62\16\0\1\62\3\0\1\62\5\0\1\62" + - "\5\0\5\21\3\0\3\21\1\71\10\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\12\21\1\72\1\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\3\21\1\73\10\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\7\21\1\74\4\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\6\21\1\75\5\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\7\21\1\76\4\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\4\21\1\77\7\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\3\21\1\100\10\21\1\0\1\21" + - "\1\0\1\21\1\0\1\21\1\0\1\21\1\0\1\21" + - "\5\0\5\21\3\0\1\101\13\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\5\21\3\0\12\21\1\102\1\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\5\21\3\0\3\21\1\103\10\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\5\21\3\0\10\21\1\104\3\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\5\21\3\0\1\21\1\105\12\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\5\21\3\0\3\21\1\106\10\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\4\21\1\107\3\0\13\21\1\110\1\0\1\21\1\0" + - "\1\107\1\0\1\21\1\0\1\21\1\0\1\107\5\0" + - "\5\21\3\0\11\21\1\111\2\21\1\0\1\21\1\0" + - "\1\21\1\0\1\21\1\0\1\21\1\0\1\21\5\0" + - "\4\21\1\107\3\0\13\21\1\107\1\0\1\21\1\0" + - "\1\107\1\0\1\21\1\0\1\21\1\0\1\107"; + /** the current state of the DFA */ + private int zzState; - private static int[] zzUnpackTrans() { - int[] result = new int[1680]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } + /** the current lexical state */ + private int zzLexicalState = YYINITIAL; - private static int zzUnpackTrans(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - value--; - do result[j++] = value; while (--count > 0); - } - return j; - } + /** this buffer contains the current text to be matched and is + the source of the yytext() string */ + private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; + /** the textposition at the last accepting state */ + private int zzMarkedPos; - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; + /** the current text position in the buffer */ + private int zzCurrentPos; - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; + /** startRead marks the beginning of the yytext() string in the buffer */ + private int zzStartRead; - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute(); + /** endRead marks the last character in the buffer, that has been read + from input */ + private int zzEndRead; - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\1\11\3\1\1\11\2\1\1\11\1\1\1\11" + - "\1\1\1\11\3\1\1\11\7\1\1\11\1\0\6\11" + - "\2\1\4\11\1\0\7\1\1\11\1\1\1\0\26\1"; + /** number of newlines encountered up to the start of the matched text */ + private int yyline; - private static int[] zzUnpackAttribute() { - int[] result = new int[73]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } + /** the number of characters up to the start of the matched text */ + private int yychar; - private static int zzUnpackAttribute(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } + /** + * the number of characters from the last newline up to the start of the + * matched text + */ + private int yycolumn; - /** - * the input device - */ - private java.io.Reader zzReader; + /** + * zzAtBOL == true <=> the scanner is currently at the beginning of a line + */ + private boolean zzAtBOL = true; - /** - * the current state of the DFA - */ - private int zzState; + /** zzAtEOF == true <=> the scanner is at the EOF */ + private boolean zzAtEOF; - /** - * the current lexical state - */ - private int zzLexicalState = YYINITIAL; + /** denotes if the user-EOF-code has already been executed */ + private boolean zzEOFDone; - /** - * this buffer contains the current text to be matched and is - * the source of the yytext() string - */ - private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; + /* user code: */ - /** - * the textposition at the last accepting state - */ - private int zzMarkedPos; - - /** - * the current text position in the buffer - */ - private int zzCurrentPos; - - /** - * startRead marks the beginning of the yytext() string in the buffer - */ - private int zzStartRead; - - /** - * endRead marks the last character in the buffer, that has been read - * from input - */ - private int zzEndRead; - - /** - * number of newlines encountered up to the startServer of the matched text - */ - private int yyline; - - /** - * the number of characters up to the startServer of the matched text - */ - private int yychar; - - /** - * the number of characters from the last newline up to the startServer of the - * matched text - */ - private int yycolumn; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** - * zzAtEOF == true <=> the scanner is at the EOF - */ - private boolean zzAtEOF; - - /** - * denotes if the user-EOF-code has already been executed - */ - private boolean zzEOFDone; - - /* user code: */ - - StringBuffer string = new StringBuffer(); + StringBuffer string = new StringBuffer(); /** * Create an empty lexer, yyrset will be called later to reset and assign @@ -462,520 +452,500 @@ public final class FlasmLexer { } public int yyline() { - return yyline + 1; + return yyline+1; } - /** - * Creates a new scanner - * There is also a java.io.InputStream version of this constructor. - * - * @param in the java.io.Reader to read input from. - */ - public FlasmLexer(java.io.Reader in) { - this.zzReader = in; + + /** + * Creates a new scanner + * There is also a java.io.InputStream version of this constructor. + * + * @param in the java.io.Reader to read input from. + */ + public FlasmLexer(java.io.Reader in) { + this.zzReader = in; + } + + /** + * Creates a new scanner. + * There is also java.io.Reader version of this constructor. + * + * @param in the java.io.Inputstream to read input from. + */ + public FlasmLexer(java.io.InputStream in) { + this(new java.io.InputStreamReader(in)); + } + + /** + * Unpacks the compressed character translation table. + * + * @param packed the packed character translation table + * @return the unpacked character translation table + */ + private static char [] zzUnpackCMap(String packed) { + char [] map = new char[0x10000]; + int i = 0; /* index in packed string */ + int j = 0; /* index in unpacked array */ + while (i < 1740) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do map[j++] = value; while (--count > 0); + } + return map; + } + + + /** + * Refills the input buffer. + * + * @return false, iff there was new input. + * + * @exception java.io.IOException if any I/O-Error occurs + */ + private boolean zzRefill() throws java.io.IOException { + + /* first: make room (if you can) */ + if (zzStartRead > 0) { + System.arraycopy(zzBuffer, zzStartRead, + zzBuffer, 0, + zzEndRead-zzStartRead); + + /* translate stored positions */ + zzEndRead-= zzStartRead; + zzCurrentPos-= zzStartRead; + zzMarkedPos-= zzStartRead; + zzStartRead = 0; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public FlasmLexer(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); + /* is the buffer big enough? */ + if (zzCurrentPos >= zzBuffer.length) { + /* if not: blow it up */ + char newBuffer[] = new char[zzCurrentPos*2]; + System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); + zzBuffer = newBuffer; } - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char[] zzUnpackCMap(String packed) { - char[] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 1738) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; + /* finally: fill the buffer with new input */ + int numRead = zzReader.read(zzBuffer, zzEndRead, + zzBuffer.length-zzEndRead); + + if (numRead > 0) { + zzEndRead+= numRead; + return false; } - - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * @throws java.io.IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws java.io.IOException { - - /* first: make room (if you can) */ - if (zzStartRead > 0) { - System.arraycopy(zzBuffer, zzStartRead, - zzBuffer, 0, - zzEndRead - zzStartRead); - - /* translate stored positions */ - zzEndRead -= zzStartRead; - zzCurrentPos -= zzStartRead; - zzMarkedPos -= zzStartRead; - zzStartRead = 0; - } - - /* is the buffer big enough? */ - if (zzCurrentPos >= zzBuffer.length) { - /* if not: blow it up */ - char newBuffer[] = new char[zzCurrentPos * 2]; - System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); - zzBuffer = newBuffer; - } - - /* finally: fill the buffer with new input */ - int numRead = zzReader.read(zzBuffer, zzEndRead, - zzBuffer.length - zzEndRead); - - if (numRead > 0) { - zzEndRead += numRead; - return false; - } - // unlikely but not impossible: read 0 characters, but not at end of stream - if (numRead == 0) { - int c = zzReader.read(); - if (c == -1) { - return true; - } else { - zzBuffer[zzEndRead++] = (char) c; - return false; - } - } - - // numRead < 0 + // unlikely but not impossible: read 0 characters, but not at end of stream + if (numRead == 0) { + int c = zzReader.read(); + if (c == -1) { return true; + } else { + zzBuffer[zzEndRead++] = (char) c; + return false; + } } + // numRead < 0 + return true; + } - /** - * Closes the input stream. - */ - public final void yyclose() throws java.io.IOException { - zzAtEOF = true; /* indicate end of file */ - zzEndRead = zzStartRead; /* invalidate buffer */ + + /** + * Closes the input stream. + */ + public final void yyclose() throws java.io.IOException { + zzAtEOF = true; /* indicate end of file */ + zzEndRead = zzStartRead; /* invalidate buffer */ - if (zzReader != null) - zzReader.close(); + if (zzReader != null) + zzReader.close(); + } + + + /** + * Resets the scanner to read from a new input stream. + * Does not close the old reader. + * + * All internal variables are reset, the old input stream + * cannot be reused (internal buffer is discarded and lost). + * Lexical state is set to ZZ_INITIAL. + * + * @param reader the new input stream + */ + public final void yyreset(java.io.Reader reader) { + zzReader = reader; + zzAtBOL = true; + zzAtEOF = false; + zzEOFDone = false; + zzEndRead = zzStartRead = 0; + zzCurrentPos = zzMarkedPos = 0; + yyline = yychar = yycolumn = 0; + zzLexicalState = YYINITIAL; + } + + + /** + * Returns the current lexical state. + */ + public final int yystate() { + return zzLexicalState; + } + + + /** + * Enters a new lexical state + * + * @param newState the new lexical state + */ + public final void yybegin(int newState) { + zzLexicalState = newState; + } + + + /** + * Returns the text matched by the current regular expression. + */ + public final String yytext() { + return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead ); + } + + + /** + * Returns the character at position pos from the + * matched text. + * + * It is equivalent to yytext().charAt(pos), but faster + * + * @param pos the position of the character to fetch. + * A value from 0 to yylength()-1. + * + * @return the character at position pos + */ + public final char yycharat(int pos) { + return zzBuffer[zzStartRead+pos]; + } + + + /** + * Returns the length of the matched text region. + */ + public final int yylength() { + return zzMarkedPos-zzStartRead; + } + + + /** + * Reports an error that occured while scanning. + * + * In a wellformed scanner (no or only correct usage of + * yypushback(int) and a match-all fallback rule) this method + * will only be called with things that "Can't Possibly Happen". + * If this method is called, something is seriously wrong + * (e.g. a JFlex bug producing a faulty scanner etc.). + * + * Usual syntax/scanner level error handling should be done + * in error fallback rules. + * + * @param errorCode the code of the errormessage to display + */ + private void zzScanError(int errorCode) { + String message; + try { + message = ZZ_ERROR_MSG[errorCode]; + } + catch (ArrayIndexOutOfBoundsException e) { + message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; } - - /** - * Resets the scanner to read from a new input stream. - * Does not close the old reader. - *

- * All internal variables are reset, the old input stream - * cannot be reused (internal buffer is discarded and lost). - * Lexical state is set to ZZ_INITIAL. - * - * @param reader the new input stream - */ - public final void yyreset(java.io.Reader reader) { - zzReader = reader; - zzAtBOL = true; - zzAtEOF = false; - zzEOFDone = false; - zzEndRead = zzStartRead = 0; - zzCurrentPos = zzMarkedPos = 0; - yyline = yychar = yycolumn = 0; - zzLexicalState = YYINITIAL; - } + throw new Error(message); + } - /** - * Returns the current lexical state. - */ - public final int yystate() { - return zzLexicalState; - } + /** + * Pushes the specified amount of characters back into the input stream. + * + * They will be read again by then next call of the scanning method + * + * @param number the number of characters to be read again. + * This number must not be greater than yylength()! + */ + public void yypushback(int number) { + if ( number > yylength() ) + zzScanError(ZZ_PUSHBACK_2BIG); + + zzMarkedPos -= number; + } - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - public final void yybegin(int newState) { - zzLexicalState = newState; - } + /** + * Resumes scanning until the next regular expression is matched, + * the end of input is encountered or an I/O-Error occurs. + * + * @return the next token + * @exception java.io.IOException if any I/O-Error occurs + */ + public ParsedSymbol yylex() throws java.io.IOException, ParseException { + int zzInput; + int zzAction; + // cached fields: + int zzCurrentPosL; + int zzMarkedPosL; + int zzEndReadL = zzEndRead; + char [] zzBufferL = zzBuffer; + char [] zzCMapL = ZZ_CMAP; - /** - * Returns the text matched by the current regular expression. - */ - public final String yytext() { - return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); - } + int [] zzTransL = ZZ_TRANS; + int [] zzRowMapL = ZZ_ROWMAP; + int [] zzAttrL = ZZ_ATTRIBUTE; + while (true) { + zzMarkedPosL = zzMarkedPos; - /** - * Returns the character at position pos from the - * matched text. - *

- * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBuffer[zzStartRead + pos]; - } + yychar+= zzMarkedPosL-zzStartRead; - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos - zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - *

- * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - *

- * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; + boolean zzR = false; + for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL; + zzCurrentPosL++) { + switch (zzBufferL[zzCurrentPosL]) { + case '\u000B': + case '\u000C': + case '\u0085': + case '\u2028': + case '\u2029': + yyline++; + yycolumn = 0; + zzR = false; + break; + case '\r': + yyline++; + yycolumn = 0; + zzR = true; + break; + case '\n': + if (zzR) + zzR = false; + else { + yyline++; + yycolumn = 0; + } + break; + default: + zzR = false; + yycolumn++; } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; + } + + if (zzR) { + // peek one character ahead if it is \n (if we have counted one line too much) + boolean zzPeek; + if (zzMarkedPosL < zzEndReadL) + zzPeek = zzBufferL[zzMarkedPosL] == '\n'; + else if (zzAtEOF) + zzPeek = false; + else { + boolean eof = zzRefill(); + zzEndReadL = zzEndRead; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + if (eof) + zzPeek = false; + else + zzPeek = zzBufferL[zzMarkedPosL] == '\n'; } + if (zzPeek) yyline--; + } + zzAction = -1; - throw new Error(message); - } + zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + + zzState = ZZ_LEXSTATE[zzLexicalState]; - /** - * Pushes the specified amount of characters back into the input stream. - *

- * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if (number > yylength()) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @throws java.io.IOException if any I/O-Error occurs - */ - public ParsedSymbol yylex() throws java.io.IOException, ParseException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - char[] zzBufferL = zzBuffer; - char[] zzCMapL = ZZ_CMAP; - - int[] zzTransL = ZZ_TRANS; - int[] zzRowMapL = ZZ_ROWMAP; - int[] zzAttrL = ZZ_ATTRIBUTE; - + zzForAction: { while (true) { - zzMarkedPosL = zzMarkedPos; - - yychar += zzMarkedPosL - zzStartRead; - - boolean zzR = false; - for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL; - zzCurrentPosL++) { - switch (zzBufferL[zzCurrentPosL]) { - case '\u000B': - case '\u000C': - case '\u0085': - case '\u2028': - case '\u2029': - yyline++; - yycolumn = 0; - zzR = false; - break; - case '\r': - yyline++; - yycolumn = 0; - zzR = true; - break; - case '\n': - if (zzR) - zzR = false; - else { - yyline++; - yycolumn = 0; - } - break; - default: - zzR = false; - yycolumn++; - } + + if (zzCurrentPosL < zzEndReadL) + zzInput = zzBufferL[zzCurrentPosL++]; + else if (zzAtEOF) { + zzInput = YYEOF; + break zzForAction; + } + else { + // store back cached positions + zzCurrentPos = zzCurrentPosL; + zzMarkedPos = zzMarkedPosL; + boolean eof = zzRefill(); + // get translated positions and possibly new buffer + zzCurrentPosL = zzCurrentPos; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + zzEndReadL = zzEndRead; + if (eof) { + zzInput = YYEOF; + break zzForAction; } - - if (zzR) { - // peek one character ahead if it is \n (if we have counted one line too much) - boolean zzPeek; - if (zzMarkedPosL < zzEndReadL) - zzPeek = zzBufferL[zzMarkedPosL] == '\n'; - else if (zzAtEOF) - zzPeek = false; - else { - boolean eof = zzRefill(); - zzEndReadL = zzEndRead; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - if (eof) - zzPeek = false; - else - zzPeek = zzBufferL[zzMarkedPosL] == '\n'; - } - if (zzPeek) yyline--; + else { + zzInput = zzBufferL[zzCurrentPosL++]; } - zzAction = -1; + } + int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; + if (zzNext == -1) break zzForAction; + zzState = zzNext; - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + int zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + zzMarkedPosL = zzCurrentPosL; + if ( (zzAttributes & 8) == 8 ) break zzForAction; + } - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: - { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferL[zzCurrentPosL++]; - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } else { - zzInput = zzBufferL[zzCurrentPosL++]; - } - } - int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ((zzAttributes & 1) == 1) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ((zzAttributes & 8) == 8) break zzForAction; - } - - } - } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 9: { - return new ParsedSymbol(ParsedSymbol.TYPE_IDENTIFIER, yytext()); - } - case 30: - break; - case 23: { - string.append('\''); - } - case 31: - break; - case 10: { - return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext())))); - } - case 32: - break; - case 7: { - yybegin(YYINITIAL); - return new ParsedSymbol(ParsedSymbol.TYPE_EOL); - } - case 33: - break; - case 19: { - char val = (char) Integer.parseInt(yytext().substring(1), 8); - string.append(val); - } - case 34: - break; - case 4: { - string.append(yytext()); - } - case 35: - break; - case 2: { - yybegin(PARAMETERS); - return new ParsedSymbol(ParsedSymbol.TYPE_INSTRUCTION_NAME, yytext()); - } - case 36: - break; - case 16: { - string.append('\r'); - } - case 37: - break; - case 12: { - yybegin(STRING); - string.setLength(0); - } - case 38: - break; - case 6: { - yybegin(PARAMETERS); - // length also includes the trailing quote - return new ParsedSymbol(ParsedSymbol.TYPE_STRING, string.toString()); - } - case 39: - break; - case 8: { - return new ParsedSymbol(ParsedSymbol.TYPE_COMMENT, yytext().substring(1)); - } - case 40: - break; - case 27: { - return new ParsedSymbol(ParsedSymbol.TYPE_BOOLEAN, Boolean.FALSE); - } - case 41: - break; - case 22: { - string.append('\b'); - } - case 42: - break; - case 13: { - String s = yytext(); - return new ParsedSymbol(ParsedSymbol.TYPE_LABEL, s.substring(0, s.length() - 1)); - } - case 43: - break; - case 5: { - throw new ParseException("Unterminated string at end of line", yyline + 1); - } - case 44: - break; - case 15: { - string.append('\t'); - } - case 45: - break; - case 28: { - return new ParsedSymbol(ParsedSymbol.TYPE_REGISTER, new RegisterNumber(Integer.parseInt(yytext().substring(8)))); - } - case 46: - break; - case 24: { - return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext())))); - } - case 47: - break; - case 25: { - return new ParsedSymbol(ParsedSymbol.TYPE_BOOLEAN, Boolean.TRUE); - } - case 48: - break; - case 11: { - return new ParsedSymbol(ParsedSymbol.TYPE_BLOCK_START); - } - case 49: - break; - case 26: { - return new ParsedSymbol(ParsedSymbol.TYPE_NULL, new Null()); - } - case 50: - break; - case 20: { - string.append('\\'); - } - case 51: - break; - case 14: { - throw new ParseException("Illegal escape sequence \"" + yytext() + "\"", yyline + 1); - } - case 52: - break; - case 18: { - string.append('\n'); - } - case 53: - break; - case 3: { - return new ParsedSymbol(ParsedSymbol.TYPE_BLOCK_END); - } - case 54: - break; - case 29: { - return new ParsedSymbol(ParsedSymbol.TYPE_UNDEFINED, new Undefined()); - } - case 55: - break; - case 17: { - string.append('\f'); - } - case 56: - break; - case 21: { - string.append('\"'); - } - case 57: - break; - case 1: { - } - case 58: - break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - { - return new ParsedSymbol(ParsedSymbol.TYPE_EOF); - } - } else { - zzScanError(ZZ_NO_MATCH); - } - } } + } + + // store back cached position + zzMarkedPos = zzMarkedPosL; + + switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 9: + { return new ParsedSymbol(ParsedSymbol.TYPE_IDENTIFIER,yytext()); + } + case 31: break; + case 23: + { string.append( '\'' ); + } + case 32: break; + case 30: + { return new ParsedSymbol(ParsedSymbol.TYPE_CONSTANT,new ConstantIndex(Integer.parseInt(yytext().substring(8)))); + } + case 33: break; + case 10: + { return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER,new Long(Long.parseLong((yytext())))); + } + case 34: break; + case 7: + { yybegin(YYINITIAL); return new ParsedSymbol(ParsedSymbol.TYPE_EOL); + } + case 35: break; + case 19: + { char val = (char) Integer.parseInt(yytext().substring(1),8); + string.append( val ); + } + case 36: break; + case 4: + { string.append( yytext() ); + } + case 37: break; + case 2: + { yybegin(PARAMETERS); + return new ParsedSymbol(ParsedSymbol.TYPE_INSTRUCTION_NAME,yytext()); + } + case 38: break; + case 16: + { string.append( '\r' ); + } + case 39: break; + case 12: + { yybegin(STRING); + string.setLength(0); + } + case 40: break; + case 6: + { yybegin(PARAMETERS); + // length also includes the trailing quote + return new ParsedSymbol(ParsedSymbol.TYPE_STRING,string.toString()); + } + case 41: break; + case 8: + { return new ParsedSymbol(ParsedSymbol.TYPE_COMMENT,yytext().substring(1)); + } + case 42: break; + case 27: + { return new ParsedSymbol(ParsedSymbol.TYPE_BOOLEAN,Boolean.FALSE); + } + case 43: break; + case 22: + { string.append( '\b' ); + } + case 44: break; + case 13: + { String s=yytext(); + return new ParsedSymbol(ParsedSymbol.TYPE_LABEL,s.substring(0,s.length()-1)); + } + case 45: break; + case 5: + { throw new ParseException("Unterminated string at end of line",yyline+1); + } + case 46: break; + case 15: + { string.append( '\t' ); + } + case 47: break; + case 28: + { return new ParsedSymbol(ParsedSymbol.TYPE_REGISTER,new RegisterNumber(Integer.parseInt(yytext().substring(8)))); + } + case 48: break; + case 24: + { return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT,new Double(Double.parseDouble((yytext())))); + } + case 49: break; + case 25: + { return new ParsedSymbol(ParsedSymbol.TYPE_BOOLEAN,Boolean.TRUE); + } + case 50: break; + case 11: + { return new ParsedSymbol(ParsedSymbol.TYPE_BLOCK_START); + } + case 51: break; + case 26: + { return new ParsedSymbol(ParsedSymbol.TYPE_NULL,new Null()); + } + case 52: break; + case 20: + { string.append( '\\' ); + } + case 53: break; + case 14: + { throw new ParseException("Illegal escape sequence \""+yytext()+"\"",yyline+1); + } + case 54: break; + case 18: + { string.append( '\n' ); + } + case 55: break; + case 3: + { return new ParsedSymbol(ParsedSymbol.TYPE_BLOCK_END); + } + case 56: break; + case 29: + { return new ParsedSymbol(ParsedSymbol.TYPE_UNDEFINED,new Undefined()); + } + case 57: break; + case 17: + { string.append( '\f' ); + } + case 58: break; + case 21: + { string.append( '\"' ); + } + case 59: break; + case 1: + { + } + case 60: break; + default: + if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { + zzAtEOF = true; + { + return new ParsedSymbol(ParsedSymbol.TYPE_EOF); + } + } + else { + zzScanError(ZZ_NO_MATCH); + } + } } + } } diff --git a/trunk/src/com/jpexs/asdec/action/parser/Label.java b/trunk/src/com/jpexs/asdec/action/parser/Label.java index 15d470bc1..f7b622871 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/Label.java +++ b/trunk/src/com/jpexs/asdec/action/parser/Label.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/parser/ParseException.java b/trunk/src/com/jpexs/asdec/action/parser/ParseException.java index 25a870ab4..d81a85de0 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ParseException.java +++ b/trunk/src/com/jpexs/asdec/action/parser/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java b/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java index 88bced4a5..7238d978d 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java +++ b/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/parser/flasm.flex b/trunk/src/com/jpexs/asdec/action/parser/flasm.flex index 19dd9f320..9387cabbe 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/flasm.flex +++ b/trunk/src/com/jpexs/asdec/action/parser/flasm.flex @@ -86,6 +86,7 @@ OctDigit = [0-7] StringCharacter = [^\r\n\"\\] Register= register{NumberLiteral} +Constant= constant{NumberLiteral} %state STRING,PARAMETERS @@ -129,6 +130,8 @@ Register= register{NumberLiteral} {Undefined} {return new ParsedSymbol(ParsedSymbol.TYPE_UNDEFINED,new Undefined());} {Register} { return new ParsedSymbol(ParsedSymbol.TYPE_REGISTER,new RegisterNumber(Integer.parseInt(yytext().substring(8)))); } + {Constant} { return new ParsedSymbol(ParsedSymbol.TYPE_CONSTANT,new ConstantIndex(Integer.parseInt(yytext().substring(8)))); } + {Identifier} { return new ParsedSymbol(ParsedSymbol.TYPE_IDENTIFIER,yytext()); } } diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java index bea6fd88a..69e0f2da0 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GetURLTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,8 +38,10 @@ public class ActionGetURL extends Action { public String urlString; public String targetString; - public ActionGetURL(int actionLength, SWFInputStream sis) throws IOException { + public ActionGetURL(int actionLength, SWFInputStream sis,int version) throws IOException { super(0x83, actionLength); + byte data[]=sis.readBytes(actionLength); + sis=new SWFInputStream(new ByteArrayInputStream(data),version); urlString = sis.readString(); targetString = sis.readString(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java index 1a7949b1a..2d7936daf 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GotoLabelTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,8 +37,10 @@ import java.util.Stack; public class ActionGoToLabel extends Action { public String label; - public ActionGoToLabel(int actionLength, SWFInputStream sis) throws IOException { + public ActionGoToLabel(int actionLength, SWFInputStream sis,int version) throws IOException { super(0x8C, actionLength); + byte data[]=sis.readBytes(actionLength); + sis=new SWFInputStream(new ByteArrayInputStream(data),version); label = sis.readString(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java index 71714b3df..f736fc27d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java index 1e43cd99a..f27442a5e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java index d0f9c2491..2f54a565e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java index 9316bb817..361acd5ee 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java index 7f646301f..c6886647a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SetTargetTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,8 +37,10 @@ import java.util.Stack; public class ActionSetTarget extends Action { public String targetName; - public ActionSetTarget(int actionLength, SWFInputStream sis) throws IOException { + public ActionSetTarget(int actionLength, SWFInputStream sis,int version) throws IOException { super(0x8B, actionLength); + byte data[]=sis.readBytes(actionLength); + sis=new SWFInputStream(new ByteArrayInputStream(data),version); targetName = sis.readString(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java index 7549d35f6..6ba921196 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java index 7a27f3db3..af51df50d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java index 43d5fdb60..a77af0f53 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java index 19a6b11f8..6d4c13870 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java index 6403dfea7..2b5ad1e89 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java index d517de28c..0c7bd5d26 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java index 4d92870b4..e2fdd357a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java index 29c8ed735..6da87f527 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java index 5019fba75..d9715795e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java index b566849cb..c26acae50 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java index 75a850f46..e5587a0a8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java index b8b816b7f..6b08113dd 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java index 4855503b6..0dbafd15c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java index b5be53db6..1bc6b7545 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java index 32f2a65e0..784983aa9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java index c44c84c05..2be64f9d7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java index cc466f97f..3c7fbb15c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java index f4d3ed900..477ec8e01 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java index 3710c1031..63d4f4df2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java index 645a384e0..e30b16089 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java index 715857c57..55f0dd84a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java index d03e470f0..9923675cb 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java index d5cdf32ac..44c2992ef 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java index c66cf002a..4048683d1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java index b08cbb9bc..db78d4287 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java index 25221eeb6..23841446a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java index 0aade10c2..97aec5d77 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java index 033173e00..735ef7009 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java index 1b3183766..1050e3047 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java index 73bcd5713..65e28e09e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java index 2493bd2e5..d663a8afc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java index 45a6444b3..81c438db8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java index b5651c0a7..00e7c7293 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java index d88ee55f3..c555daf13 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java index 8acafdb50..9bd9a3c77 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java index 235f41f16..d97e3c536 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java index 0c1ccd8c2..2adfe2c3a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java index 7a5163eec..c0f4da047 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java index 8d65c5b78..a55f8dbc8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java index 6e82967e7..566b1f5a9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java index 2be68e2ae..9ef63ab4b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java index 752f5442a..b12629879 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java index 41f1e7cdc..04622ff41 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java index d9ff7f6ac..4ec4f410b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java index 499b85e44..a0988fe01 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java b/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java index 111811971..a92d162e7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,15 +18,17 @@ package com.jpexs.asdec.action.swf4; +import com.jpexs.asdec.Main; import com.jpexs.asdec.helpers.Helper; import java.util.ArrayList; import java.util.List; public class ConstantIndex { + public int index; public List constantPool; - + public ConstantIndex(int index) { this.index = index; @@ -40,9 +42,11 @@ public class ConstantIndex { @Override public String toString() { - if (constantPool != null) { - if (index < constantPool.size()) { - return "\"" + Helper.escapeString(constantPool.get(index)) + "\""; + if (Main.RESOLVE_CONSTANTS) { + if (constantPool != null) { + if (index < constantPool.size()) { + return "\"" + Helper.escapeString(constantPool.get(index)) + "\""; + } } } return "constant" + index; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/Null.java b/trunk/src/com/jpexs/asdec/action/swf4/Null.java index 9f1217cfa..6ad52b983 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/Null.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/Null.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java b/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java index f56e294d6..dd1b0dbd6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java b/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java index e9a14ab1d..f51836ab6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java index 6f0b9df3e..57e03deb6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java index 0ee241253..2ec56616d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java index 96f3fd6bc..9f83127e7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java index 074896420..8ca9c6641 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java index 732cce626..1831a844a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java index c7ffa4825..59df17732 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java index a2215c285..ceeda1cec 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java index 48e5c91e4..8bbfc3eb3 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java index 2ca909af1..e7a5663ec 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java index bada533d1..1590c0bb7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,6 +27,7 @@ import com.jpexs.asdec.action.parser.ParsedSymbol; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,8 +38,9 @@ import java.util.Stack; public class ActionConstantPool extends Action { public List constantPool = new ArrayList(); - public ActionConstantPool(int actionLength, SWFInputStream sis) throws IOException { + public ActionConstantPool(int actionLength, SWFInputStream sis, int version) throws IOException { super(0x88, actionLength); + sis = new SWFInputStream(new ByteArrayInputStream(sis.readBytes(actionLength)), version); int count = sis.readUI16(); for (int i = 0; i < count; i++) { constantPool.add(sis.readString()); diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java index 7d4e0a670..6fde2889b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java index 1fc504339..485cd3b3c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -41,12 +41,15 @@ public class ActionDefineFunction extends Action { public ActionDefineFunction(int actionLength, SWFInputStream sis, int version) throws IOException { super(0x9B, actionLength); + //byte data[]=sis.readBytes(actionLength); + //sis=new SWFInputStream(new ByteArrayInputStream(data),version); functionName = sis.readString(); int numParams = sis.readUI16(); for (int i = 0; i < numParams; i++) { paramNames.add(sis.readString()); } codeSize = sis.readUI16(); + //code = new ArrayList(); code = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java index e8eef4857..210895c40 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java index 3b5a2beea..7ba75975b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java index a3a6375d5..ea1dafe3a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java index 986e97cf8..55d94af6b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java index e00545fe0..07984bec4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java index 58c61aaf5..3926a4a42 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java index 0a73d5167..638c86ed2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java index 5508e55bd..64daa4b3d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java index b71265c49..12218b647 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java index 7eb9c463e..ab4a3fc08 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java index a4df7c38d..90a27cdd3 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java index f2f11ab02..4c8297709 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java index 816753ae1..355860fb2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java index 44be4030b..91088b89c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java index a1af9a1fd..e992f63ef 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java index 11c59978c..a348f46da 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java index 7f5a2fea3..c8b3e3cfb 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java index 4928a0ce5..bcd2236ab 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java index 962c9c734..e3d10bf47 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java index 52473a0a3..14e687798 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java index 7e91e7771..686b57710 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java index fce6659c9..af2b88ad6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java index ea2b66694..b0f803c6b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java index e2b43e619..062b1b282 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,6 +29,7 @@ import com.jpexs.asdec.action.parser.ParseException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.List; public class ActionWith extends Action { @@ -38,6 +39,7 @@ public class ActionWith extends Action { public ActionWith(SWFInputStream sis, int version) throws IOException { super(0x94, 2); size = sis.readUI16(); + //actions = new ArrayList(); actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java index 9b7d51e5e..7cea74328 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java index 3718e050f..e3a24db19 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java index 240500372..34cbe4402 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java index bf85efbe5..f7af3426b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java index 59b5a0459..df61ce705 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java index 8c104578f..d64acc2b2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java index 33f7ab0d3..fa2b38a00 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -73,6 +73,7 @@ public class ActionDefineFunction2 extends Action { } codeSize = sis.readUI16(); + //code = new ArrayList(); code = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList(); } diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java index cc1e9c748..92bf5aa68 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java index e4f2b3495..cc2c28c2b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java index 222b45598..ebcc19b82 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java index 4e5f74da7..5eda9ea17 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java index 950324335..b043ddcf5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java index 409a21dfa..dfd6aad3f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java index b04a85a4d..206da1bea 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java index d221e80e4..b55806f21 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java index c47a4e2e1..4dd0cc42b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java index 0c2986bc7..24602c3a0 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java index e92359bbf..e3bb8c1fa 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java index 6f07bb5d0..da588fa7c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java b/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java index ace9fcbe8..76e7e4e95 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java index 7e295cb92..f06310742 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java index 2c5495e5e..39b43cd6c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java index 0f0f5421a..cdc9f4afc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java index 58a230c42..24c40ddec 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java index 69d832817..69ff6432d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java index 8585536d7..8735c6eb5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java index 0bdc24d29..9908c474a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java index 34535418b..ab7a7750e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java index 3e6e858b0..2d00f8bc5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java index b7b33c28e..41113352e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java index 6aa5f6d79..26bbd5f2f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java index 7f9671c9c..c1745cc1b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java index 9219f413e..0cc22d6e0 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java index 85bd057a8..345c7ac24 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java index bef5c330b..008455e3e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java index a28320504..c749b390b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java index 321691d6a..22c901b21 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java index 88ff10d3b..7c23fa94a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java index 9c888c434..f8eee6dc6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java index a2e01a04b..39f326662 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java index 35bcc0f54..a7975d378 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java index 4d9fd1275..a84f04f5d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java index 01e1b51f5..5ddb606ff 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java index b80f42c98..5e990d1d9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java index e684f5a0d..44e8796c6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java index c78ed5fac..17e4b7a90 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java index 8bd7ad684..3450cc82d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java index 8079fd405..a4f329580 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java index 6e83e5724..b89acd85b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java index 87e3f4957..c9185c375 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java index 82d593b54..2667ff19f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java index aaf98392c..fa5d4e4db 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java index 6a476a584..6217c3610 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java index c2585544b..d5ee97b5f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java index b9dec90e7..16b4dbe00 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java index b28a739a0..a62cb8d7b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java index 2af3d2864..e2428c28e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java index 58f540467..a8cfead0a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java index 48c1993a5..0a582106c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java index 278c6a25e..6922de1cd 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java index e275a5315..060a103db 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java index d77e84015..4772d0a22 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java index 3df64728e..ce56ae21b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java index df25ae979..2700fa82d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java index c1c0087e2..ac1448518 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java index 7909fb539..d11ebc8d5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java index ff923582a..e95b46dfa 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java index 2d47fcd88..d83a7cbd0 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java index 3398e9918..426ad1f6c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java index c2926cf21..fef16890f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java index 80388f03f..29d9803a9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java index 1dcc3dfe1..4deacea9f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java index 9cd21d1ba..cd0dd8dae 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java index 058c1483b..db8c22d73 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java index 5416bc250..3dd579dc7 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java index a48b5c9dc..9afc20032 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java index b2ef4d970..3d32c43df 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java index 4fb17b8f3..204ff0387 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java index 10bab3500..aa422f71e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java index 7991bdcbb..a0421e8cb 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java index 908bbf8c0..4fdeaa950 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java index 90d47039c..1252cf7cf 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java index 93b67ac4c..aa4627769 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java index 2819c2e05..8091a924f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java index 118a34555..489e7e1ab 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java index f87a30a8e..710f2e2fe 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java index da466d9c4..441f363ac 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java index 16857d3fb..0c4dd886b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java index 74a313ceb..f82eb6e5b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java index b163dd8e4..6765ac83e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java index 0abaf7e63..7c516a405 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java index 2b8520ec4..03c5bd902 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java index b38dfdb2e..de3514df5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java index ac0285b7b..1d1e0ed2f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java index d51ede798..df3a9f0d2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java index 5268c4efd..ee1a6bf17 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java index d1f67410e..90ce560a3 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java index 032e4b6c7..82e81e691 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java index b6be90018..bebb73510 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java index 07105743b..a675cfd96 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MBStringLengthTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/MBStringLengthTreeItem.java index 15f790790..966659ded 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MBStringLengthTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/MBStringLengthTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java index 3937a1a94..800c4c3ac 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java index 4d3222bef..dee008a3b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java index 83e1bdc5c..0ab91cd68 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java index e32dd7973..e93fd887e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java index 11d926f54..1bd919cd8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java index 5bc7da6a2..6a2eacfd5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java index 96c7259e0..cca267430 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java index 3535b0490..92c3ed729 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java index 52acbc358..50954cf71 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java index 662d744f1..08bb26475 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java index 39ccf5977..4b5351289 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java index 0a5ec513d..5a6a2afcd 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java index b70c20e5d..7593c7c9a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java index b0ce2a9bd..c3d159f89 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java index 395249a19..2e739e39f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java index b6d8dbb3f..bba261582 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java index 5d029d7e6..e7a11e4aa 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java index e35e4214f..ed306c3df 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java b/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java index 53b166b99..c109e1d08 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java +++ b/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java b/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java index 86913dc6b..7b1fcf8fe 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java +++ b/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java b/trunk/src/com/jpexs/asdec/gui/ModeFrame.java index bdf1be4b1..2e59a3423 100644 --- a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/ModeFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/gui/View.java b/trunk/src/com/jpexs/asdec/gui/View.java index 3f4b4b395..d9780df42 100644 --- a/trunk/src/com/jpexs/asdec/gui/View.java +++ b/trunk/src/com/jpexs/asdec/gui/View.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java index 14a569908..0a54dcdfc 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -239,6 +239,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene catchedContentTypes.add("application/x-shockwave-flash"); catchedContentTypes.add("application/x-javascript"); catchedContentTypes.add("text/javascript"); + catchedContentTypes.add("application/json"); catchedContentTypes.add("text/xml"); catchedContentTypes.add("application/xml"); Server.startServer(port, Main.replacements, catchedContentTypes, this, this); @@ -310,7 +311,7 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene public void catched(String contentType, String url, InputStream data) { if (contentType.contains(";")) contentType = contentType.substring(0, contentType.indexOf(";")); if ((!sniffSWFCheckBox.isSelected()) && (contentType.equals("application/x-shockwave-flash"))) return; - if ((!sniffJSCheckBox.isSelected()) && (contentType.equals("application/x-javascript") || contentType.equals("text/javascript"))) + if ((!sniffJSCheckBox.isSelected()) && (contentType.equals("application/x-javascript") || contentType.equals("text/javascript")|| contentType.equals("application/json"))) return; if ((!sniffXMLCheckBox.isSelected()) && (contentType.equals("application/xml") || contentType.equals("text/xml"))) return; diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java b/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java index fb33f69f9..4cc229b15 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java +++ b/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/helpers/Helper.java b/trunk/src/com/jpexs/asdec/helpers/Helper.java index a24acc370..280dd0d2c 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Helper.java +++ b/trunk/src/com/jpexs/asdec/helpers/Helper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java b/trunk/src/com/jpexs/asdec/helpers/Highlighting.java index 30ba1d055..d3cfb7bbb 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java +++ b/trunk/src/com/jpexs/asdec/helpers/Highlighting.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/ASMSource.java b/trunk/src/com/jpexs/asdec/tags/ASMSource.java index 11eaedb35..5b3c0abc6 100644 --- a/trunk/src/com/jpexs/asdec/tags/ASMSource.java +++ b/trunk/src/com/jpexs/asdec/tags/ASMSource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -46,14 +46,18 @@ public interface ASMSource { /** * Returns actions associated with this object * + * @param version Version * @return List of actions */ - public List getActions(); + public List getActions(int version); /** * Sets actions associated with this object - * + * @param version Version * @param actions Action list */ - public void setActions(List actions); + public void setActions(List actions,int version); + + public byte[] getActionBytes(); + public void setActionBytes(byte actionBytes[]); } diff --git a/trunk/src/com/jpexs/asdec/tags/Container.java b/trunk/src/com/jpexs/asdec/tags/Container.java index 236d42bd1..2fc99137b 100644 --- a/trunk/src/com/jpexs/asdec/tags/Container.java +++ b/trunk/src/com/jpexs/asdec/tags/Container.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java index 4a6edf556..1e1d599eb 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java index eefde9e97..37f50b053 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -49,21 +49,14 @@ public class DefineButtonTag extends Tag implements ASMSource { /** * Actions to perform */ - public List actions; + //public List actions; + public byte[] actionBytes; /** * List of ExportAssetsTag used for converting to String */ public List exportAssetsTags = new ArrayList(); - /** - * Sets actions associated with this object - * - * @param actions Action list - */ - public void setActions(List actions) { - this.actions = actions; - } /** * Constructor @@ -77,7 +70,8 @@ public class DefineButtonTag extends Tag implements ASMSource { SWFInputStream sis = new SWFInputStream(new ByteArrayInputStream(data), version); buttonId = sis.readUI16(); characters = sis.readBUTTONRECORDList(false); - actions = sis.readActionList(); + //actions = sis.readActionList(); + actionBytes = sis.readBytes(sis.available()); } /** @@ -98,7 +92,8 @@ public class DefineButtonTag extends Tag implements ASMSource { try { sos.writeUI16(buttonId); sos.writeBUTTONRECORDList(characters, false); - sos.write(Action.actionsToBytes(actions, true, version)); + sos.write(actionBytes); + //sos.write(Action.actionsToBytes(actions, true, version)); sos.close(); } catch (IOException e) { @@ -129,11 +124,13 @@ public class DefineButtonTag extends Tag implements ASMSource { * @return ASM source */ public String getASMSource(int version) { - String ret = ""; - for (Action a : actions) { - ret += a.toString() + "\r\n"; + List actions=new ArrayList(); + try { + actions = (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + } - return ret; + return Action.actionsToString(actions, null, version); } /** @@ -145,12 +142,29 @@ public class DefineButtonTag extends Tag implements ASMSource { return true; } - /** + +/** * Returns actions associated with this object - * + * @param version Version * @return List of actions */ - public List getActions() { - return actions; + public List getActions(int version) { + try { + return (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + return new ArrayList(); + } + } + + public void setActions(List actions,int version) { + actionBytes=Action.actionsToBytes(actions, true, version); + } + + public byte[] getActionBytes() { + return actionBytes; + } + + public void setActionBytes(byte[] actionBytes) { + this.actionBytes=actionBytes; } } diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java index dafbb7302..e43a56c7f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java index efc6deb8c..b29d4466e 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -68,13 +68,14 @@ public class DoABCTag extends Tag { * @throws IOException */ public DoABCTag(byte[] data, int version) { - super(82, data); + super(82, data); try { InputStream is = new ByteArrayInputStream(data); SWFInputStream sis = new SWFInputStream(is, version); flags = sis.readUI32(); name = sis.readString(); abc = new ABC(is); + } catch (IOException e) { } diff --git a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java index 760954b68..d36ec9de5 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,17 +34,10 @@ public class DoActionTag extends Tag implements ASMSource { /** * List of actions to perform */ - public List actions = new ArrayList(); + //public List actions = new ArrayList(); + public byte[] actionBytes; - /** - * Sets actions associated with this object - * - * @param actions Action list - */ - public void setActions(List actions) { - this.actions = actions; - } /** * Constructor @@ -58,7 +51,8 @@ public class DoActionTag extends Tag implements ASMSource { try { ByteArrayInputStream bais = new ByteArrayInputStream(data); SWFInputStream sis = new SWFInputStream(bais, version); - actions = sis.readActionList(); + //actions = sis.readActionList(); + actionBytes=sis.readBytes(sis.available()); } catch (IOException e) { } @@ -72,7 +66,7 @@ public class DoActionTag extends Tag implements ASMSource { */ @Override public byte[] getData(int version) { - return Action.actionsToBytes(actions, true, version); + return actionBytes;//Action.actionsToBytes(actions, true, version); } /** @@ -82,6 +76,12 @@ public class DoActionTag extends Tag implements ASMSource { * @return ASM source */ public String getASMSource(int version) { + List actions=new ArrayList(); + try { + actions = (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + + } return Action.actionsToString(actions, null, version); } @@ -104,12 +104,24 @@ public class DoActionTag extends Tag implements ASMSource { return "DoActionTag"; } - /** - * Returns actions associated with this object - * - * @return List of actions - */ - public List getActions() { - return actions; + + public List getActions(int version) { + try { + return (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + return new ArrayList(); + } + } + + public void setActions(List actions, int version) { + actionBytes=Action.actionsToBytes(actions, true, version); + } + + public byte[] getActionBytes() { + return actionBytes; + } + + public void setActionBytes(byte[] actionBytes) { + this.actionBytes=actionBytes; } } diff --git a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java index c21b85d20..50f047106 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -36,21 +36,13 @@ public class DoInitActionTag extends Tag implements ASMSource { /** * List of actions to perform */ - public List actions = new ArrayList(); + //public List actions = new ArrayList(); + public byte[] actionBytes; /** * List of ExportAssetsTag used for converting to String */ public List exportAssetsTags = new ArrayList(); - /** - * Sets actions associated with this object - * - * @param actions Action list - */ - public void setActions(List actions) { - this.actions = actions; - } - /** * Constructor @@ -65,7 +57,8 @@ public class DoInitActionTag extends Tag implements ASMSource { ByteArrayInputStream bais = new ByteArrayInputStream(data); SWFInputStream sis = new SWFInputStream(bais, version); spriteId = sis.readUI16(); - actions = sis.readActionList(); + //actions = sis.readActionList(); + actionBytes=sis.readBytes(sis.available()); } catch (IOException e) { } @@ -83,7 +76,8 @@ public class DoInitActionTag extends Tag implements ASMSource { SWFOutputStream sos = new SWFOutputStream(baos, version); try { sos.writeUI16(spriteId); - sos.write(Action.actionsToBytes(actions, true, version)); + sos.write(actionBytes); + //sos.write(Action.actionsToBytes(actions, true, version)); sos.close(); } catch (IOException e) { @@ -91,15 +85,7 @@ public class DoInitActionTag extends Tag implements ASMSource { return baos.toByteArray(); } - /** - * Converts actions to ASM source - * - * @param version SWF version - * @return ASM source - */ - public String getASMSource(int version) { - return Action.actionsToString(actions, null, version); - } + /** * Returns string representation of the object @@ -125,13 +111,39 @@ public class DoInitActionTag extends Tag implements ASMSource { public boolean containsSource() { return true; } - - /** - * Returns actions associated with this object +/** + * Converts actions to ASM source * - * @return List of actions + * @param version SWF version + * @return ASM source */ - public List getActions() { - return actions; + public String getASMSource(int version) { + List actions=new ArrayList(); + try { + actions = (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + + } + return Action.actionsToString(actions, null, version); + } + + public List getActions(int version) { + try { + return (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + return new ArrayList(); + } + } + + public void setActions(List actions, int version) { + actionBytes=Action.actionsToBytes(actions, true, version); + } + + public byte[] getActionBytes() { + return actionBytes; + } + + public void setActionBytes(byte[] actionBytes) { + this.actionBytes=actionBytes; } } diff --git a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java index 95665885e..d4eb44879 100644 --- a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java index 72d249de9..4ba7c3f9e 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java index 02db23e47..e42f3292f 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java b/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java index 38442993b..5cf22eb44 100644 --- a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/tags/Tag.java b/trunk/src/com/jpexs/asdec/tags/Tag.java index 3004c8db3..cdbbf950f 100644 --- a/trunk/src/com/jpexs/asdec/tags/Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/ARGB.java b/trunk/src/com/jpexs/asdec/types/ARGB.java index 1489b8e91..e718b9b54 100644 --- a/trunk/src/com/jpexs/asdec/types/ARGB.java +++ b/trunk/src/com/jpexs/asdec/types/ARGB.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java index ce0414f3e..b3f647db3 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java +++ b/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,12 @@ package com.jpexs.asdec.types; +import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.tags.ASMSource; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; @@ -77,16 +81,21 @@ public class BUTTONCONDACTION implements ASMSource { /** * Actions to perform */ - public List actions; + //public List actions; + + /** + * Actions to perform in byte array + */ + public byte[] actionBytes; /** * Sets actions associated with this object * * @param actions Action list */ - public void setActions(List actions) { + /*public void setActions(List actions) { this.actions = actions; - } + }*/ /** * Returns a string representation of the object @@ -105,6 +114,12 @@ public class BUTTONCONDACTION implements ASMSource { * @return ASM source */ public String getASMSource(int version) { + List actions=new ArrayList(); + try { + actions = (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + + } return Action.actionsToString(actions, null, version); } @@ -119,10 +134,26 @@ public class BUTTONCONDACTION implements ASMSource { /** * Returns actions associated with this object - * + * @param version Version * @return List of actions */ - public List getActions() { - return actions; + public List getActions(int version) { + try { + return (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + return new ArrayList(); + } + } + + public void setActions(List actions,int version) { + actionBytes=Action.actionsToBytes(actions, true, version); + } + + public byte[] getActionBytes() { + return actionBytes; + } + + public void setActionBytes(byte[] actionBytes) { + this.actionBytes=actionBytes; } } diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java b/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java index 798d4e073..161a77a45 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java +++ b/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java index 672c2c50d..2a54015ac 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java +++ b/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,8 +18,12 @@ package com.jpexs.asdec.types; +import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.tags.ASMSource; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; @@ -40,7 +44,8 @@ public class CLIPACTIONRECORD implements ASMSource { /** * Actions to perform */ - public List actions; + //public List actions; + public byte[] actionBytes; /** * Returns a string representation of the object @@ -52,14 +57,6 @@ public class CLIPACTIONRECORD implements ASMSource { return "CLIPACTIONRECORD"; } - /** - * Sets actions associated with this object - * - * @param actions Action list - */ - public void setActions(List actions) { - this.actions = actions; - } /** * Returns header with events converted to string @@ -82,6 +79,12 @@ public class CLIPACTIONRECORD implements ASMSource { * @return ASM source */ public String getASMSource(int version) { + List actions=new ArrayList(); + try { + actions = (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + + } return Action.actionsToString(actions, null, version); } @@ -94,12 +97,24 @@ public class CLIPACTIONRECORD implements ASMSource { return true; } - /** - * Returns actions associated with this object - * - * @return List of actions - */ - public List getActions() { - return actions; + + public List getActions(int version) { + try { + return (new SWFInputStream(new ByteArrayInputStream(actionBytes), version)).readActionList(); + } catch (IOException ex) { + return new ArrayList(); + } + } + + public void setActions(List actions, int version) { + actionBytes=Action.actionsToBytes(actions, true, version); + } + + public byte[] getActionBytes() { + return actionBytes; + } + + public void setActionBytes(byte[] actionBytes) { + this.actionBytes=actionBytes; } } diff --git a/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java b/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java index e8dbf3d9f..431831e4b 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java +++ b/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java b/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java index 23196d0c9..07e911ac5 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java +++ b/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java b/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java index f54cf934b..305f56970 100644 --- a/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java +++ b/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/MATRIX.java b/trunk/src/com/jpexs/asdec/types/MATRIX.java index db92c97b6..3ecf9d025 100644 --- a/trunk/src/com/jpexs/asdec/types/MATRIX.java +++ b/trunk/src/com/jpexs/asdec/types/MATRIX.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/RECT.java b/trunk/src/com/jpexs/asdec/types/RECT.java index 6adb6da32..1945c3874 100644 --- a/trunk/src/com/jpexs/asdec/types/RECT.java +++ b/trunk/src/com/jpexs/asdec/types/RECT.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/RGBA.java b/trunk/src/com/jpexs/asdec/types/RGBA.java index 73349060a..49289b8a3 100644 --- a/trunk/src/com/jpexs/asdec/types/RGBA.java +++ b/trunk/src/com/jpexs/asdec/types/RGBA.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java index 8be74a267..47bf28ea4 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java index 516ec0a87..1befd3590 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java index 752461874..51fe69804 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java index bd9936da9..a15f0ef4f 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java index 6551eb71b..fb64ade3a 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/FILTER.java b/trunk/src/com/jpexs/asdec/types/filters/FILTER.java index 2ae5560a3..7f26389b7 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/FILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/FILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java index 7d6552780..bd7e73718 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java index d2a1e8c24..3c52ef9dd 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java b/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java index 1b4224d64..73d3115cb 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java +++ b/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 JPEXS + * Copyright (C) 2010-2011 JPEXS * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License