From 70ac6d3308f822b613db35a84605a35e93328c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Tue, 27 Dec 2011 08:35:11 +0100
Subject: [PATCH] AS3: Constant tab moved to the top AS3: Empty namespaces
 shown as "-"

---
 trunk/src/com/jpexs/asdec/abc/ABC.java          |  3 ++-
 .../src/com/jpexs/asdec/abc/gui/MainFrame.java  | 17 +++++++++++++----
 .../gui/tablemodels/NamespaceTableModel.java    |  4 ++--
 .../com/jpexs/asdec/abc/types/Namespace.java    |  3 +++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/asdec/abc/ABC.java
index 33b79e6a1..d03cf21ed 100644
--- a/trunk/src/com/jpexs/asdec/abc/ABC.java
+++ b/trunk/src/com/jpexs/asdec/abc/ABC.java
@@ -250,7 +250,7 @@ public class ABC {
          }
          bodies[i].traits = ais.readTraits();
       }
-   }
+  }
 
    public void saveToStream(OutputStream os) throws IOException {
       ABCOutputStream aos = new ABCOutputStream(os);
@@ -367,6 +367,7 @@ public class ABC {
          String name = m.getName(constants);
          if (ns != null) {
             String newimport = ns.getName(constants);
+            if(newimport.equals("-")) newimport="";
             if (!newimport.equals("")) {
                newimport += "." + name;
                if (newimport.contains(":")) {
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
index 139bc3874..5edd25835 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java
@@ -203,13 +203,22 @@ public class MainFrame extends JFrame implements ActionListener, ItemListener {
         navigator = new TraitsList();
         navigator.setABC(abc);
 
-        JTabbedPane tabbedPane = new JTabbedPane();
-        tabbedPane.addTab("Traits", new JScrollPane(navigator));
+        
+        JPanel navPanel=new JPanel(new BorderLayout());
+        JLabel traitsLabel=new JLabel("Traits");
+        navPanel.add(traitsLabel,BorderLayout.NORTH);
+
+        traitsLabel.setBorder(new BevelBorder(BevelBorder.RAISED));
+        navPanel.add(navigator,BorderLayout.CENTER);
+
         splitPane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
                 new JScrollPane(classTree = new ClassesListTree(abc)),
-                tabbedPane);
+                navPanel);
 
-        pan2.add(splitPane2, BorderLayout.CENTER);
+        JTabbedPane tabbedPane = new JTabbedPane();
+        tabbedPane.addTab("Classes", splitPane2);
+
+        pan2.add(tabbedPane, BorderLayout.CENTER);
         abcComboBox.addItemListener(this);
 
 
diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java
index 17486c516..c5cf60940 100644
--- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java
+++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java
@@ -109,10 +109,10 @@ public class NamespaceTableModel implements TableModel {
             case 0:
                 return rowIndex;
             case 1:
-                if (rowIndex == 0) return "";
+                if (rowIndex == 0) return "-";
                 return abc.constants.constant_namespace[rowIndex].getKindStr();
             case 2:
-                if (rowIndex == 0) return "";
+                if (rowIndex == 0) return "-";
                 return abc.constants.constant_namespace[rowIndex].getName(abc.constants);
             default:
                 return null;
diff --git a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java b/trunk/src/com/jpexs/asdec/abc/types/Namespace.java
index a64ad5298..ea2da5c71 100644
--- a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java
+++ b/trunk/src/com/jpexs/asdec/abc/types/Namespace.java
@@ -74,6 +74,9 @@ public class Namespace {
     }
 
     public String getName(ConstantPool constants) {
+        if(name_index==0){
+           return "-";
+        }
         return constants.constant_string[name_index];
     }
 }