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

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon May  2 11:00:36 2011
New Revision: 3706

Log:
Compat with SVN Udm

Modified:
   UDM/trunk/src/UIntWizVS/HTML/1033/Settings.htm
   UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp
   UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.cpp
   UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.h
   UDM/trunk/src/UIntWizVS/Templates/1033/UdmConsole.cpp

Modified: UDM/trunk/src/UIntWizVS/HTML/1033/Settings.htm
==============================================================================
--- UDM/trunk/src/UIntWizVS/HTML/1033/Settings.htm	Mon May  2 11:00:04 2011	(r3705)
+++ UDM/trunk/src/UIntWizVS/HTML/1033/Settings.htm	Mon May  2 11:00:36 2011	(r3706)
@@ -265,7 +265,7 @@
                     </div>
 
   	 			    <SPAN CLASS="itemText" TITLE="Header file generated by the tool udm.exe.">
- 				        <LABEL ID="AUT_ID5" FOR="HEADER_FILE">Header file:</LABEL><br />    			    
+ 				        <LABEL ID="AUT_ID5" FOR="HEADER_FILE">Paradigm header file:</LABEL><br />    			    
 	    		        <INPUT CLASS="itemText" TYPE="text" ID="HEADER_FILE" TITLE="Header file generated by the tool udm.exe.">
 	    		        
 		    	    </SPAN>
@@ -276,7 +276,7 @@
                     </div>
     	  	 			    
   	 			    <SPAN CLASS="itemText" TITLE="C++ file generated by the tool udm.exe.">
- 				        <LABEL ID="LABEL3" FOR="CPP_FILE">C++ file:</LABEL><br />
+ 				        <LABEL ID="LABEL3" FOR="CPP_FILE">Paradigm C++ file:</LABEL><br />
 	    		        <INPUT CLASS="itemText" TYPE="text" ID="CPP_FILE" TITLE="C++ file generated by the tool udm.exe.">
 
 		    	    </SPAN>

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Mon May  2 11:00:04 2011	(r3705)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/RawComponent.cpp	Mon May  2 11:00:36 2011	(r3706)
@@ -78,7 +78,7 @@
 	{
 [!if USE_CONSOLE]	  
 		// Setting up the console
-		GMEConsole::Console::setupConsole(ccpProject);
+		GMEConsole::Console::SetupConsole(ccpProject);
 [!endif]
 
 	  if(interactive)
@@ -123,7 +123,7 @@
 			udmDataDiagram.init = dummy;
 
 	#else
-			ASSERT((0,"Neither _DYNAMIC_META_DOM or _DYNAMIC_META_STATIC defined for dynamic loading"));
+			#error "Neither _DYNAMIC_META_DOM or _DYNAMIC_META_STATIC defined for dynamic loading"
 	#endif
 			// Loading the project
 			UdmGme::GmeDataNetwork dngBackend(udmDataDiagram);
@@ -148,7 +148,7 @@
 				currentObject=dngBackend.Gme2Udm(ccpFocus);
 			}
 
-			set<Udm::Object> selectedObjects;
+			std::set<Udm::Object> selectedObjects;
 
 			CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
 
@@ -177,17 +177,17 @@
 			UdmUtil::copy_assoc_map copyAssocMap;
 			copyAssocMap[currentObject]=nullObject; // currentObject may be null object
 
-			set<Udm::Object>::iterator p_CurrSelObject;
+			std::set<Udm::Object>::iterator p_CurrSelObject;
 			for(p_CurrSelObject=selectedObjects.begin();
 				p_CurrSelObject!=selectedObjects.end();p_CurrSelObject++)
 			{
-					pair<Udm::Object const, Udm::Object> item(*p_CurrSelObject, nullObject);
+					std::pair<Udm::Object const, Udm::Object> item(*p_CurrSelObject, nullObject);
 
-					pair<UdmUtil::copy_assoc_map::iterator, bool> insRes = copyAssocMap.insert(item);
+					std::pair<UdmUtil::copy_assoc_map::iterator, bool> insRes = copyAssocMap.insert(item);
 
 					if (!insRes.second)
 					{
-						ASSERT(NULL);
+						assert(false);
 					}
 
 			}
@@ -209,7 +209,7 @@
 
 
 			// Searching for selected objects
-			set<Udm::Object> selectedObjectsCache;
+			std::set<Udm::Object> selectedObjectsCache;
 
 			for( p_CurrSelObject=selectedObjects.begin();
 				p_CurrSelObject!=selectedObjects.end();p_CurrSelObject++)

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.cpp
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.cpp	Mon May  2 11:00:04 2011	(r3705)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.cpp	Mon May  2 11:00:36 2011	(r3706)
@@ -7,6 +7,8 @@
 #include <afxdlgs.h> // For CFileDialog
 [!endif]
 
+using namespace std;
+
 /*********************************************************************************/
 /* Initialization function. The framework calls it before preparing the backend. */
 /* Initialize here the settings in the config global object.					 */

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.h
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.h	Mon May  2 11:00:04 2011	(r3705)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/UdmApp.h	Mon May  2 11:00:36 2011	(r3706)
@@ -27,13 +27,7 @@
 
 public:
 	static int Initialize();
-	static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
-
-#ifdef _DEBUG
-	static string ExtractName(Udm::Object ob);
-#endif
-
-	
+	static void UdmMain(Udm::DataNetwork* p_backend, Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
 };
 
 #endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)

Modified: UDM/trunk/src/UIntWizVS/Templates/1033/UdmConsole.cpp
==============================================================================
--- UDM/trunk/src/UIntWizVS/Templates/1033/UdmConsole.cpp	Mon May  2 11:00:04 2011	(r3705)
+++ UDM/trunk/src/UIntWizVS/Templates/1033/UdmConsole.cpp	Mon May  2 11:00:36 2011	(r3706)
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "UdmConsole.h"
-#include "udmbase.h"
+#include "UdmBase.h"
 
 
 namespace GMEConsole