[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp AspectSpecDlg.cpp,1.4,1.5

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp
In directory braindrain:/tmp/cvs-serv29833/Asp

Modified Files:
	AspectSpecDlg.cpp 
Log Message:
-Aspect ordering taken into account during the drop-down list
-Aspect ordering moved ahead
-Registry logic changed
-ConnJoint appending correction (new owner has to set in m_connPtr)
-ConnJoint::intInherit corrected: roles of References to be used
-ConnJoint::intInherit corrected: transitive references not dumped
-ESML paradigm/import xml error: orphan attributes must not be dumped along with global attributes
-ReferenceRep::finalize modified not to calculate m_allReferences (transitive)

Modified Files:
 	BON2Component.cpp Asp/AspectSpecDlg.cpp Rep/Any.cpp Rep/Any.h 
 	Rep/AspectRep.cpp Rep/Broker.cpp Rep/Broker.h 
 	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/FolderRep.cpp Rep/FolderRep.h Rep/ModelRep.cpp 
 	Rep/ModelRep.h Rep/ReferenceRep.cpp Rep/ReferenceRep.h 
 	Rep/Sheet.cpp 


CVS User: zolmol

Index: AspectSpecDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Asp/AspectSpecDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AspectSpecDlg.cpp	8 Mar 2004 22:22:59 -0000	1.4
--- AspectSpecDlg.cpp	10 Mar 2004 02:36:28 -0000	1.5
***************
*** 104,110 ****
  	void * ptr;
  	GetEntry( rowID, role_name, kind_asp, is_prim, ptr);
! 	if ( role_name == "N/A") TO("ERROR");
  	const FCO * fco_ptr = static_cast<const FCO*>( ptr);
  	if ( fco_ptr)
  		if ( fco_ptr->getMyKind() == Any::MODEL)
  		{
--- 104,111 ----
  	void * ptr;
  	GetEntry( rowID, role_name, kind_asp, is_prim, ptr);
! 	if ( role_name == "N/A") TO("Internal Error: GetEntry failed. Empty rolename");
  	const FCO * fco_ptr = static_cast<const FCO*>( ptr);
  	if ( fco_ptr)
+ 	{
  		if ( fco_ptr->getMyKind() == Any::MODEL)
  		{
***************
*** 116,138 ****
  			const ReferenceRep * r_ptr = static_cast< const ReferenceRep *>(ptr);
  			std::vector< AspectRep *> asps = r_ptr->getAspectsIntersection();
- 			//std::vector<const ModelRep *> models_ref_refers = r_ptr->getModelRefVector();//all models the reference refers to
- 			//std::vector<const ModelRep *>::iterator model_it = models_ref_refers.begin();
- 			//for( ; model_it != models_ref_refers.end(); ++model_it)
  			std::vector< AspectRep *>::iterator asp_it = asps.begin();
  			for( ; asp_it != asps.end(); ++asp_it)
  			{
- 				//(*model_it)->getAspectNames( aspects); //appends to the list
  				aspects.AddTail( (*asp_it)->getName().c_str());
  			}
- 
- 			/*const ModelRep * mod_ref = r_ptr->getModelRef();
- 			if (mod_ref && mod_ref->getMyKind() == Any::MODEL)
- 			{
- 				mod_ref->getAspectNames( aspects);
- 			}
- 			else TO("ERROR: reference doesn't referring to Model during Aspect fetch");*/
  		}
! 		else TO("ERROR: why has other type than Model and Ref has Kindaspect?");
! 	else TO("ERROR: zero pointer");
  }
  
--- 117,129 ----
  			const ReferenceRep * r_ptr = static_cast< const ReferenceRep *>(ptr);
  			std::vector< AspectRep *> asps = r_ptr->getAspectsIntersection();
  			std::vector< AspectRep *>::iterator asp_it = asps.begin();
  			for( ; asp_it != asps.end(); ++asp_it)
  			{
  				aspects.AddTail( (*asp_it)->getName().c_str());
  			}
  		}
! 		else TO("Internal Error: why other type than Model and Ref has Kindaspect?");
! 	}
! 	else TO("Internal Error: zero pointer");
  }