Merge branch 'v6'

Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/SymbolType.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/InstanceInfo.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionGraph.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/ActionListReader.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/SymbolType.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphSourceItem.java
	libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphTargetItem.java
	libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
	libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
	src/com/jpexs/decompiler/flash/gui/Main.java
	src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
This commit is contained in:
Jindra Petřík
2015-07-03 19:06:09 +02:00
150 changed files with 8061 additions and 6047 deletions

View File

@@ -1,16 +1,13 @@
/*
* Copyright (C) 2010-2015 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
@@ -24,7 +21,7 @@ import java.util.List;
*
* @author JPEXS
*/
public interface GraphSourceItem extends Serializable {
public interface GraphSourceItem extends Serializable, Cloneable {
public void translate(BaseLocalData localData, TranslateStack stack, List<GraphTargetItem> output, int staticOperation, String path) throws InterruptedException;