From 19f3a99496cb8b41a38bdbbcda5694de5feee4eb Mon Sep 17 00:00:00 2001
From: Honfika <honfika@gmail.com>
Date: Sun, 13 Oct 2013 01:34:29 +0200
Subject: [PATCH] "this." prefix fixed, big fixed in remove jump

---
 .../decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java    | 2 +-
 .../flash/abc/avm2/model/ConstructSuperAVM2Item.java          | 2 +-
 .../decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java     | 2 +-
 .../decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java     | 2 +-
 .../com/jpexs/decompiler/flash/action/ActionListReader.java   | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java
index 4cf3aafc2..62bc74b17 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java
@@ -41,7 +41,7 @@ public class CallSuperAVM2Item extends AVM2Item {
 
     @Override
     public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        if (!receiver.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
+        if (!receiver.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
             receiver.toString(writer, constants, localRegNames, fullyQualifiedNames);
             hilight(".", writer);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java
index 27f46ba45..ad4b4628a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java
@@ -37,7 +37,7 @@ public class ConstructSuperAVM2Item extends AVM2Item {
 
     @Override
     public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
+        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
             object.toString(writer, constants, localRegNames, fullyQualifiedNames);
             hilight(".", writer);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java
index 49f31d95e..1e33a839b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java
@@ -37,7 +37,7 @@ public class GetSuperAVM2Item extends AVM2Item {
 
     @Override
     public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
+        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
             object.toString(writer, constants, localRegNames, fullyQualifiedNames);
             hilight(".", writer);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java
index 0fa64635f..75959205a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java
@@ -45,7 +45,7 @@ public class SetSuperAVM2Item extends AVM2Item {
 
     @Override
     public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
+        if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
             object.toString(writer, constants, localRegNames, fullyQualifiedNames);
             hilight(".", writer);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java
index fb3c3988e..bef9f846d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionListReader.java
@@ -466,9 +466,7 @@ public class ActionListReader {
         
         List<Action> actionMap = new ArrayList<>(lastIdx);
         for (int i = 0; i <= lastIdx; i++) {
-            Action a = new ActionNop();
-            a.setAddress(i, version);
-            actionMap.add(a);
+            actionMap.add(null);
         }
         for (Action a : actions) {
             actionMap.set((int) a.getAddress(), a);