[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Mon Aug 17 17:24:29 EDT 2009
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui
In directory dev.open-bio.org:/tmp/cvs-serv25933/src/main/ca/ucalgary/seahawk/gui

Modified Files:
	MobyContentPane.java 
Log Message:
Incomplete Taverna2 export, fixed related to DataRecorder refactoring
moby-live/Java/src/main/ca/ucalgary/seahawk/gui MobyContentPane.java,1.19,1.20
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentPane.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentPane.java	2009/06/09 22:20:54	1.19
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentPane.java	2009/08/17 21:24:29	1.20
@@ -216,7 +216,7 @@
 
 	// remove the last part of the xPath, which is actually the value, not the selection
 	String valXPath = xPath.substring(xPath.lastIndexOf("/")+1);
-	xPath = xPath.substring(0, xPath.lastIndexOf("/"));
+	//xPath = xPath.substring(0, xPath.lastIndexOf("/"));
 
 	//todo: MOBY_OUTPUT_NS_PARAM MOBY_OUTPUT_TYPE_PARAM
 	String transformationParam = "";
@@ -324,6 +324,17 @@
     private void launchInWebBrowser(URL u){
 	// Launch the browser with the form the servlet hosts
 	try{
+	    /*   Desktop desktop = Desktop.getDesktop();
+           if(!desktop.isSupported(Desktop.Action.BROWSE)) {
+               editorPane.setText("Your Java does not support external browser launch.  " +
+                                  "Please manually launch a browser and go to the URL " +
+                                  u);
+           }
+           desktop.browse(u.toURI());
+       } catch (java.net.URISyntaxException urise){
+           logger.error("Could not create URI from URL ("+u+"): " + urise);
+       } catch (java.io.IOException ioe){
+       logger.error("Could not launch browser for form (" + u + "): " + ioe);*/
 	    org.jdesktop.jdic.desktop.Desktop.browse(u);
 	} catch (Exception e){
 	    logger.error("Could not launch browser for form (" + u + "): " + e);
@@ -603,8 +614,8 @@
      * PBE recorder.
      */
     public void exportDone(String valuePasted, String transformRuleURI){
-	if(soapServlet != null && soapServlet.getRecorder() != null){
-	    soapServlet.getRecorder().dataCopied(getDraggedData(), valuePasted, transformRuleURI);
+	if(soapServlet != null && soapServlet.getRecorder() != null && (soapServlet.getRecorder() instanceof PBERecorder)){
+	    ((PBERecorder) soapServlet.getRecorder()).dataCopied(getDraggedData(), valuePasted, transformRuleURI);
 	}
     }
 
@@ -711,7 +722,7 @@
 	return hasFailed;
     }
 
-    public String toScufl() throws Exception{
+    public String toScufl(String workflowName) throws Exception{
         URL[] historyToExport = (URL[]) history.toArray(new URL[history.size()]);
         if(historyIndex != historyToExport.length-1){
             // Shorten the array if we aren't currently on the last doc (i.e.
@@ -721,7 +732,7 @@
             historyToExport = truncatedHistory;
         }
         ByteArrayOutputStream output = new ByteArrayOutputStream();
-        dataRecorder.exportWorkflow(historyToExport, output, DataRecorder.TAVERNA15);
+        dataRecorder.exportWorkflow(historyToExport, output, workflowName, DataRecorder.TAVERNA15);
         return output.toString();
     }