From 1f84a87b84935342f4ab4ee94e3498c069b18a9c Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 26 Dec 2016 17:58:26 +0100 Subject: [PATCH] using defined constant in TraitListItem --- src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java | 1 - .../jpexs/decompiler/flash/gui/abc/TraitsListItem.java | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java b/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java index 1e582685f..02f18ee85 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java @@ -89,7 +89,6 @@ public class TraitsList extends JList implements ListSelectionListener { lastSelected = getSelectedIndex(); TraitsListItem sel = (TraitsListItem) getSelectedValue(); abcPanel.decompiledTextArea.gotoTrait(sel == null ? -1 : sel.getGlobalTraitId()); - } @Override diff --git a/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java b/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java index 49af65ebc..d79c71651 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/TraitsListItem.java @@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; import com.jpexs.decompiler.flash.gui.AppStrings; +import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter; import com.jpexs.decompiler.flash.helpers.NulWriter; import java.util.ArrayList; @@ -66,16 +67,13 @@ public class TraitsListItem { public int getGlobalTraitId() { if (type == Type.INITIALIZER) { if (!isStatic) { - return -1; - //return abc.class_info.get(classIndex).static_traits.traits.size() + abc.instance_info.get(classIndex).instance_traits.traits.size(); + return GraphTextWriter.TRAIT_INSTANCE_INITIALIZER; } else { - return -2; - //return abc.class_info.get(classIndex).static_traits.traits.size() + abc.instance_info.get(classIndex).instance_traits.traits.size() + 1; + return GraphTextWriter.TRAIT_CLASS_INITIALIZER; } } if (type == Type.SCRIPT_INITIALIZER) { - //return abc.class_info.get(classIndex).static_traits.traits.size() + abc.instance_info.get(classIndex).instance_traits.traits.size() + 2; - return -3; + return GraphTextWriter.TRAIT_SCRIPT_INITIALIZER; } if (isStatic) { return index;