[Taverna-cvs] t2workbench/net.sf.taverna.t2.ui.ui-impl/file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions SaveWorkflowAction.java, 1.1.2.1, 1.1.2.2

[Stian Soiland-R. <st...@us...>]

Update of /cvsroot/taverna/t2workbench/net.sf.taverna.t2.ui.ui-impl/file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4984/file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions

Modified Files:
      Tag: t2workbench-platform
	SaveWorkflowAction.java 
Log Message:
avoid early NPE from file manager

Index: SaveWorkflowAction.java
===================================================================
RCS file: /cvsroot/taverna/t2workbench/net.sf.taverna.t2.ui.ui-impl/file-impl/src/main/java/net/sf/taverna/t2/workbench/file/impl/actions/Attic/SaveWorkflowAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SaveWorkflowAction.java	30 Jan 2009 16:10:16 -0000	1.1.2.1
--- SaveWorkflowAction.java	30 Jan 2009 16:33:00 -0000	1.1.2.2
***************
*** 34,37 ****
--- 34,38 ----
  import net.sf.taverna.t2.workbench.edits.EditManager.AbstractDataflowEditEvent;
  import net.sf.taverna.t2.workbench.edits.EditManager.EditManagerEvent;
+ import net.sf.taverna.t2.workbench.file.FileManager;
  import net.sf.taverna.t2.workbench.file.events.FileManagerEvent;
  import net.sf.taverna.t2.workbench.file.events.SavedDataflowEvent;
***************
*** 57,63 ****
--- 58,79 ----
  
  	public void setEditManager(EditManager editManager) {
+ 		if (this.editManager != null) {
+ 			this.editManager.removeObserver(editManagerObserver);
+ 		}
  		this.editManager = editManager;
+ 		editManager.addObserver(editManagerObserver);
  	}
  
+ 	@Override
+ 	public void setFileManager(FileManager fileManager) {
+ 		FileManager oldFileManager = getFileManager();
+ 		if (oldFileManager != null) {
+ 			oldFileManager.removeObserver(fileManagerObserver);
+ 		}
+ 		super.setFileManager(fileManager);
+ 		fileManager.addObserver(fileManagerObserver);
+ 		updateEnabledStatus(getFileManager().getCurrentDataflow());
+ 	}
+ 	
  	private EditManagerObserver editManagerObserver = new EditManagerObserver();
  
***************
*** 71,77 ****
  		super(SAVE_WORKFLOW, WorkbenchIcons.saveIcon);
  		modelMap.addObserver(modelMapObserver);
- 		editManager.addObserver(editManagerObserver);
- 		getFileManager().addObserver(fileManagerObserver);
- 		updateEnabledStatus(getFileManager().getCurrentDataflow());
  	}
  
--- 87,90 ----