organize imports

This commit is contained in:
Honfika
2013-09-09 21:12:58 +02:00
parent fc7b82b866
commit 624194f453
79 changed files with 140 additions and 157 deletions

View File

@@ -18,21 +18,15 @@ package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.ActionListReader;
import com.jpexs.decompiler.flash.action.StoreTypeAction;
import com.jpexs.decompiler.flash.action.model.ConstantPool;
import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
import com.jpexs.decompiler.flash.action.special.ActionEnd;
import com.jpexs.decompiler.flash.action.special.ActionNop;
import com.jpexs.decompiler.flash.action.special.ActionStore;
import com.jpexs.decompiler.flash.action.swf3.*;
import com.jpexs.decompiler.flash.action.swf4.*;
import com.jpexs.decompiler.flash.action.swf5.*;
import com.jpexs.decompiler.flash.action.swf6.*;
import com.jpexs.decompiler.flash.action.swf7.*;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.Null;
import com.jpexs.decompiler.flash.tags.*;
import com.jpexs.decompiler.flash.tags.base.ASMSource;
import com.jpexs.decompiler.flash.types.*;
import com.jpexs.decompiler.flash.types.filters.BEVELFILTER;
import com.jpexs.decompiler.flash.types.filters.BLURFILTER;
@@ -48,11 +42,6 @@ import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD;
import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord;
import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord;
import com.jpexs.decompiler.graph.Graph;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.NotCompileTimeItem;
import com.jpexs.helpers.Helper;
import com.jpexs.helpers.ProgressListener;
import com.jpexs.helpers.ReReadableInputStream;
@@ -62,13 +51,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Queue;
import java.util.Scanner;
import java.util.Stack;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;

View File

@@ -17,7 +17,6 @@
package com.jpexs.decompiler.flash;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag;
import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag;

View File

@@ -18,7 +18,6 @@ package com.jpexs.decompiler.flash.abc.avm2.model;
import com.jpexs.decompiler.flash.abc.avm2.ConstantPool;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.helpers.Helper;

View File

