[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Tue Jun  9 15:32:23 EDT 2009
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui
In directory dev.open-bio.org:/tmp/cvs-serv21275/src/main/ca/ucalgary/seahawk/gui

Modified Files:
	MobyContentClipboard.java 
Log Message:
Added check for wsdl drops, which should open a new tab
moby-live/Java/src/main/ca/ucalgary/seahawk/gui MobyContentClipboard.java,1.6,1.7
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java	2007/12/06 18:37:06	1.6
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentClipboard.java	2009/06/09 19:32:23	1.7
@@ -25,7 +25,7 @@
  * The clipboard is a special tab that holds a query with a MOBY Collection
  * that the user can add and subtract MobyDataInstances from.
  */
-public class MobyContentClipboard extends MobyContentPane implements ActionListener{
+public class MobyContentClipboard extends MobyContentPane{
     public final static String CLEAR_CLIPBOARD_OPTION = "Clear Clipboard";
     public final static String CLIPBOARD_FILE_NAME = "SeaHawkClipboard";
     public final static String CLIPBOARD_COLLECTION_NAME = "Clipboard Collection";
@@ -114,6 +114,8 @@
     }
 
     protected void addExtraMobyOptions(JPopupMenu popup, MobyDataInstance mdi){
+	super.addExtraMobyOptions(popup, mdi);
+
 	// Only process if the passed in data is one of the top level collection elements
 	// (i.e. don't delete subparts of object)
 	if(!(mdi instanceof MobyDataObject) || !collection.contains(mdi)){
@@ -136,6 +138,7 @@
     }
 
     public void actionPerformed(ActionEvent e){
+	super.actionPerformed(e);
 	if(e.getSource() == deleteDataPopupItem){
 	    if(itemToDelete != null){
 		collection.remove(itemToDelete);
@@ -214,6 +217,13 @@
      * types.
      */
     public void addCollectionData(URL u){
+	// See if it's a WSDL file.  If so, launch the service wrapper 
+	// functionality instead of doing the collection stuff
+	if(u.toString().endsWith(".wsdl")){
+	    contentGUI.loadPaneFromURL(u, true); //true == new tab
+	    return;  // don't load the file in the pane
+	}
+
 	try{
 	    MobyContentInstance mobyContents = 
 			MobyUtils.convertURLtoMobyBinaryData(servicesGUI.getMobyClient(), u);