[Mobies-commit] [commit] r3560 - GReAT/trunk/Tools/MetaGME2UMX

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Nov 18 13:32:26 2010
New Revision: 3560

Log:
Generate refport container associations for references pointing to derived port containers

Modified:
   GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp

Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp	Thu Nov 18 13:20:01 2010	(r3559)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp	Thu Nov 18 13:32:26 2010	(r3560)
@@ -1235,10 +1235,11 @@
 	trans(port_containments, base_port_containers, std::mem_fun_ref(&MetaGME::Containment::dstContainment_end));
 	std::set<MetaGME::BaseFCO> base_port_containers_;
 	trans(base_port_containers, base_port_containers_, std::ptr_fun(&RefByProxy));
+	std::set<std::set<MetaGME::BaseFCO> > base_port_containers_and_subtypes;
+	trans(base_port_containers_, base_port_containers_and_subtypes, std::ptr_fun(&GetSelfAndSubtypes));
 
 	MetaGME::Model (*Model_cast)(const Udm::Object&) = &MetaGME::Model::Cast;
-	trans(base_port_containers, port_containers, std::ptr_fun(Model_cast));
-	// FIXME: we should also look down in the inheritance hierarchy for port_containments
+	trans(flatten_set(base_port_containers_and_subtypes), port_containers, std::ptr_fun(Model_cast));
 	}
 
 	// Now compute refport_containers: the references that refer to port_containers