@@ -61,7 +61,6 @@ import com.jpexs.decompiler.graph.model.ScriptEndItem;
import com.jpexs.helpers.Helper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
@@ -633,7 +632,7 @@ public class Action implements GraphSourceItem {
* @param staticOperation the value of staticOperation
* @param path the value of path
*/
public void translate(Stack<com.jpexs.decompiler.graph.GraphTargetItem> stack, List<com.jpexs.decompiler.graph.GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
}
/**

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionAsciiToChar;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class AsciiToCharActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionCall;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class CallActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionCallFunction;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -52,8 +53,8 @@ public class CallFunctionActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(functionName.getNeededSources());
for (GraphTargetItem ti : arguments) {
ret.addAll(ti.getNeededSources());

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionCallMethod;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -76,8 +77,8 @@ public class CallMethodActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(methodName.getNeededSources());
ret.addAll(scriptObject.getNeededSources());
for (GraphTargetItem ti : arguments) {

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf7.ActionCastOp;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.helpers.Helper;
@@ -49,8 +50,8 @@ public class CastOpActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(constructor.getNeededSources());
ret.addAll(object.getNeededSources());
return ret;

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionCharToAscii;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class CharToAsciiActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionCloneSprite;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -51,8 +52,8 @@ public class CloneSpriteActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(source.getNeededSources());
ret.addAll(target.getNeededSources());
ret.addAll(depth.getNeededSources());

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionDecrement;
import com.jpexs.decompiler.flash.ecma.*;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -56,8 +57,8 @@ public class DecrementActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
return ret;
}

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionDefineLocal;
import com.jpexs.decompiler.flash.action.swf5.ActionDefineLocal2;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -75,8 +76,8 @@ public class DefineLocalActionItem extends ActionItem implements SetTypeActionIt
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
ret.addAll(name.getNeededSources());
return ret;

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionDelete;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -51,8 +52,8 @@ public class DeleteActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
ret.addAll(propertyName.getNeededSources());
return ret;

View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.helpers.Helper;
import java.util.ArrayList;
@@ -44,8 +45,8 @@ public class EnumerateActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
return ret;
}

View File

@@ -42,7 +42,7 @@ public class ExtendsActionItem extends ActionItem {
@Override
public List<GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(subclass.getNeededSources());
ret.addAll(superclass.getNeededSources());
return ret;

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.flashlite.ActionFSCommand2;
import com.jpexs.decompiler.flash.action.swf4.ActionPush;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -55,8 +56,8 @@ public class FSCommand2ActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(command.getNeededSources());
for (GraphTargetItem ti : arguments) {
ret.addAll(ti.getNeededSources());

View File

@@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister;
import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2;
import com.jpexs.decompiler.graph.Graph;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.helpers.Helper;
@@ -100,8 +101,8 @@ public class FunctionActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
for (GraphTargetItem ti : actions) {
ret.addAll(ti.getNeededSources());
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionGetMember;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -51,8 +52,8 @@ public class GetMemberActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
ret.addAll(memberName.getNeededSources());
return ret;

View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.swf4.ActionGetProperty;
import com.jpexs.decompiler.flash.action.swf4.ActionPush;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -52,8 +53,8 @@ public class GetPropertyActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(target.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -58,8 +59,8 @@ public class GetURL2ActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(urlString.getNeededSources());
ret.addAll(targetString.getNeededSources());
return ret;

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -50,8 +51,8 @@ public class GetVariableActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(name.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionGotoFrame2;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -55,8 +56,8 @@ public class GotoFrame2ActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(frame.getNeededSources());
return ret;
}

View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.helpers.Helper;
import java.util.List;
@@ -45,8 +46,8 @@ public class ImplementsOpActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(subclass.getNeededSources());
for (GraphTargetItem ti : superclasses) {
ret.addAll(ti.getNeededSources());

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionIncrement;
import com.jpexs.decompiler.flash.ecma.*;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -56,8 +57,8 @@ public class IncrementActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
return ret;
}

View File

@@ -53,7 +53,7 @@ public class InitArrayActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
for (GraphTargetItem value : values) {
ret.addAll(value.getNeededSources());

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionPush;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.model.TernarOpItem;
@@ -60,8 +61,8 @@ public class InitObjectActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
for (GraphTargetItem name : names) {
ret.addAll(name.getNeededSources());
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionMBAsciiToChar;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class MBAsciiToCharActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionMBCharToAscii;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class MBCharToAsciiActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionMBStringExtract;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -51,8 +52,8 @@ public class MBStringExtractActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
ret.addAll(index.getNeededSources());
ret.addAll(count.getNeededSources());

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionMBStringLength;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -40,8 +41,8 @@ public class MBStringLengthActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionNewMethod;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -77,8 +78,8 @@ public class NewMethodActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(methodName.getNeededSources());
ret.addAll(scriptObject.getNeededSources());
for (GraphTargetItem ti : arguments) {

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionNewObject;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -55,8 +56,8 @@ public class NewObjectActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(objectName.getNeededSources());
for (GraphTargetItem ti : arguments) {
ret.addAll(ti.getNeededSources());

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionRandomNumber;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class RandomNumberActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionRemoveSprite;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class RemoveSpriteActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.action.swf5.ActionReturn;
import com.jpexs.decompiler.flash.ecma.Null;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.model.ExitItem;
@@ -47,8 +48,8 @@ public class ReturnActionItem extends ActionItem implements ExitItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.action.swf5.ActionSetMember;
import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister;
import com.jpexs.decompiler.graph.GraphPart;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -90,8 +91,8 @@ public class SetMemberActionItem extends ActionItem implements SetTypeActionItem
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(object.getNeededSources());
ret.addAll(objectName.getNeededSources());
ret.addAll(value.getNeededSources());

View File

@@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister;
import com.jpexs.decompiler.graph.GraphPart;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -81,8 +82,8 @@ public class SetPropertyActionItem extends ActionItem implements SetTypeActionIt
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(target.getNeededSources());
ret.addAll(value.getNeededSources());
return ret;

View File

@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -36,8 +37,8 @@ public class SetTarget2ActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(target.getNeededSources());
return ret;
}

View File

@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister;
import com.jpexs.decompiler.graph.GraphPart;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -79,8 +80,8 @@ public class SetVariableActionItem extends ActionItem implements SetTypeActionIt
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(name.getNeededSources());
ret.addAll(value.getNeededSources());
return ret;

View File

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionStartDrag;
import com.jpexs.decompiler.flash.ecma.*;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -56,8 +57,8 @@ public class StartDragActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(target.getNeededSources());
ret.addAll(constrain.getNeededSources());
ret.addAll(x1.getNeededSources());

View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister;
import com.jpexs.decompiler.graph.GraphPart;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -75,8 +76,8 @@ public class StoreRegisterActionItem extends ActionItem implements SetTypeAction
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionStringExtract;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -41,8 +42,8 @@ public class StringExtractActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
ret.addAll(index.getNeededSources());
ret.addAll(count.getNeededSources());

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionTargetPath;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class TargetPathActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -38,7 +38,7 @@ public class ThrowActionItem extends ActionItem {
@Override
public List<GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionToInteger;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class ToIntegerActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionToNumber;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.helpers.Helper;
@@ -36,8 +37,8 @@ public class ToNumberActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf5.ActionToString;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.helpers.Helper;
@@ -36,8 +37,8 @@ public class ToStringActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.action.swf4.ActionTrace;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.List;
@@ -35,8 +36,8 @@ public class TraceActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf5.ActionTypeOf;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.EcmaType;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.helpers.Helper;
@@ -38,8 +39,8 @@ public class TypeOfActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}

View File

@@ -26,7 +26,6 @@ import com.jpexs.decompiler.flash.action.model.GetVariableActionItem;
import com.jpexs.decompiler.flash.action.model.SetMemberActionItem;
import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator;
import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
import com.jpexs.decompiler.graph.Block;
import com.jpexs.decompiler.graph.Graph;

View File

@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.action.swf3.ActionSetTarget;
import com.jpexs.decompiler.flash.action.swf4.ActionSetTarget2;
import com.jpexs.decompiler.graph.Graph;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList;
@@ -51,8 +52,8 @@ public class TellTargetActionItem extends ActionItem {
}
@Override
public List<com.jpexs.decompiler.graph.GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(target.getNeededSources());
return ret;
}

View File

@@ -31,10 +31,8 @@ import com.jpexs.decompiler.flash.action.swf7.*;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.helpers.Helper;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Stack;
import java.util.logging.Level;

View File

@@ -40,7 +40,7 @@ public class ActionEnd extends Action {
}
@Override
public void translate(Stack<com.jpexs.decompiler.graph.GraphTargetItem> stack, List<com.jpexs.decompiler.graph.GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
//output.add(new SimpleActionTreeItem(this, "end()"));
}
}

View File

@@ -34,7 +34,7 @@ public class ActionNop extends Action {
}
@Override
public void translate(Stack<com.jpexs.decompiler.graph.GraphTargetItem> stack, List<com.jpexs.decompiler.graph.GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
//output.add(new SimpleActionTreeItem(this, "nop();"));
}
}

View File

@@ -16,8 +16,6 @@
*/
package com.jpexs.decompiler.flash.action.swf3;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;

View File

@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
import com.jpexs.decompiler.flash.action.model.EvalActionItem;
import com.jpexs.decompiler.flash.action.model.GetVariableActionItem;
import com.jpexs.decompiler.flash.action.model.GetVersionActionItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.graph.GraphTargetItem;
import java.util.HashMap;
import java.util.List;

View File

@@ -29,7 +29,6 @@ import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem;
import com.jpexs.decompiler.flash.action.model.TemporaryRegister;
import com.jpexs.decompiler.flash.action.model.operations.PreDecrementActionItem;
import com.jpexs.decompiler.flash.action.model.operations.PreIncrementActionItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.graph.GraphTargetItem;
import java.util.HashMap;
import java.util.List;

View File

@@ -16,8 +16,6 @@
*/
package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
@@ -31,7 +29,6 @@ import com.jpexs.decompiler.flash.action.special.ActionEnd;
import com.jpexs.decompiler.flash.action.special.ActionStore;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;

View File

@@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem;
import com.jpexs.decompiler.flash.action.model.ConstantPool;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.graph.GraphTargetItem;
import java.util.ArrayList;
import java.util.HashMap;

View File

@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.model.FunctionActionItem;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
import com.jpexs.decompiler.flash.action.parser.pcode.Label;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.graph.GraphTargetItem;

View File

@@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.model.ConstantPool;
import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.graph.GraphTargetItem;
import java.util.HashMap;
import java.util.List;

View File

@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.model.clauses.WithActionItem;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
import com.jpexs.decompiler.flash.action.parser.pcode.Label;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.graph.GraphTargetItem;

View File

@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.model.FunctionActionItem;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
import com.jpexs.decompiler.flash.action.parser.pcode.Label;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;
import com.jpexs.decompiler.graph.GraphTargetItem;

View File

@@ -25,7 +25,6 @@ import com.jpexs.decompiler.flash.action.model.clauses.TryActionItem;
import com.jpexs.decompiler.flash.action.parser.ParseException;
import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol;
import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
import com.jpexs.decompiler.flash.action.parser.pcode.Label;
import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemContainer;

View File

@@ -67,7 +67,6 @@ import com.jpexs.decompiler.flash.tags.DefineVideoStreamTag;
import com.jpexs.decompiler.flash.tags.DoActionTag;
import com.jpexs.decompiler.flash.tags.EndTag;
import com.jpexs.decompiler.flash.tags.ExportAssetsTag;
import com.jpexs.decompiler.flash.tags.FileAttributesTag;
import com.jpexs.decompiler.flash.tags.JPEGTablesTag;
import com.jpexs.decompiler.flash.tags.PlaceObject2Tag;
import com.jpexs.decompiler.flash.tags.SetBackgroundColorTag;
@@ -147,10 +146,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

View File

@@ -23,12 +23,8 @@ import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ComponentUI;
import org.pushingpixels.lafwidget.animation.AnimationConfigurationManager;
import org.pushingpixels.substance.internal.ui.SubstanceProgressBarUI;
import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
import org.pushingpixels.trident.Timeline;
import org.pushingpixels.trident.TimelinePropertyBuilder;
import org.pushingpixels.trident.ease.Spline;
/**
*

View File

@@ -21,18 +21,12 @@ import static com.jpexs.decompiler.flash.gui.AppStrings.translate;
import com.jpexs.decompiler.flash.gui.player.FlashDisplay;
import com.jpexs.decompiler.flash.gui.player.PlayerControls;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.JButton;
import javax.swing.JColorChooser;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;

View File

@@ -99,7 +99,7 @@ public class ActionPanel extends JPanel implements ActionListener {
private boolean ignoreCarret = false;
private boolean editMode = false;
private boolean editDecompiledMode = false;
private List<com.jpexs.decompiler.flash.action.Action> lastCode;
private List<Action> lastCode;
private ASMSource src;
public JPanel topButtonsPan;
private String srcWithHex;

View File

@@ -2,7 +2,6 @@ package com.jpexs.decompiler.flash.gui.player;
import com.jpexs.decompiler.flash.gui.FlashUnsupportedException;
import com.jpexs.decompiler.flash.gui.Main;
import com.jpexs.decompiler.flash.gui.View;
import com.sun.jna.Native;
import com.sun.jna.Platform;
import com.sun.jna.WString;

View File

@@ -28,8 +28,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.ImageIO;
public class DefineBitsJPEG3Tag extends ImageTag implements AloneTag {

View File

@@ -28,8 +28,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.imageio.ImageIO;
/**

View File

@@ -16,10 +16,8 @@
*/
package com.jpexs.decompiler.flash.tags;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.ActionListReader;

View File

@@ -16,7 +16,6 @@
*/
package com.jpexs.decompiler.flash.tags;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;

View File

@@ -16,7 +16,6 @@
*/
package com.jpexs.decompiler.flash.tags.base;
import com.jpexs.decompiler.flash.tags.Tag;
import java.util.List;
/**

View File

@@ -16,7 +16,6 @@
*/
package com.jpexs.decompiler.flash.types;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.action.Action;

View File

@@ -16,7 +16,6 @@
*/
package com.jpexs.decompiler.flash.types;
import com.jpexs.decompiler.flash.Configuration;
import com.jpexs.decompiler.flash.DisassemblyListener;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.action.Action;

View File

@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.RunnableIOEx;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import com.jpexs.decompiler.flash.tags.CSMTextSettingsTag;
import com.jpexs.decompiler.flash.tags.DefineButton2Tag;
import com.jpexs.decompiler.flash.tags.DefineButtonCxformTag;

View File

@@ -55,7 +55,7 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp {
@Override
public List<GraphSourceItemPos> getNeededSources() {
List<com.jpexs.decompiler.graph.GraphSourceItemPos> ret = super.getNeededSources();
List<GraphSourceItemPos> ret = super.getNeededSources();
ret.addAll(value.getNeededSources());
return ret;
}