diff -rc MEF.src/uci/uml/generate/GenerationPreferences.java MEF.src.new/uci/uml/generate/GenerationPreferences.java
*** MEF.src/uci/uml/generate/GenerationPreferences.java	Wed Jul 25 12:44:59 2001
--- MEF.src.new/uci/uml/generate/GenerationPreferences.java	Wed Jul 25 12:34:39 2001
***************
*** 43,52 ****
    protected String _outputDir = "/home/jrobbins/vtmp/";
  
    public GenerationPreferences() {
!     if (System.getProperty("os.name").startsWith("S"))
!       _outputDir = "/tmp";
!     else
        _outputDir = "c:\\temp";
    }
  
    ////////////////////////////////////////////////////////////////
--- 43,52 ----
    protected String _outputDir = "/home/jrobbins/vtmp/";
  
    public GenerationPreferences() {
!     if (System.getProperty("os.name").startsWith("Win"))
        _outputDir = "c:\\temp";
+     else
+       _outputDir = "/tmp";
    }
  
    ////////////////////////////////////////////////////////////////
diff -rc MEF.src/uci/uml/visual/FigSDMessage.java MEF.src.new/uci/uml/visual/FigSDMessage.java
*** MEF.src/uci/uml/visual/FigSDMessage.java	Wed Jul 25 12:45:04 2001
--- MEF.src.new/uci/uml/visual/FigSDMessage.java	Mon Jul 23 12:08:33 2001
***************
*** 325,330 ****
--- 325,331 ----
      
      AssociationRole assocRole = msg.getAssociationRole() ;
      
+     if (assocRole == null) return;
      if (assocRole.messageCount() != 0) {
        // System.out.println("-- not removed --") ;
        return ;
diff -rc MEF.src/uci/xml/xmi/XMIParser.java MEF.src.new/uci/xml/xmi/XMIParser.java
*** MEF.src/uci/xml/xmi/XMIParser.java	Wed Jul 25 12:45:05 2001
--- MEF.src.new/uci/xml/xmi/XMIParser.java	Wed Jul 25 11:42:23 2001
***************
*** 1417,1422 ****
--- 1417,1423 ----
  	&& _lastReference instanceof Message)
      {
        _curAssociationRole.addMessage((Message)_lastReference);
+       ((Message)_lastReference).setAssociationRole (_curAssociationRole) ;
        return ;
      }
      if (inTag("Message")