X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;fp=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=a3d2d474c9da6ceeaba87329b20afadb9d7a9fce;hb=be707dc4d1ea70abc29cbe3fd4489be7bb692117;hp=b6cc5a57ebe6363affe4f73452f20a3a8ef094a1;hpb=bf137b6f217be9b0ffa1d6e8a71fdc563f17ef89;p=jalview.git

diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index b6cc5a5..a3d2d47 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -63,10 +63,13 @@ public class EditNameDialog
     panel2.add(idlabel, BorderLayout.WEST);
     panel2.add(id, BorderLayout.CENTER);
     panel.add(panel2, BorderLayout.NORTH);
-    panel2 = new JPanel(new BorderLayout());
-    panel2.add(desclabel, BorderLayout.WEST);
-    panel2.add(description, BorderLayout.CENTER);
-    panel.add(panel2, BorderLayout.SOUTH);
+    if(desc!=null || label2!=null)
+    {
+      panel2 = new JPanel(new BorderLayout());
+      panel2.add(desclabel, BorderLayout.WEST);
+      panel2.add(description, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.SOUTH);
+    }
 
     int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
         panel, title,