[commit] r1401 - trunk/Paradigms/MetaGME/MetaInterpreter/Rep

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jul  8 11:24:21 2011
New Revision: 1401

Log:
Remove Reference has no valid aspect warning, since we already warn about models not having an aspect. Format Model has no aspect defined and may contain warning better

Modified:
   trunk/Paradigms/MetaGME/MetaInterpreter/Rep/Dumper.cpp
   trunk/Paradigms/MetaGME/MetaInterpreter/Rep/ModelRep.cpp

Modified: trunk/Paradigms/MetaGME/MetaInterpreter/Rep/Dumper.cpp
==============================================================================
--- trunk/Paradigms/MetaGME/MetaInterpreter/Rep/Dumper.cpp	Thu Jun 30 15:15:53 2011	(r1400)
+++ trunk/Paradigms/MetaGME/MetaInterpreter/Rep/Dumper.cpp	Fri Jul  8 11:24:21 2011	(r1401)
@@ -523,7 +523,7 @@
 								if( asp_intersect.empty())
 								{
 									// error since the default selection failure means error ignoring what the registry value may have
-									global_vars.err << MSG_WARNING << "Warning: Reference \"" << reference->getPtr() << "\" has no valid aspect. Intersection of aspects the referred models might have is empty.\n";
+									// global_vars.err << MSG_WARNING << "Warning: Reference \"" << reference->getPtr() << "\" has no valid aspect. Intersection of aspects the referred models might have is empty.\n";
 									//aspect_selection_impossible = true; // not used anymore here
 								}
 							}

Modified: trunk/Paradigms/MetaGME/MetaInterpreter/Rep/ModelRep.cpp
==============================================================================
--- trunk/Paradigms/MetaGME/MetaInterpreter/Rep/ModelRep.cpp	Thu Jun 30 15:15:53 2011	(r1400)
+++ trunk/Paradigms/MetaGME/MetaInterpreter/Rep/ModelRep.cpp	Fri Jul  8 11:24:21 2011	(r1401)
@@ -728,9 +728,11 @@
 			std::vector<std::string> rolenames;
 			std::transform(m_finalRoleMap.begin(), m_finalRoleMap.end(), std::back_inserter(rolenames),
 				[](const RoleMap::value_type& p){ return p.first->getNamespace() + "::" + p.first->getName(); });
-			global_vars.err << MSG_WARNING << "Warning: Model \"" << m_ptr << "\" has no aspect defined and may contain:";
+			std::string children;
 			std::for_each(m_finalRoleMap.begin(), m_finalRoleMap.end(),
-				[](const RoleMap::value_type& p) { global_vars.err << MSG_WARNING << " " << p.first->getName() << " "; });
+				[&](const RoleMap::value_type& p) { children += p.first->getName() + ", ";  });
+			children = children.substr(0, children.size() - 2);
+			global_vars.err << MSG_WARNING << "Warning: Model \"" << m_ptr << "\" has no aspect defined and may contain: " + children;
 		}
 		AspectRep * asp = s->createAspectRep( BON::FCO(), BON::FCO());
 		this->addFinalAspect( asp);