diff --git a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java index 705a380f5..d9f559d56 100644 --- a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java @@ -70,7 +70,6 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; -import javax.swing.JTable; import javax.swing.JTree; import javax.swing.event.TreeModelListener; import javax.swing.plaf.basic.BasicLabelUI; @@ -95,6 +94,7 @@ public class GenericTagTreePanel extends GenericTagPanel { private Tag editedTag; private static final Map> fieldCache = new HashMap<>(); + private static final int FIELD_INDEX = 0; private class MyTree extends JTree { @@ -396,7 +396,7 @@ public class GenericTagTreePanel extends GenericTagPanel { mi.setEnabled(false); } p.add(mi); - //} + //} } p.show(tree, e.getX(), e.getY()); } @@ -708,7 +708,7 @@ public class GenericTagTreePanel extends GenericTagPanel { } FieldNode fnode = (FieldNode) parent; Field field = fnode.fieldSet.get(FIELD_INDEX); - if (ReflectionTools.needsIndex(field) && (fnode.index == -1)) { //Arrays ot Lists + if (ReflectionTools.needsIndex(field) && (fnode.index == -1)) { //Arrays ot Lists return new FieldNode(fnode.obj, fnode.fieldSet, index); } parent = fnode.getValue(FIELD_INDEX); @@ -908,7 +908,9 @@ public class GenericTagTreePanel extends GenericTagPanel { private static class FieldSet { public List fields; + public String name; + public String itemName; public FieldSet(Field field) { @@ -930,7 +932,6 @@ public class GenericTagTreePanel extends GenericTagPanel { public int size() { return fields.size(); } - } private static List
filterFields(MyTreeModel mod, String parentPath, Class cls, boolean limited) { diff --git a/src/com/jpexs/decompiler/flash/gui/MenuBuilder.java b/src/com/jpexs/decompiler/flash/gui/MenuBuilder.java index 046a3c747..2c2ff0977 100644 --- a/src/com/jpexs/decompiler/flash/gui/MenuBuilder.java +++ b/src/com/jpexs/decompiler/flash/gui/MenuBuilder.java @@ -26,7 +26,9 @@ import java.awt.event.ActionListener; public interface MenuBuilder { public static final int PRIORITY_LOW = 1; + public static final int PRIORITY_MEDIUM = 2; + public static final int PRIORITY_TOP = 3; /** @@ -133,5 +135,4 @@ public interface MenuBuilder { * @return True if supports */ public boolean supportsAppMenu(); - } diff --git a/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java b/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java index f0c618831..a7518d586 100644 --- a/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java +++ b/test/com/jpexs/decompiler/flash/gui/AdvancedSettingsTest.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.gui; import java.util.HashMap; import java.util.ResourceBundle; import javax.swing.JComboBox; -import org.testng.Assert; import org.testng.annotations.Test; /** @@ -33,5 +32,4 @@ public class AdvancedSettingsTest { ResourceBundle resourceBundle = ResourceBundle.getBundle(AppStrings.getResourcePath(AdvancedSettingsDialog.class)); AdvancedSettingsDialog.getCategories(new HashMap<>(), new HashMap<>(), new JComboBox<>(), resourceBundle); } - }