version apha 9

AS3: Included new undocumented instructions, new Multiname kind - Typename
AS3: Export PCode
AS3: Implemented code for executing some instructions
Many bugfixes

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

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

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);

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

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

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

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

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

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

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());  }
       
 }

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();
     }

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();
     }
 

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

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

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

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

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();
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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<String> 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;

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

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

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

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

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

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

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

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

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

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

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

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

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<String> constantPool = new ArrayList<String>();
 
-    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());

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

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<Action>();
         code = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList();
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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