X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;fp=src%2Fjalview%2Fgui%2FPopupMenu.java;h=ad33110a11a1c74bfd598bb142f0116d9463672c;hb=4f77328104498504339216829abf5ea87e2791ec;hp=3145f7cab016d3cf217339c443b0629bd678f0f8;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 3145f7c..ad33110 100644
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -304,10 +304,10 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
   {
     try
     {
-      Platform.openURL(url);
+      jalview.util.BrowserLauncher.openURL(url);
     } catch (Exception ex)
     {
-      JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
+      JvOptionPane.showInternalMessageDialog(Desktop.desktop,
               MessageManager.getString("label.web_browser_not_found_unix"),
               MessageManager.getString("label.web_browser_not_found"),
               JvOptionPane.WARNING_MESSAGE);
@@ -317,9 +317,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
   }
 
   /**
-   * For the popup menu on the idPanel.
-   * 
-   * Add a late bound groupURL item to the given linkMenu
+   * add a late bound groupURL item to the given linkMenu
    * 
    * @param linkMenu
    * @param label
@@ -351,15 +349,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
           {
             try
             {
-              // Object[] { int[] { number of matches seqs },
-              // boolean[] { which matched },
-              // StringBuffer[] { segment generated from inputs },
-              // String[] { url }
-              // }
-
-              // TODO bug: urlstub is { int[], boolean[] } but constructFrom
-              // requires something else.
-
               showLink(urlgenerator.constructFrom(urlstub));
             } catch (UrlStringTooLongException e2)
             {
@@ -399,7 +388,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
    *          non-positional features if in the Id panel, features at the
    *          clicked residue if in the sequence panel
    * @param groupLinks
-   *          not implemented -- empty list
    */
   public PopupMenu(final AlignmentPanel alignPanel, final SequenceI seq,
           List<SequenceFeature> features, List<String> groupLinks)
@@ -670,7 +658,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       // add any groupURLs to the groupURL submenu and make it visible
       if (groupLinks != null && groupLinks.size() > 0)
       {
-        // not implemented -- empty list
         buildGroupURLMenu(sg, groupLinks);
       }
       // Add a 'show all structures' for the current selection
@@ -996,12 +983,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
     showOrHideMenu.add(item);
   }
 
-  /**
-   *
-   * @param sg
-   * @param groupLinks
-   *          not implemented -- empty list
-   */
   private void buildGroupURLMenu(SequenceGroup sg, List<String> groupLinks)
   {
 
@@ -1063,15 +1044,9 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
         }
       }
     }
-    if (groupLinks.size() == 0)
-    {
-      return;
-    }
     // now create group links for all distinct ID/sequence sets.
     boolean addMenu = false; // indicates if there are any group links to give
                              // to user
-
-    // not implmeented -- empty list
     for (String link : groupLinks)
     {
       GroupUrlLink urlLink = null;
@@ -1124,7 +1099,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       {
         urlset = urlLink.makeUrlStubs(ids, seqstr,
                 "FromJalview" + System.currentTimeMillis(), false);
-        // { int[], boolean[] } only here
       } catch (UrlStringTooLongException e)
       {
       }
@@ -1153,6 +1127,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
           groupLinksMenu.add(linkMenus[m]);
         }
       }
+
       groupMenu.add(groupLinksMenu);
     }
   }
@@ -2010,7 +1985,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
         refresh();
       };
     };
-    JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(),
+    JalviewColourChooser.showColourChooser(Desktop.getDesktop(),
             title, Color.BLUE, listener);
   }