[Mobies-commit] [commit] r4251 - in GReAT/trunk/Tools: CodeGenerator/CG_interpreter CodeGenerator/CodeGenerator UMTInterpreters/GReAT Master Interpreter

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Feb  6 11:26:18 2014
New Revision: 4251

Log:
Dont require selectedobjs, formatting

Modified:
   GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp
   GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GeneralBackend.cpp
   GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp
   GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp

Modified: GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp	Tue Jan 28 23:40:20 2014	(r4250)
+++ GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp	Thu Feb  6 11:26:18 2014	(r4251)
@@ -145,16 +145,17 @@
 
 			std::set<Udm::Object> selectedObjects;
 
-			CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
-
-			MGACOLL_ITERATE(IMgaFCO,ccpSelObject){		 
-				Udm::Object currObj;
-				if(MGACOLL_ITER)
-				{
-					currObj=dngBackend.Gme2Udm(MGACOLL_ITER);
-				}
-			 selectedObjects.insert(currObj);
-			}MGACOLL_ITERATE_END;
+			if (selectedobjs)
+			{
+				MGACOLL_ITERATE(IMgaFCO, selectedobjs) {
+					Udm::Object currObj;
+					if (MGACOLL_ITER)
+					{
+						currObj=dngBackend.Gme2Udm(MGACOLL_ITER);
+					}
+					selectedObjects.insert(currObj);
+				} MGACOLL_ITERATE_END;
+			}
 
 #ifdef _ACCESS_MEMORY
 			// Creating Cache

Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GeneralBackend.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GeneralBackend.cpp	Tue Jan 28 23:40:20 2014	(r4250)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GeneralBackend.cpp	Thu Feb  6 11:26:18 2014	(r4251)
@@ -20,7 +20,7 @@
 
 const Uml::Diagram GeneralBackend::getDiagram( const std::string& name) const throw (CGEx)
 {
-	const Udm::DataNetwork* backend= getBackend( name);
+	const Udm::DataNetwork* backend = getBackend( name);
 	if ( NULL== backend)
 		throw CGEx("FATAL: Backend: "+ name+ " does not exist.");
 	return Uml::Diagram::Cast( backend->GetRootObject());

Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp	Tue Jan 28 23:40:20 2014	(r4250)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp	Thu Feb  6 11:26:18 2014	(r4251)
@@ -177,16 +177,18 @@
 
 			std::set<Udm::Object> selectedObjects;
 
-			CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
-
-			MGACOLL_ITERATE(IMgaFCO,ccpSelObject){		 
-				Udm::Object currObj;
-				if(MGACOLL_ITER)
-				{
-					currObj=dngBackend.Gme2Udm(MGACOLL_ITER);
-				}
-			 selectedObjects.insert(currObj);
-			}MGACOLL_ITERATE_END;
+			if (selectedobjs)
+			{
+				MGACOLL_ITERATE(IMgaFCO, selectedobjs)
+				{		 
+					Udm::Object currObj;
+					if (MGACOLL_ITER)
+					{
+						currObj=dngBackend.Gme2Udm(MGACOLL_ITER);
+					}
+					selectedObjects.insert(currObj);
+				} MGACOLL_ITERATE_END;
+			}
 
 #ifdef _ACCESS_MEMORY
 			// Creating Cache

Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp	Tue Jan 28 23:40:20 2014	(r4250)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp	Thu Feb  6 11:26:18 2014	(r4251)
@@ -194,7 +194,8 @@
 		if(param == GREAT_SILENT_MODE || configName == "")
 		{
 			configName = CUdmApp::mgaDir + (string)cnf.name() + ".mga";
-			if(((string)cnf.ConfigFile()).empty()) cnf.ConfigFile() = configName;
+			if (((string)cnf.ConfigFile()).empty())
+				cnf.ConfigFile() = configName;
 		}
 
 		if(grName == "")