This commit is contained in:
2016-12-01 15:55:08 +01:00
parent 71eca0ba25
commit 4d5d1cde53
@@ -102,7 +102,6 @@ public class UsageFrame extends AppDialog implements MouseListener {
final InsideClassMultinameUsageInterface icu = (InsideClassMultinameUsageInterface) usage; final InsideClassMultinameUsageInterface icu = (InsideClassMultinameUsageInterface) usage;
Runnable settrait = new Runnable() { Runnable settrait = new Runnable() {
@Override @Override
public void run() { public void run() {
abcPanel.decompiledTextArea.removeScriptListener(this); abcPanel.decompiledTextArea.removeScriptListener(this);
@@ -110,18 +109,18 @@ public class UsageFrame extends AppDialog implements MouseListener {
if (usage instanceof TraitMultinameUsage) { if (usage instanceof TraitMultinameUsage) {
TraitMultinameUsage tmu = (TraitMultinameUsage) usage; TraitMultinameUsage tmu = (TraitMultinameUsage) usage;
int traitIndex; int traitIndex;
if (tmu.parentTraitIndex > -1) { if (tmu.getParentTraitIndex() > -1) {
traitIndex = tmu.parentTraitIndex; traitIndex = tmu.getParentTraitIndex();
} else { } else {
traitIndex = tmu.traitIndex; traitIndex = tmu.getTraitIndex();
} }
if (tmu.traitsType == TraitMultinameUsage.TRAITS_TYPE_INSTANCE) { if (tmu.getTraitsType() == TraitMultinameUsage.TRAITS_TYPE_INSTANCE) {
traitIndex += abcPanel.abc.class_info.get(tmu.classIndex).static_traits.traits.size(); traitIndex += abcPanel.abc.class_info.get(tmu.getClassIndex()).static_traits.traits.size();
} }
if (tmu instanceof MethodMultinameUsage) { if (tmu instanceof MethodMultinameUsage) {
MethodMultinameUsage mmu = (MethodMultinameUsage) usage; MethodMultinameUsage mmu = (MethodMultinameUsage) usage;
if (mmu.isInitializer == true) { if (mmu.isInitializer() == true) {
traitIndex = abcPanel.abc.class_info.get(mmu.classIndex).static_traits.traits.size() + abcPanel.abc.instance_info.get(mmu.classIndex).instance_traits.traits.size() + (mmu.traitsType == TraitMultinameUsage.TRAITS_TYPE_CLASS ? 1 : 0); traitIndex = abcPanel.abc.class_info.get(mmu.getClassIndex()).static_traits.traits.size() + abcPanel.abc.instance_info.get(mmu.getClassIndex()).instance_traits.traits.size() + (mmu.getTraitsType() == TraitMultinameUsage.TRAITS_TYPE_CLASS ? 1 : 0);
} }
} }
abcPanel.decompiledTextArea.gotoTrait(traitIndex); abcPanel.decompiledTextArea.gotoTrait(traitIndex);