X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=9a0def1eabe77ae26d42083e6007c3894ff47ead;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=a98c1da213537b110f4117d25466a025c801704c;hpb=65b3877f9041a45bfbb7cbc1dd444a8cf87c9f3d;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index a98c1da..9a0def1 100755
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -30,6 +30,7 @@ import jalview.datamodel.*;
 import jalview.io.*;
 import jalview.schemes.*;
 import jalview.util.GroupUrlLink;
+import jalview.util.GroupUrlLink.UrlStringTooLongException;
 import jalview.util.UrlLink;
 
 /**
@@ -395,7 +396,7 @@ public class PopupMenu extends JPopupMenu
       {
         conservationMenuItem.setSelected(true);
       }
-      displayNonconserved.setSelected(sg.getShowunconserved());
+      displayNonconserved.setSelected(sg.getShowNonconserved());
       showText.setSelected(sg.getDisplayText());
       showColourText.setSelected(sg.getColourText());
       showBoxes.setSelected(sg.getDisplayBoxes());
@@ -654,8 +655,14 @@ public class PopupMenu extends JPopupMenu
       }
       // and try and make the groupURL!
 
-      Object[] urlset = urlLink.makeUrlStubs(ids, seqstr, "FromJalview"
-              + System.currentTimeMillis(), false);
+      Object[] urlset = null;
+      try
+      {
+        urlset = urlLink.makeUrlStubs(ids, seqstr, "FromJalview"
+                + System.currentTimeMillis(), false);
+      } catch (UrlStringTooLongException e)
+      {
+      }
       if (urlset != null)
       {
         int type = urlLink.getGroupURLType() & 3;
@@ -752,7 +759,12 @@ public class PopupMenu extends JPopupMenu
 
           public void run()
           {
-            showLink(urlgenerator.constructFrom(urlstub));
+            try
+            {
+              showLink(urlgenerator.constructFrom(urlstub));
+            } catch (UrlStringTooLongException e)
+            {
+            }
           }
 
         }).start();
@@ -1139,7 +1151,7 @@ public class PopupMenu extends JPopupMenu
 
   protected void showNonconserved_actionPerformed()
   {
-    getGroup().setShowunconserved(displayNonconserved.isSelected());
+    getGroup().setShowNonconserved(displayNonconserved.isSelected());
     refresh();
   }
 
@@ -1440,7 +1452,7 @@ public class PopupMenu extends JPopupMenu
     SequenceGroup sg = getGroup();
     EditNameDialog dialog = new EditNameDialog(sg.getName(), sg
             .getDescription(), "       Group Name ", "Group Description ",
-            "Edit Group Name/Description");
+            "Edit Group Name/Description", ap.alignFrame);
 
     if (!dialog.accept)
     {
@@ -1479,7 +1491,7 @@ public class PopupMenu extends JPopupMenu
   {
     EditNameDialog dialog = new EditNameDialog(sequence.getName(), sequence
             .getDescription(), "       Sequence Name ",
-            "Sequence Description ", "Edit Sequence Name/Description");
+            "Sequence Description ", "Edit Sequence Name/Description", ap.alignFrame);
 
     if (!dialog.accept)
     {
@@ -1870,7 +1882,7 @@ public class PopupMenu extends JPopupMenu
 
       EditNameDialog dialog = new EditNameDialog(sequence
               .getSequenceAsString(sg.getStartRes(), sg.getEndRes() + 1),
-              null, "Edit Sequence ", null, "Edit Sequence");
+              null, "Edit Sequence ", null, "Edit Sequence", ap.alignFrame);
 
       if (dialog.accept)
       {