diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java index 1f4d688c7..99bd1192c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java @@ -46,19 +46,19 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.abc.types.traits.TraitType; import com.jpexs.decompiler.flash.abc.types.traits.Traits; -import com.jpexs.decompiler.flash.abc.usages.ClassNameMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.ConstVarNameMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.ConstVarTypeMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.DefinitionUsage; -import com.jpexs.decompiler.flash.abc.usages.MethodBodyMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.MethodNameMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.MethodParamsMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.MethodReturnTypeMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.SuperClassMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.SuperInterfaceMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.TypeNameMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.ClassNameMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.ConstVarNameMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.ConstVarTypeMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.DefinitionUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MethodBodyMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MethodNameMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MethodParamsMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MethodReturnTypeMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.SuperClassMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.SuperInterfaceMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.TraitMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.TypeNameMultinameUsage; import com.jpexs.decompiler.flash.dumpview.DumpInfo; import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecial; import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecialType; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AbcMultiNameCollisionFixer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AbcMultiNameCollisionFixer.java index b8a9dffde..b1f5a16b3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AbcMultiNameCollisionFixer.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AbcMultiNameCollisionFixer.java @@ -20,7 +20,7 @@ import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.NamespaceSet; -import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MultinameUsage; import com.jpexs.decompiler.flash.tags.ABCContainerTag; import com.jpexs.decompiler.flash.tags.Tag; import java.util.HashSet; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ClassNameMultinameUsage.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ClassNameMultinameUsage.java index f79f52c27..6bfec3282 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ClassNameMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.InstanceInfo; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarMultinameUsage.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarMultinameUsage.java index e004847ee..206f15f4a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.ConvertData; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarNameMultinameUsage.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarNameMultinameUsage.java index 9ba149954..d49909a6a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarNameMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarTypeMultinameUsage.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarTypeMultinameUsage.java index 94686d2a7..7c76fdcde 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/ConstVarTypeMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/DefinitionUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/DefinitionUsage.java similarity index 92% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/DefinitionUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/DefinitionUsage.java index 030d90bf3..85945f830 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/DefinitionUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/DefinitionUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; /** * diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsageInterface.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/InsideClassMultinameUsageInterface.java similarity index 94% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsageInterface.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/InsideClassMultinameUsageInterface.java index dace2ca5b..f9a99d2f0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsageInterface.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/InsideClassMultinameUsageInterface.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodBodyMultinameUsage.java similarity index 96% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodBodyMultinameUsage.java index 89a6f6dd7..5f3303160 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodBodyMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodMultinameUsage.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodMultinameUsage.java index e556b9f70..6ce489e84 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.ConvertData; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodNameMultinameUsage.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodNameMultinameUsage.java index 85970d6f2..d7e0f9e80 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodNameMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodParamsMultinameUsage.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodParamsMultinameUsage.java index 14bf6ce32..f7208da0a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodParamsMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodReturnTypeMultinameUsage.java similarity index 95% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodReturnTypeMultinameUsage.java index 31b0dac53..e7d71ada9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MethodReturnTypeMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.traits.Traits; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MultinameUsage.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MultinameUsage.java index 559334a1b..28cab8e3f 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/MultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.Multiname; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperClassMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperClassMultinameUsage.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperClassMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperClassMultinameUsage.java index 6450bf98c..90429276c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperClassMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperClassMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.InstanceInfo; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperInterfaceMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperInterfaceMultinameUsage.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperInterfaceMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperInterfaceMultinameUsage.java index 668e74c81..b92bb7005 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/SuperInterfaceMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/SuperInterfaceMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.InstanceInfo; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TraitMultinameUsage.java similarity index 98% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TraitMultinameUsage.java index d1f9b29bf..6bcefb32c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TraitMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.InstanceInfo; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TypeNameMultinameUsage.java similarity index 97% rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TypeNameMultinameUsage.java index 7b5587f41..a6392acf8 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/multinames/TypeNameMultinameUsage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library. */ -package com.jpexs.decompiler.flash.abc.usages; +package com.jpexs.decompiler.flash.abc.usages.multinames; import com.jpexs.decompiler.flash.abc.ABC; import java.util.ArrayList; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index 3acbcd4cd..2c2241237 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -38,8 +38,8 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitClass; import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.abc.types.traits.Traits; -import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.TraitMultinameUsage; import com.jpexs.decompiler.flash.action.parser.ActionParseException; import com.jpexs.decompiler.flash.action.parser.script.ActionScriptLexer; import com.jpexs.decompiler.flash.action.parser.script.ParsedSymbol; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java index c5ecb3add..5fe933819 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.traits.TraitType; -import com.jpexs.decompiler.flash.abc.usages.InsideClassMultinameUsageInterface; -import com.jpexs.decompiler.flash.abc.usages.MethodMultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; -import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.InsideClassMultinameUsageInterface; +import com.jpexs.decompiler.flash.abc.usages.multinames.MethodMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.TraitMultinameUsage; import com.jpexs.decompiler.flash.gui.AppDialog; import com.jpexs.decompiler.flash.gui.FasterScrollPane; import com.jpexs.decompiler.flash.gui.View; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/UsageListModel.java b/src/com/jpexs/decompiler/flash/gui/abc/UsageListModel.java index 06b5837cc..a40774c61 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/UsageListModel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/UsageListModel.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.gui.abc; -import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.multinames.MultinameUsage; import javax.swing.DefaultListModel; /**