add missing overrides + some other small changes

This commit is contained in:
2016-04-28 22:09:44 +02:00
parent de414487ae
commit 577bdd4844
20 changed files with 32 additions and 39 deletions
@@ -41,6 +41,7 @@ public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, A
return declaration;
}
@Override
public void setDeclaration(DeclarationAVM2Item declaration) {
this.declaration = declaration;
}
@@ -45,6 +45,7 @@ public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assig
return declaration;
}
@Override
public void setDeclaration(DeclarationAVM2Item declaration) {
this.declaration = declaration;
}
@@ -49,6 +49,7 @@ public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, As
return declaration;
}
@Override
public void setDeclaration(DeclarationAVM2Item declaration) {
this.declaration = declaration;
}
@@ -43,6 +43,7 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign
return declaration;
}
@Override
public void setDeclaration(DeclarationAVM2Item declaration) {
this.declaration = declaration;
}
@@ -19,13 +19,11 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.model.BinaryOpItem;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
import java.util.List;
@@ -22,7 +22,6 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
import com.jpexs.decompiler.flash.ecma.EcmaScript;
import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.DottedChain;
import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
@@ -21,11 +21,9 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
import com.jpexs.decompiler.flash.abc.avm2.model.NewFunctionAVM2Item;
import com.jpexs.decompiler.flash.abc.types.AssignedValue;
import com.jpexs.decompiler.flash.abc.types.ConvertData;
import com.jpexs.decompiler.flash.abc.types.MethodInfo;
import com.jpexs.decompiler.flash.abc.types.Multiname;
import com.jpexs.decompiler.flash.abc.types.Namespace;
import com.jpexs.decompiler.flash.abc.types.ValueKind;
import static com.jpexs.decompiler.flash.abc.types.traits.Trait.TRAIT_GETTER;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
@@ -211,8 +209,8 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
if (Configuration.handleSkinPartsAutomatically.get()) {
/*
Hide: private static var _skinParts
(part of [SkinPart] compilations)
Hide: private static var _skinParts
(part of [SkinPart] compilations)
*/
if (isStatic && "_skinParts".equals(getName(abc).getName(abc.constants, new ArrayList<>(), true))) {
if (kindType == Trait.TRAIT_SLOT) {
@@ -226,5 +224,4 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
}
return true;
}
}