[Mobies-commit] [commit] r3770 - GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Jun 28 11:04:58 2011
New Revision: 3770

Log:
Fix noninteractive mode

Modified:
   GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp

Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp	Tue Jun 28 11:04:45 2011	(r3769)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp	Tue Jun 28 11:04:58 2011	(r3770)
@@ -11,16 +11,13 @@
 #include "ComponentConfig.h"
 #include "UdmConfig.h"
 #include "RawComponent.h"
+#include "Console.h"
 
 // Udm includes
 #include "UdmBase.h"
 #include "Uml.h"
 #include "UmlExt.h"
 
-#ifdef _USE_DOM
-	#include "UdmDOM.h"
-#endif
-
 #include "UdmGme.h"
 #include "UdmStatic.h"
 #include "UdmUtil.h"
@@ -69,9 +66,7 @@
 
 	CComPtr<IMgaProject>ccpProject(project);
 	try
-	{	  
-	  if(interactive) 
-	  {
+	{
 		CComBSTR projname;
 		CComBSTR focusname = "<nothing>";
 		CComPtr<IMgaTerritory> terr;
@@ -247,20 +242,25 @@
 			// Close GME Backend (we may close it twice, but GmeDataNetwork handles it)
 			dngBackend.CloseNoUpdate();			
 
-			AfxMessageBox(exc.what());			
+			if (interactive)
+				AfxMessageBox(exc.what());
+			GMEConsole::Console::Error::WriteLine(exc.what());
 			return S_FALSE;
 		}
-	  }
 	}
 	catch(udm_exception &exc) 
 	{	
-		AfxMessageBox(exc.what());			
+		if (interactive)
+			AfxMessageBox(exc.what());
+		GMEConsole::Console::Error::WriteLine(exc.what());
 		return S_FALSE;
 	}			 
 	catch(...) 
 	{
 		ccpProject->AbortTransaction();
-		AfxMessageBox("An unexpected error has occured during the interpretation process.");
+		if (interactive)
+			AfxMessageBox("An unexpected error has occured during the interpretation process.");
+		GMEConsole::Console::Error::WriteLine("An unexpected error has occured during the interpretation process.");
 		return E_UNEXPECTED;
 	}
 	return S_OK;