[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension BON2Component.cpp,1.10,1.11 BON2Component.h,1.6,1.7 BonExt.dsp,1.5,1.6 TokenEx.cpp,1.1,NONE TokenEx.h,1.1,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Tue Mar 9 20:50:20 CST 2004 

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension
In directory braindrain:/tmp/cvs-serv29957

Modified Files:
	BON2Component.cpp BON2Component.h BonExt.dsp 
Removed Files:
	TokenEx.cpp TokenEx.h 
Log Message:
Spring cleaning. Removed Aspects, Constraints, Parts
Made synched with MetaInt
Registry logic changed
Bugs: 
	connection inheritance ( m_connPtr changed during appendJoint)
	ReferencePort detection changed according to metainterpreter
Modified Files:
 	BON2Component.cpp BON2Component.h BonExt.dsp Gui/SelConf.cpp 
 	Rep/Any.cpp Rep/Any.h Rep/AtomRep.cpp Rep/AtomRep.h 
 	Rep/AttributeRep.cpp Rep/AttributeRep.h Rep/CodeGen.cpp 
	Rep/ConnJoint.cpp Rep/ConnJoint.h Rep/ConnectionRep.cpp 
 	Rep/ConnectionRep.h Rep/Dumper.cpp Rep/Dumper.h Rep/FCO.cpp 
 	Rep/FCO.h Rep/FcoRep.cpp Rep/FcoRep.h Rep/FolderRep.cpp 
 	Rep/FolderRep.h Rep/Method.cpp Rep/ModelRep.cpp Rep/ModelRep.h 
 	Rep/PointerItem.h Rep/ReferenceRep.cpp Rep/ReferenceRep.h 
 	Rep/RoleRep.h Rep/RootFolder.cpp Rep/RootFolder.h 
 	Rep/SetRep.cpp Rep/SetRep.h Rep/Sheet.cpp Rep/Sheet.h 
Removed Files:
 	TokenEx.cpp TokenEx.h Rep/AspectRep.cpp Rep/AspectRep.h 
 	Rep/ConstraintFuncRep.cpp Rep/ConstraintFuncRep.h 
 	Rep/ConstraintRep.cpp Rep/ConstraintRep.h Rep/PartRep.h 


CVS User: zolmol

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BON2Component.cpp	2 Mar 2004 19:21:10 -0000	1.10
--- BON2Component.cpp	10 Mar 2004 02:50:18 -0000	1.11
***************
*** 51,56 ****
  Component::~Component()
  {
- 	/*finalize( m_project );
- 	m_project = NULL;*/
  	if ( m_project ) {
  		m_project->finalizeObjects();
--- 51,54 ----
***************
*** 82,86 ****
  		m_toBeDeletedEntities.clear();
  		m_realObj.clear();
! 
  		if ( m_sheet != 0)  
  		{ 
--- 80,84 ----
  		m_toBeDeletedEntities.clear();
  		m_realObj.clear();
! 		m_projectRootFolder = BON::Folder(); // crucial!!!
  		if ( m_sheet != 0)  
  		{ 
***************
*** 929,937 ****
  				new_elem = m_sheet->createFolderRep( fco, (resp != BON::Object())?resp:fco);
  			else if ( obj->getObjectMeta().name() == "Aspect" )
! 				new_elem = m_sheet->createAspectRep( fco, (resp != BON::Object())?resp:fco);
  			else if ( obj->getObjectMeta().name() == "Constraint" )
! 				new_elem = m_sheet->createConstraintRep( fco);
  			else if ( obj->getObjectMeta().name() == "ConstraintFunc" )
! 				new_elem = m_sheet->createConstraintFuncRep( fco);
  			else if ( obj->getObjectMeta().name() == "BooleanAttribute" )
  				new_elem = m_sheet->createBoolAttributeRep( fco);
--- 927,935 ----
  				new_elem = m_sheet->createFolderRep( fco, (resp != BON::Object())?resp:fco);
  			else if ( obj->getObjectMeta().name() == "Aspect" )
! 				/*new_elem = m_sheet->createAspectRep( fco, (resp != BON::Object())?resp:fco)*/;
  			else if ( obj->getObjectMeta().name() == "Constraint" )
! 				/*new_elem = m_sheet->createConstraintRep( fco)*/;
  			else if ( obj->getObjectMeta().name() == "ConstraintFunc" )
! 				/*new_elem = m_sheet->createConstraintFuncRep( fco)*/;
  			else if ( obj->getObjectMeta().name() == "BooleanAttribute" )
  				new_elem = m_sheet->createBoolAttributeRep( fco);
***************
*** 971,975 ****
  			setMemberManager( *rel_it);
  		else if ( oper == Relation::HAS_ASPECT_OP)
! 			hasAspectManager( *rel_it);
  		else if ( oper == Relation::CONTAINMENT_OP)
  			containmentManager( *rel_it);
--- 969,973 ----
  			setMemberManager( *rel_it);
  		else if ( oper == Relation::HAS_ASPECT_OP)
! 			/*hasAspectManager( *rel_it)*/;
  		else if ( oper == Relation::CONTAINMENT_OP)
  			containmentManager( *rel_it);
***************
*** 977,983 ****
  			folderContainmentManager( *rel_it);
  		else if ( oper == Relation::ASPECT_MEMBER_OP)
! 			aspectMemberManager( *rel_it);
  		else if ( oper == Relation::HAS_CONSTRAINT_OP)
! 			hasConstraintManager( *rel_it);
  		else if ( oper == Relation::HAS_ATTRIBUTE_OP)
  			hasAttributeManager( *rel_it);
--- 975,981 ----
  			folderContainmentManager( *rel_it);
  		else if ( oper == Relation::ASPECT_MEMBER_OP)
! 			/*aspectMemberManager( *rel_it)*/;
  		else if ( oper == Relation::HAS_CONSTRAINT_OP)
! 			/*hasConstraintManager( *rel_it)*/;
  		else if ( oper == Relation::HAS_ATTRIBUTE_OP)
  			hasAttributeManager( *rel_it);
***************
*** 1193,1229 ****
  
  
- void Component::hasAspectManager( Relation & rel_it)
- {
- 	if ( rel_it.getOperation() == Relation::HAS_ASPECT_OP )
- 	{
- 		ObjPointer obj1 = rel_it.getOp1();
- 		ObjPointer obj2 = rel_it.getOp2();
- 
- 		::FCO* model = m_sheet->findFCO( rel_it.getOp1());
- 		Any* aspect = m_sheet->findAny( rel_it.getOp2());
- 		if ( model != 0 && aspect != 0)
- 		{
- 			ModelRep * model_obj = dynamic_cast< ModelRep * > ( model );
- 			AspectRep * aspect_obj = dynamic_cast< AspectRep * > ( aspect );
- 			if (!aspect_obj) 
- 				global_vars.err << "ERROR after dynamic_cast - has aspect - aspect is 0\n";
- 			if (!model_obj || !aspect_obj || model->getMyKind() != Any::MODEL ) 
- 				global_vars.err << "ERROR after dynamic_cast " << (aspect_obj?"aspect is 0":(model_obj?"model is 0":"wrong kind")) << "\n";
- 			else
- 				model_obj->addAspect( aspect_obj); //adding the aspect_ptr to the model
- 
- 			//TO( obj1->getName() + " has aspect " + obj2->getName() );
- 		}
- 		else
- 		{
- 			if ( model == 0 )
- 				global_vars.err << "No model peer present in has_aspect relation. " << obj1->getName() << " missing.\n";
- 			if ( aspect == 0 )
- 				global_vars.err << "No aspect peer present in has_aspect relation. " <<	obj2->getName() << " missing.\n";
- 		} // if
- 	} // if
- }
- 
- 
  void Component::containmentManager( Relation & rel_it)
  {
--- 1191,1194 ----
***************
*** 1313,1402 ****
  			if ( any == 0 )
  				global_vars.err << "No element peer present in folder_containment relation. " << obj2->getName() << " missing.\n";
- 		} // if
- 	} // if
- }
- 
- 
- void Component::aspectMemberManager( Relation & rel_it)
- {
- 	if ( rel_it.getOperation() == Relation::ASPECT_MEMBER_OP )
- 	{
- 		ObjPointer obj1 = rel_it.getOp1();
- 		ObjPointer obj2 = rel_it.getOp2();
- 
- 		Any* aspect = m_sheet->findAny( rel_it.getOp1());
- 		::FCO* member = m_sheet->findFCO( rel_it.getOp2());
- 		if ( aspect != 0 && member != 0)
- 		{
- 			if ( aspect->getMyKind() != Any::ASPECT ) global_vars.err << "Not aspect consists of FCOs\n";
- 
- 			AspectRep * aspect_obj = dynamic_cast< AspectRep * > ( aspect );
- 			if ( !aspect_obj) global_vars.err << "ERROR after dynamic_cast - aspect member - aspect is 0\n";
- 
- 			if ( rel_it.getOp3() != BON::Object() && 
- 				rel_it.getOp4() != BON::Object()) // means a role is only the aspect member
- 			{
- 				std::string rolename = Connection( rel_it.getOp3())->getAttribute("Rolename")->getStringValue();
- 				bool is_a_port = Connection( rel_it.getOp3())->getAttribute("IsPort")->getBooleanValue();
- 				std::string card = Connection( rel_it.getOp3())->getAttribute("Cardinality")->getStringValue();
- 
- 				ModelRep * model = static_cast<ModelRep*>( m_sheet->findFCO( rel_it.getOp4())); // op4 is the container model
- 				if ( model != 0)
- 				{
- 					RoleRep role( 
- 						rolename,
- 						member,
- 						model,
- 						is_a_port, 
- 						card,
- 						false, // inh flag
- 						false); // long form flag -> will be set later by initRoleNames
- 
- 					aspect_obj->addRRole( role);
- 				}
- 				else // model cannot be found //<!> needs testing
- 					global_vars.err << "No model (op4) present in aspect_member relation. " << rel_it.getOp4()->getName() << " missing.\n";
- 			}
- 			else // means regular aspect membership
- 				aspect_obj->addFCO( member);
- 			//TO( obj1->getName() + " aspect member " + obj2->getName() );
- 		}
- 		else
- 		{
- 			if ( aspect == 0 )
- 				global_vars.err << "No aspect peer present in aspect_member relation. " << obj1->getName() << " missing.\n";
- 			if ( member == 0 )
- 				global_vars.err << "No member peer present in aspect_member relation. " << obj2->getName() << " missing.\n";
- 		} // if
- 	} // if
- }
- 
- 
- void Component::hasConstraintManager( Relation & rel_it)
- {
- 	if ( rel_it.getOperation() == Relation::HAS_CONSTRAINT_OP )
- 	{
- 		ObjPointer obj1 = rel_it.getOp1();
- 		ObjPointer obj2 = rel_it.getOp2();
- 
- 		Any* any = m_sheet->findAny( rel_it.getOp1());
- 		Any* constraint = m_sheet->findAny( rel_it.getOp2());
- 		if ( any != 0 && constraint != 0)
- 		{
- 			ConstraintRep *constraint_obj = static_cast< ConstraintRep * >(constraint);
- 			if (any && (any->isFCO() || any->getMyKind() == Any::FOLDER)) 
- 			{
- 				any->addInitialConstraintRep( constraint_obj);
- 				constraint_obj->attachedTo();
- 			}
- 			else
- 				global_vars.err << constraint_obj->getName() << " constraint is owned by " << any->getName() << " which is neither FCO nor Folder\n";
- 		}
- 		else
- 		{
- 			if ( any == 0 )
- 				global_vars.err << "No owner (FCO or Folder) peer present in has_constraint relation. " << obj1->getName() << " missing.\n";
- 			if ( constraint == 0 )
- 				global_vars.err << "No Constraint peer present in has_constraint relation. " <<  obj2->getName() + " missing.\n";
  		} // if
  	} // if
--- 1278,1281 ----

Index: BON2Component.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BON2Component.h	2 Mar 2004 19:21:10 -0000	1.6
--- BON2Component.h	10 Mar 2004 02:50:18 -0000	1.7
***************
*** 49,58 ****
  //###############################################################################################################################################
  
- struct BONCompare
- {
-   bool operator()( const FCO& , const FCO& ) const;
- 	bool operator()( const Entity&, const Entity&) const;
- };
- 
  class Component
  {
--- 49,52 ----
***************
*** 104,108 ****
  
  private:
! 	// pass it later to the sheet
  	Folder 	m_projectRootFolder;
  	Sheet * m_sheet;
--- 98,102 ----
  
  private:
! 	// pass it later to the sheet and null it before the Component reaches its constructor!!!
  	Folder 	m_projectRootFolder;
  	Sheet * m_sheet;
***************
*** 116,124 ****
  	void associationClassManager( Relation & );
  	void setMemberManager( Relation & );
- 	void hasAspectManager( Relation & );
  	void containmentManager( Relation & );
  	void folderContainmentManager( Relation & );
- 	void aspectMemberManager( Relation & );
- 	void hasConstraintManager( Relation & );
  	void hasAttributeManager( Relation & );
  
--- 110,115 ----

Index: BonExt.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BonExt.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BonExt.dsp	26 Feb 2004 17:12:46 -0000	1.5
--- BonExt.dsp	10 Mar 2004 02:50:18 -0000	1.6
***************
*** 220,227 ****
  SOURCE=.\relation.cpp
  # End Source File
- # Begin Source File
- 
- SOURCE=.\TokenEx.cpp
- # End Source File
  # End Group
  # Begin Group "GUI"
--- 220,223 ----
***************
*** 487,494 ****
  
  SOURCE=.\relation.h
- # End Source File
- # Begin Source File
- 
- SOURCE=.\TokenEx.h
  # End Source File
  # End Group
--- 483,486 ----

--- TokenEx.cpp DELETED ---

--- TokenEx.h DELETED ---

More information about the GME-commit mailing list