Author: kono
Date: 2012-07-30 12:08:34 -0700 (Mon, 30 Jul 2012)
New Revision: 30037

Added:
   
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/OpenURLMenu.java
Removed:
   
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
Modified:
   
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
Log:
HyperLinkOut class renamed since it is not an actual Linkout.  It simply opens 
URL cells.

Modified: 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
--- 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
  2012-07-30 19:05:12 UTC (rev 30036)
+++ 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
  2012-07-30 19:08:34 UTC (rev 30037)
@@ -444,9 +444,9 @@
                        curItem.getMenuComponent(2).setEnabled(true);
 
                        if (type == List.class)
-                               curItem.add(new HyperLinkOut(item.toString(), 
linkoutProps, openBrowser));
+                               curItem.add(new OpenURLMenu(item.toString(), 
linkoutProps, openBrowser));
                        else
-                               curItem.add(new 
HyperLinkOut(item.toString().split("=")[1], linkoutProps, openBrowser));
+                               curItem.add(new 
OpenURLMenu(item.toString().split("=")[1], linkoutProps, openBrowser));
 
                        cellMenu.add(curItem);
                }

Deleted: 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
===================================================================
--- 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
  2012-07-30 19:05:12 UTC (rev 30036)
+++ 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
  2012-07-30 19:08:34 UTC (rev 30037)
@@ -1,109 +0,0 @@
-/*
- Copyright (c) 2006, 2007, 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-package org.cytoscape.browser.internal;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
-import org.cytoscape.util.swing.OpenBrowser;
-
-public class HyperLinkOut extends JMenu {
-
-       private static final long serialVersionUID = 2344898200050965794L;
-
-       private final String value;
-       private final Map<String, Map<String, String>> structure;
-       private final OpenBrowser openBrowser;
-
-       public HyperLinkOut(String value, final Map<String, Map<String, 
String>> menuStructure,
-                       final OpenBrowser openBrowser) {
-               this.value = value;
-               this.structure = menuStructure;
-               this.openBrowser = openBrowser;
-
-               setBackground(Color.white);
-
-               final String dispStr;
-               if (value.length() > 30)
-                       dispStr = value.substring(0, 29) + " ... ";
-               else
-                       dispStr = value;
-
-               setText("<html>Search <strong text=\"#DC143C\">" + dispStr + 
"</strong> on the web</html>");
-               buildLinks();
-       }
-
-       private Map<String, List> getDefaultMenu() {
-               Map<String, List> def = new HashMap<String, List>();
-
-               List<String> se = new ArrayList<String>();
-               se.add("Google");
-               se.add("Ask");
-               def.put("Search Engines", se);
-
-               List<String> bio = new ArrayList<String>();
-               bio.add("SGD");
-               bio.add("GO");
-               bio.add("MGD");
-               bio.add("Reactome");
-               def.put("Biological Databases", bio);
-
-               return def;
-       }
-
-       private void buildLinks() {
-               if (structure == null)
-                       return;
-
-               for (final String category : structure.keySet()) {
-                       JMenu cat = new JMenu(category);
-                       Map<String, String> children = structure.get(category);
-
-                       for (final String name : children.keySet()) {
-                               JMenuItem dbLink = new JMenuItem(name);
-                               dbLink.addActionListener(new ActionListener() {
-                                       public void actionPerformed(ActionEvent 
e) {
-                                               final String url = 
structure.get(category).get(name).replace("%ID%", value);
-                                               openBrowser.openURL(url);
-                                       }
-                               });
-                               cat.add(dbLink);
-                       }
-
-                       this.add(cat);
-               }
-       }
-}

Copied: 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/OpenURLMenu.java
 (from rev 30036, 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java)
===================================================================
--- 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/OpenURLMenu.java
                           (rev 0)
+++ 
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/OpenURLMenu.java
   2012-07-30 19:08:34 UTC (rev 30037)
@@ -0,0 +1,88 @@
+/*
+ Copyright (c) 2006, 2007, 2010, The Cytoscape Consortium (www.cytoscape.org)
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications.  In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage.  See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+package org.cytoscape.browser.internal;
+
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Map;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.cytoscape.util.swing.OpenBrowser;
+
+public class OpenURLMenu extends JMenu {
+
+       private static final long serialVersionUID = 2344898200050965794L;
+
+       private final String value;
+       private final Map<String, Map<String, String>> structure;
+       private final OpenBrowser openBrowser;
+
+       public OpenURLMenu(String value, final Map<String, Map<String, String>> 
menuStructure,
+                       final OpenBrowser openBrowser) {
+               this.value = value;
+               this.structure = menuStructure;
+               this.openBrowser = openBrowser;
+
+               setBackground(Color.white);
+
+               final String dispStr;
+               if (value.length() > 30)
+                       dispStr = value.substring(0, 29) + " ... ";
+               else
+                       dispStr = value;
+
+               setText("<html>Search <strong text=\"#DC143C\">" + dispStr + 
"</strong> on the web</html>");
+               buildLinks();
+       }
+
+       private void buildLinks() {
+               if (structure == null)
+                       return;
+
+               for (final String category : structure.keySet()) {
+                       JMenu cat = new JMenu(category);
+                       Map<String, String> children = structure.get(category);
+
+                       for (final String name : children.keySet()) {
+                               JMenuItem dbLink = new JMenuItem(name);
+                               dbLink.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent 
e) {
+                                               final String url = 
structure.get(category).get(name).replace("%ID%", value);
+                                               openBrowser.openURL(url);
+                                       }
+                               });
+                               cat.add(dbLink);
+                       }
+
+                       this.add(cat);
+               }
+       }
+}

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/cytoscape-cvs?hl=en.

Reply via email to