[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Engine.cpp,NONE,1.1 BON2Component.cpp,1.21,1.22 BON2Component.h,1.10,1.11 MetaGME2004.dsp,1.13,1.14

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

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

Modified Files:
	BON2Component.cpp BON2Component.h MetaGME2004.dsp 
Added Files:
	BON2Engine.cpp 
Log Message:
Cosmetics. Moved "generic" part to a separate implementation file.


CVS User: zolmol

--- NEW FILE: BON2Engine.cpp ---
#include "BON2Component.h"

#include "logger.h"

#include "string"

#include "Dumper.h"
#include "NameSpecDlg.h"
#include "globals.h"

extern Globals global_vars;
extern NameSpecDlg * dlg;

namespace BON
{

void Component::entityBuilder( const Model& model, const Folder& parent)
{
	// handling sets
[...1401 lines suppressed...]
				rel_it2->getOperation() == Relation::HAS_ATTRIBUTE_OP )
			{
				//CHECK if the same attribute is contained twice by the FCO
				if ( rel_it1->getOp1() == rel_it2->getOp1() 
					&& rel_it1->getOp2() == rel_it2->getOp2() 
					&& rel_it1 != rel_it2)
				{
					ObjPointer o1 = rel_it1->getOp1();
						
					ObjPointer o2 = rel_it1->getOp2();
					global_vars.err << "Internal error: Same attribute " << o2->getName() <<
						" contained twice by " << o1->getName() << "\n";
				}
			}
		}
	}
#endif
}

}; // namespace BON

Index: BON2Component.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** BON2Component.cpp	30 Jul 2004 00:10:22 -0000	1.21
--- BON2Component.cpp	30 Jul 2004 20:24:45 -0000	1.22
***************
*** 187,1071 ****
  
  
- void Component::entityBuilder( const Model& model, const Folder& parent)
- {
- 	// handling sets
- 	std::set<Set> aspects = model->getChildSets();
- 	std::set<Set>::iterator aspect = aspects.begin();
- 	for( ; aspect != aspects.end(); ++aspect)
- 	{
- 		Entity new_elem( parent, *aspect);
[...1583 lines suppressed...]
- #endif
- #endif
- 
  	global_vars.err.flushit();
  	global_vars.err.m_proj = (Project) 0;
  }
--- 446,451 ----
  
  	global_vars.err << MSG_NORMAL << "\nEND OF LOG\n";
  	global_vars.err.flushit();
+ 	global_vars.err.close();
  	global_vars.err.m_proj = (Project) 0;
  }
***************
*** 1964,1967 ****
  
  }; // namespace BON
- 
- 
--- 517,518 ----

Index: BON2Component.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Component.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BON2Component.h	30 Jul 2004 00:10:22 -0000	1.10
--- BON2Component.h	30 Jul 2004 20:24:45 -0000	1.11
***************
*** 104,110 ****
  	Entity entitySearch( const ObjPointer& p_ptr);
  	bool checkForProxies();
! 	
  	void CHECK();
- 	void Show();
  
  private:
--- 104,109 ----
  	Entity entitySearch( const ObjPointer& p_ptr);
  	bool checkForProxies();
! 
  	void CHECK();
  
  private:
***************
*** 119,125 ****
  	void associationClassManager( Relation & );
  	void setMemberManager( Relation & );
- 	void hasAspectManager( Relation & );
  	void containmentManager( Relation & );
  	void folderContainmentManager( Relation & );
  	void aspectMemberManager( Relation & );
  	void hasConstraintManager( Relation & );
--- 118,124 ----
  	void associationClassManager( Relation & );
  	void setMemberManager( Relation & );
  	void containmentManager( Relation & );
  	void folderContainmentManager( Relation & );
+ 	void hasAspectManager( Relation & );
  	void aspectMemberManager( Relation & );
  	void hasConstraintManager( Relation & );

Index: MetaGME2004.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/MetaGME2004.dsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MetaGME2004.dsp	30 Jul 2004 00:10:22 -0000	1.13
--- MetaGME2004.dsp	30 Jul 2004 20:24:45 -0000	1.14
***************
*** 305,308 ****
--- 305,313 ----
  # Begin Source File
  
+ SOURCE=.\BON2Engine.cpp
+ # SUBTRACT CPP /YX /Yc /Yu
+ # End Source File
+ # Begin Source File
+ 
  SOURCE="../../../SDK/BON/BONImpl.cpp"
  # SUBTRACT CPP /YX /Yc /Yu