[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep Any.cpp,1.11,1.12 Any.h,1.8,1.9 Dumper.cpp,1.12,1.13 FCO.cpp,1.17,1.18 Sheet.cpp,1.8,1.9 Sheet.h,1.7,1.8

Fri Jul 30 16:21:11 CDT 2004

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

Modified Files:
	Any.cpp Any.h Dumper.cpp FCO.cpp Sheet.cpp Sheet.h 
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

Index: Any.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Any.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Any.cpp	30 Jul 2004 00:37:49 -0000	1.11
--- Any.cpp	30 Jul 2004 20:21:05 -0000	1.12
***************
*** 142,151 ****

- std::string Any::dumpMyKind()
- {
- 	return Any::getName();
- }
- 
- 
  std::string Any::getMyKindStr() const
  {
--- 142,145 ----
***************
*** 264,268 ****
  	h = "DECLARE_BONEXTENSION( BON::" + getMyKindStr() + ", " + getDispNameImpl() + ", " + getDispName()	+ " );\n";

! 	s = "IMPLEMENT_BONEXTENSION( " + global_vars.m_namespace_name + "::" + getDispName() + ", \"" + dumpMyKind() + "\" );\n";

  	m_globalSource += s;
--- 258,262 ----
  	h = "DECLARE_BONEXTENSION( BON::" + getMyKindStr() + ", " + getDispNameImpl() + ", " + getDispName()	+ " );\n";

! 	s = "IMPLEMENT_BONEXTENSION( " + global_vars.m_namespace_name + "::" + getDispName() + ", \"" + getName() + "\" );\n";

  	m_globalSource += s;

Index: Any.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Any.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Any.h	30 Jul 2004 00:37:49 -0000	1.8
--- Any.h	30 Jul 2004 20:21:05 -0000	1.9
***************
*** 88,92 ****

  	void dumpGlobals();
- 	std::string dumpMyKind();
  	std::string dumpOrnament( bool is_abstract = false);
  	std::string getDispNameImpl();
--- 88,91 ----

Index: Dumper.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Dumper.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Dumper.cpp	16 Jul 2004 22:39:06 -0000	1.12
--- Dumper.cpp	30 Jul 2004 20:21:05 -0000	1.13
***************
*** 534,538 ****
  void Dumper::fetchConfigurationNames( std::vector< std::string>& res)
  {
! 	BON::RegistryNode rn = this->m_BON_Project_Root_Folder->getRegistry()->getChild("BonExtender/SavedConfigurations");
  	if ( rn)
  	{
--- 534,538 ----
  void Dumper::fetchConfigurationNames( std::vector< std::string>& res)
  {
! 	BON::RegistryNode rn = Sheet::m_BON_Project_Root_Folder->getRegistry()->getChild("BonExtender/SavedConfigurations");
  	if ( rn)
  	{
***************
*** 591,595 ****
  		{
  			std::string path = "/BonExtender/SavedConfigurations/" + sc.m_currSelConfigStr;
! 			this->m_BON_Project_Root_Folder->getRegistry()->setValueByPath( path, "1");
  		}
  		// try to select extedAnc for each non to be extended fco
--- 591,595 ----
  		{
  			std::string path = "/BonExtender/SavedConfigurations/" + sc.m_currSelConfigStr;
! 			Sheet::m_BON_Project_Root_Folder->getRegistry()->setValueByPath( path, "1");
  		}
  		// try to select extedAnc for each non to be extended fco

Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FCO.cpp	30 Jul 2004 00:37:49 -0000	1.17
--- FCO.cpp	30 Jul 2004 20:21:05 -0000	1.18
***************
*** 42,46 ****
  		m_clique[i] = 0;
  	}
- 	m_isAbstract = m_ptr->getAttribute("IsAbstract")->getBooleanValue();
  }

--- 42,45 ----
***************
*** 883,887 ****
  	{
  		s = "IMPLEMENT_BONEXTENSION( " + global_vars.m_namespace_name + "::" + getDispName();
! 		s += ", \"" + dumpMyKind() + dump_Non_Exted_Desc_Kinds + "\"";
  		s += " );\n";
  	}
--- 882,886 ----
  	{
  		s = "IMPLEMENT_BONEXTENSION( " + global_vars.m_namespace_name + "::" + getDispName();
! 		s += ", \"" + getName() + dump_Non_Exted_Desc_Kinds + "\"";
  		s += " );\n";
  	}

Index: Sheet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Sheet.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Sheet.cpp	30 Jul 2004 00:37:49 -0000	1.8
--- Sheet.cpp	30 Jul 2004 20:21:05 -0000	1.9
***************
*** 10,16 ****

  Sheet * Sheet::m_theOnlyInstance = 0;
! 
  Sheet::Sheet()
! : m_projName(""),
  	m_rootFolder(),
  	m_fcoRepList(),
--- 10,16 ----

  Sheet * Sheet::m_theOnlyInstance = 0;
! /*static*/ BON::Folder Sheet::m_BON_Project_Root_Folder = BON::Folder(); // important: clear its content upon destruction
  Sheet::Sheet()
! 	: m_projName(""),
  	m_rootFolder(),
  	m_fcoRepList(),
***************
*** 104,114 ****

  	m_attributeList.clear();
! 	m_BON_Project_Root_Folder = BON::Folder();
  }

! void Sheet::setProjName( const std::string& name)
  {
! 	m_projName = name;
  }

--- 104,114 ----

  	m_attributeList.clear();
! 	Sheet::m_BON_Project_Root_Folder = BON::Folder();
  }

! void Sheet::setProject( BON::Project& project)
  {
! 	m_projName = project->getName();
  }

***************
*** 406,415 ****
  {
  	return elem->isInRootFolder();
- }
- 
- 
- void Sheet::setProjectRootFolder( BON::Folder& p)
- {
- 	m_BON_Project_Root_Folder = p;
  }

--- 406,409 ----

Index: Sheet.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Sheet.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Sheet.h	30 Jul 2004 00:37:49 -0000	1.7
--- Sheet.h	30 Jul 2004 20:21:05 -0000	1.8
***************
*** 33,37 ****
  	virtual bool build() = 0;
  	virtual bool finalize();
! 	void setProjName( const std::string& name);

  	FcoRep* createFcoRep( BON::FCO& ptr, BON::FCO& resp_ptr);
--- 33,37 ----
  	virtual bool build() = 0;
  	virtual bool finalize();
! 	void setProject( BON::Project& project );

  	FcoRep* createFcoRep( BON::FCO& ptr, BON::FCO& resp_ptr);
***************
*** 51,55 ****
  	Any* findAny( const BON::FCO& ptr);

! 	void setProjectRootFolder( BON::Folder& p);

  protected:
--- 51,55 ----
  	Any* findAny( const BON::FCO& ptr);

! 	static BON::Folder m_BON_Project_Root_Folder;

  protected:
***************
*** 94,98 ****
  	std::string m_projName;
  	RootFolder m_rootFolder;
- 	BON::Folder m_BON_Project_Root_Folder;

  private:
--- 94,97 ----