[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension BON2Engine.cpp,NONE,1.1 BON2Component.cpp,1.18,1.19 BON2Component.h,1.9,1.10 Globals.h,1.6,1.7 logger.cpp,1.2,1.3 logger.h,1.2,1.3

Fri Jul 30 16:21:11 CDT 2004

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

Modified Files:
	BON2Component.cpp BON2Component.h Globals.h logger.cpp 
	logger.h 
Added Files:
	BON2Engine.cpp 
Log Message:
1.Bug in case of equivalences at IMPLEMENT_ macros generated for folders.
2.Cosmetics (sync with MetaInt, using console for output).

CVS User: zolmol

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

#include "logger.h"

#include "string"

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

extern Globals global_vars;

namespace BON
{

void Component::entityBuilder( const Model& model, const Folder& parent)
{
	// handling sets
	std::set<Set> aspects = model->getChildSets();
	std::set<Set>::iterator aspect = aspects.begin();
[...1402 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/BonExtension/BON2Component.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** BON2Component.cpp	30 Jul 2004 00:37:49 -0000	1.18
--- BON2Component.cpp	30 Jul 2004 20:21:04 -0000	1.19
***************
*** 79,83 ****
  		m_realObj.clear();

! 		m_projectRootFolder = (Folder)NULL; // crucial!!!

  		if ( m_sheet != 0)  
--- 79,83 ----
  		m_realObj.clear();

! 		Sheet::m_BON_Project_Root_Folder = (Folder)NULL; // crucial!!!

[...1726 lines suppressed...]
  	}

  	if ( Sheet::checkInstance())
! 		global_vars.err << MSG_ERROR << "Internal error: Merged Paradigm Sheet object still exists\n";

  	global_vars.dmp_h.close();
  	global_vars.dmp_s.close();
! 
! 	global_vars.err << MSG_NORMAL << "\nEND OF LOG\n";
! 	global_vars.err.flushit();
! 	global_vars.err.close();
! 	global_vars.err.m_proj = (Project) 0;
  }

***************
*** 1802,1804 ****

  }; // namespace BON
- 
--- 500,501 ----

Index: BON2Component.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/BON2Component.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BON2Component.h	16 Jul 2004 22:39:06 -0000	1.9
--- BON2Component.h	30 Jul 2004 20:21:04 -0000	1.10
***************
*** 74,80 ****
  	std::string m_projectName;

- 	// pass it later to the sheet and null it before the Component reaches its destructor!!!
- 	Folder m_projectRootFolder;
- 
  	Entities m_entities;
  	//Entities m_toBeDeletedEntities;
--- 74,77 ----
***************
*** 107,116 ****

  	void CHECK();
- 	void Show();

  private:
  	Sheet * m_sheet;
  	void createSheet(); // TODO: modify this method to create your specific object
! 	bool populateSheet( const std::string& name);
  	bool executeSheet();
  	void deleteSheet();
--- 104,112 ----

  	void CHECK();

  private:
  	Sheet * m_sheet;
  	void createSheet(); // TODO: modify this method to create your specific object
! 	bool populateSheet( Project& project );
  	bool executeSheet();
  	void deleteSheet();

Index: Globals.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Globals.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Globals.h	17 Mar 2004 00:24:13 -0000	1.6
--- Globals.h	30 Jul 2004 20:21:04 -0000	1.7
***************
*** 4,13 ****
  #include "fstream"
  #include "string"

  class Globals
  {
  public:
! 	Globals(): 
! 			err_file_name("\\ParadigmBonExt.log")
  		, header_backup_name("")
  		, header_file_name("\\ParadigmBonExtension.h")
--- 4,14 ----
  #include "fstream"
  #include "string"
+ #include "LogStream.h"

  class Globals
  {
  public:
! 	Globals() 
! 		: err_file_name("\\ParadigmBonExt.log")
  		, header_backup_name("")
  		, header_file_name("\\ParadigmBonExtension.h")
***************
*** 18,22 ****
  		{ }

! 	std::ofstream err;
  	std::ofstream dmp;
  	std::ofstream dmp_s;
--- 19,23 ----
  		{ }

! 	LogStream     err;
  	std::ofstream dmp;
  	std::ofstream dmp_s;

Index: logger.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/logger.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** logger.cpp	16 Jun 2004 18:35:00 -0000	1.2
--- logger.cpp	30 Jul 2004 20:21:04 -0000	1.3
***************
*** 8,42 ****
  extern Globals global_vars;

- extern int ind;
- 
- std::string indStr();
- 
- void DMP_H(const char * msg)
- {
- 	global_vars.dmp_h << msg;
- }
- 
- void DMP_S(const char * msg)
- {
- 	global_vars.dmp_s << msg;
- }
- 
- 
- std::string indStr()
- {
- 	std::string ind_str = "";
- 	for( int i = 0; i < ind; ++i) ind_str +="   ";
- 	return ind_str;
- }
- 
- void DMP(const std::string& msg) { DMP( msg.c_str() ); }
- void DMP_H(const std::string& msg) { DMP_H( msg.c_str() ); }
- void DMP_S(const std::string& msg) { DMP_S( msg.c_str() ); }
- 
- void TO(const char * msg) { AfxMessageBox(msg); }
- void TO(const CString msg) { AfxMessageBox(msg); }
- void TO(const std::string msg) { AfxMessageBox(msg.c_str()); }
- 
- 
  bool existsFile( const char * src_name)
  {
--- 8,11 ----

Index: logger.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/logger.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** logger.h	14 Dec 2003 20:55:40 -0000	1.2
--- logger.h	30 Jul 2004 20:21:04 -0000	1.3
***************
*** 6,22 ****
  #include "string"
  #include "algorithm"

! std::string indStr();

! void DMP_H(const char * msg);
! void DMP_S(const char * msg);
! std::string indStr();
! void DMP(const std::string& msg);
! void DMP_H(const std::string& msg);
! void DMP_S(const std::string& msg);

! void TO(const char * msg);
! void TO(const CString msg);
! void TO(const std::string msg);

--- 6,35 ----
  #include "string"
  #include "algorithm"
+ #include "globals.h"

! extern Globals global_vars;

! inline void DMP_H(const char * msg)
! {
! 	global_vars.dmp_h << msg;
! }

! inline void DMP_S(const char * msg)
! {
! 	global_vars.dmp_s << msg;
! }
! 
! 
! inline void TO(const char * msg) 
! { 
! 	//AfxMessageBox(msg); 
! 	global_vars.err << MSG_ERROR << msg << "\n" << MSG_NORMAL;
! }
! 
! inline void TO(const CString msg) {		TO( (LPCTSTR) msg); }
! inline void TO(const std::string msg) { TO( msg.c_str()); }
! inline void DMP(const std::string& msg) { DMP( msg.c_str() ); }
! inline void DMP_H(const std::string& msg) { DMP_H( msg.c_str() ); }
! inline void DMP_S(const std::string& msg) { DMP_S( msg.c_str() ); }