[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Mon Mar 29 15:55:39 EDT 2010
Update of /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui
In directory dev.open-bio.org:/tmp/cvs-serv10656/src/main/ca/ucalgary/seahawk/gui

Modified Files:
	MobyContentGUI.java 
Log Message:
DataRecorder -> DataFlowRecorder
moby-live/Java/src/main/ca/ucalgary/seahawk/gui MobyContentGUI.java,1.20,1.21
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java	2010/03/17 20:21:55	1.20
+++ /home/repository/moby/moby-live/Java/src/main/ca/ucalgary/seahawk/gui/MobyContentGUI.java	2010/03/29 19:55:39	1.21
@@ -38,6 +38,7 @@
     // Variables used to coordinate component finding with the unit test cases
     public final static String BACK_BUTTON_NAME = "MCGbackButton";
     public final static String FORWARD_BUTTON_NAME = "MCGforwardButton";
+    public final static String FORWARD_BUTTON_MSG = "Go to next document in this tab's history";
     public final static String OPEN_BUTTON_NAME = "MCGopenButton";
     public final static String SAVE_BUTTON_NAME = "MCGsaveButton";
     public final static String FILTER_BUTTON_NAME = "MCGfilterButton";
@@ -86,7 +87,7 @@
     private DocumentBuilder docBuilder = null;
     private MobyContentClipboard clipboard;
     private MobyContentHelpPane helpPane;
-    private DataRecorder dataRecorder; // used for workflow export, etc.
+    private DataFlowRecorder dataRecorder; // used for workflow export, etc.
     private SeahawkOptionsGUI settingsGUI;
 
     private boolean setup;
@@ -132,7 +133,7 @@
 
 	forwardButton = new JButton(new ImageIcon(cl.getResource("ca/ucalgary/seahawk/resources/images/forward.gif")));
 	forwardButton.setDisabledIcon(new ImageIcon(cl.getResource("ca/ucalgary/seahawk/resources/images/forward_d.gif")));
-	forwardButton.setToolTipText("Go to next document in this tab's history");
+	forwardButton.setToolTipText(FORWARD_BUTTON_MSG);
 	forwardButton.setPreferredSize(buttonSize);
 	forwardButton.setEnabled(false);
 	forwardButton.addActionListener(this);
@@ -217,7 +218,7 @@
 	tabbedPane.addKeyListener(this);
 	
 	try{
-	    dataRecorder = new DataRecorder(servicesGUI.getMobyCentralImpl());
+	    dataRecorder = new DataFlowRecorder(servicesGUI.getMobyCentralImpl());
 	} catch(Exception e){
 	    e.printStackTrace();
 	}
@@ -598,7 +599,14 @@
 	}
     }
 
-    private void updateHistoryButtons(){
+    /**
+     * Allow others to set the forward navigation button message.  If set the null, the default tooltip is used.
+     */
+    public void setForwardButtonToolTip(String msg){
+	forwardButton.setToolTipText(msg == null ? FORWARD_BUTTON_MSG : msg);
+    }
+
+    public void updateHistoryButtons(){
 	MobyContentPane pane = (MobyContentPane) tabbedPane.getSelectedComponent();
 	if(pane != null){
 	    backwardButton.setEnabled(pane.canGoBack());
@@ -793,8 +801,8 @@
 	MobyContentInstance result = request.invokeService();
 	ByteArrayOutputStream inputXML = new ByteArrayOutputStream();
 	MobyDataUtils.toXMLDocument(inputXML, inEnvelope);
-	URL resultURL = dataRecorder.saveOutputData(result, services[0], //for tracking purposes
-						    inEnvelope, central.getRegistryEndpoint());  
+	URL resultURL = DataUtils.saveOutputData(result, services[0], //for tracking purposes
+						 inEnvelope, central.getRegistryEndpoint());  
 
 	for(int i = 0; i < tabbedPane.getTabCount(); i++){
 	    MobyContentPane pane = (MobyContentPane) tabbedPane.getComponentAt(i);