[Mobies-commit] [commit] r4378 - in UDM/trunk/src/UIntWizVS: HTML/1033 Templates/1033

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Jul 21 16:36:16 2016
New Revision: 4378

Log:
Interpreter wizard: remove console option (console=no hasn't compiled for some time). Don't throw exceptions beyond COM boundary

Modified:
   UDM/trunk/src/UIntWizVS/HTML/1033/Basic.htm
   UDM/trunk/src/UIntWizVS/HTML/1033/default.htm
   UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp
   UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf
   UDM/trunk/src/UIntWizVS/Templates/1033/UdmConfig.h

Modified: UDM/trunk/src/UIntWizVS/HTML/1033/Basic.htm
==============================================================================
--- UDM/trunk/src/UIntWizVS/HTML/1033/Basic.htm	Wed May 18 13:31:12 2016	(r4377)
+++ UDM/trunk/src/UIntWizVS/HTML/1033/Basic.htm	Thu Jul 21 16:36:16 2016	(r4378)
@@ -240,10 +240,6 @@
  
                 <P CLASS="ElementSpacer"> </P>
        			<SPAN CLASS="itemText">
-	  				 <INPUT CLASS="CheckBox" TYPE="checkbox" ID="USE_CONSOLE" ACCESSKEY="u" TITLE="Check this if you want to use the GME console in your application.">	  	 			 
-	  				 <DIV CLASS="itemTextCheckboxA" TITLE="Check this if you want to use the GME console in your application.">
-		  			    <LABEL FOR="USE_CONSOLE" TITLE="Check this if you want to use the GME console in your application." ID="LABEL1" ><U>U</U>se GME console</LABEL>
-	  	 			 </DIV>
 	  	 			 <P CLASS="ElementSpacer"> </P>
 				</SPAN>
     							

Modified: UDM/trunk/src/UIntWizVS/HTML/1033/default.htm
==============================================================================
--- UDM/trunk/src/UIntWizVS/HTML/1033/default.htm	Wed May 18 13:31:12 2016	(r4377)
+++ UDM/trunk/src/UIntWizVS/HTML/1033/default.htm	Thu Jul 21 16:36:16 2016	(r4378)
@@ -28,8 +28,6 @@
 
     <SYMBOL NAME='DIRECT_MGA_ACCESS' TYPE=checkbox VALUE=true></SYMBOL>
 	
-	<SYMBOL NAME='USE_CONSOLE' TYPE=checkbox VALUE=true></SYMBOL>
-	
 	<SYMBOL NAME='HEADER_FILE' TYPE=text VALUE=''></SYMBOL>
 	<SYMBOL NAME='CPP_FILE' TYPE=text VALUE=''></SYMBOL>    
 	
@@ -286,11 +284,6 @@
 		   				<LABEL FOR="CPP_SUMMARY"></LABEL>
 		  			  </SPAN>
 	  	 			 </LI>
-                     <LI CLASS="LIST">
-		  			  <SPAN CLASS="SideBtnHidden" ID="CONSOLE_SUMMARY" TITLE="">
-		   				<LABEL FOR="CONSOLE_SUMMARY"></LABEL>
-		  			  </SPAN>
-	  	 			 </LI>
 
 				</UL>
 				
@@ -515,15 +508,6 @@
         }
             
 	}
-
-	var useConsole = window.external.FindSymbol('USE_CONSOLE');
-	if (useConsole) {
-	    CONSOLE_SUMMARY.innerHTML = "<B>Using</B> GME console.";
-	}
-	else{
-	    CONSOLE_SUMMARY.innerHTML = "<B>Not using</B> GME Console.";
-	}
-
 }
 
 // If the wizard has more than 1 page, this 

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Wed May 18 13:31:12 2016	(r4377)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Thu Jul 21 16:36:16 2016	(r4378)
@@ -31,7 +31,6 @@
 
 #include "RawComponent.h"
 
-// Console
 #include "UdmConsole.h"
 
 // Udm includes
@@ -91,14 +90,13 @@
 		return S_FALSE;
 	}
 
+    COMTRY {
 	CComPtr<IMgaProject>ccpProject(project);
 	
 	try
 	{
-[!if USE_CONSOLE]	  
 		// Setting up the console
 		GMEConsole::Console::SetupConsole(ccpProject);
-[!endif]
 
 		CComBSTR projname;
 		CComBSTR focusname = "<nothing>";
@@ -211,28 +209,20 @@
 	}
 	catch (udm_exception& e)
 	{
-[!if USE_CONSOLE]
 		GMEConsole::Console::gmeoleapp = 0;
-[!endif]
 		ThrowComError(E_FAIL, GMEConsole::BSTRFromUTF8(e.what()));
 	}
 	catch (_com_error& e)
 	{
-[!if USE_CONSOLE]
 		GMEConsole::Console::gmeoleapp = 0;
-[!endif]
 		throw;
 	}
 	catch(...)
 	{
-[!if USE_CONSOLE]
 		GMEConsole::Console::gmeoleapp = 0;
-[!endif]
 		ThrowComError(E_FAIL, _bstr_t(L"An unexpected error has occurred during the interpretation process."));
 	}
-[!if USE_CONSOLE]
-	GMEConsole::Console::gmeoleapp = 0;
-[!endif]
+	} COMCATCH(GMEConsole::Console::gmeoleapp = 0;)
 	return S_OK;
 
 }

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf	Wed May 18 13:31:12 2016	(r4377)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/Templates.inf	Thu Jul 21 16:36:16 2016	(r4378)
@@ -2,12 +2,10 @@
 UdmApp.cpp
 UdmApp.h
 string_utils.h
-[!if USE_CONSOLE]
 UdmConsole.cpp
 UdmConsole.h
 UdmFormatter.cpp
 UdmFormatter.h
-[!endif]
 RawComponent.cpp
 RawComponent.h
 CompIcon.ico

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/UdmConfig.h
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/UdmConfig.h	Wed May 18 13:31:12 2016	(r4377)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/UdmConfig.h	Thu Jul 21 16:36:16 2016	(r4378)
@@ -3,13 +3,6 @@
 
 #include <string> // STL
 
-
-[!if USE_CONSOLE]
-#define _USE_CONSOLE
-[!endif]
-
-
-
 [!if META_LOADING_DYNAMIC && DYNAMIC_META_XML_BACKEND]
 #define _DYNAMIC_META
 #define _DYNAMIC_META_DOM