[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Any.cpp,1.16,1.17 Any.h,1.9,1.10 ConnJoint.cpp,1.12,1.13 ConstraintFuncRep.cpp,1.3,1.4 Dumper.cpp,1.30,1.31 FolderRep.cpp,1.13,1.14 ModelRep.cpp,1.17,1.18 RoleRep.cpp,1.5,1.6

Fri Sep 22 23:27:15 CDT 2006

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory escher:/tmp/cvs-serv13338/Rep

Modified Files:
	Any.cpp Any.h ConnJoint.cpp ConstraintFuncRep.cpp Dumper.cpp 
	FolderRep.cpp ModelRep.cpp RoleRep.cpp 
Log Message:
MetaInt made namespacish.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: Any.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Any.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Any.cpp	21 Jul 2006 19:31:18 -0000	1.16
--- Any.cpp	22 Sep 2006 22:27:13 -0000	1.17
***************
*** 73,76 ****
--- 73,77 ----
  		{
  			if ( *it == m_ptr) continue;
+ 			if ((*it)->getObjectMeta().name().find("Proxy") != std::string::npos) continue;//ignore proxies (from m_equivs) when determining namespace
  			all_equivs_in_lib = (*it)->isInLibrary();
  		}
***************
*** 81,85 ****
  		{
  			// if object is from a library its m_parentFolder variable holds the librootfolder (a readwriteable object)
- 			ASSERT(0);
  			ASSERT( !m_parentFolder->isInLibrary());
  			BON::Folder parent( m_parentFolder);
--- 82,85 ----
***************
*** 105,108 ****
--- 105,113 ----
  {
  	m_namespace = Dumper::getInstance()->getNamespace();
+ }
+ 
+ std::string Any::getNamespace() const
+ {
+ 	return m_namespace;
  }
  

Index: Any.h
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Any.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Any.h	21 Jul 2006 19:31:18 -0000	1.9
--- Any.h	22 Sep 2006 22:27:13 -0000	1.10
***************
*** 71,74 ****
--- 71,76 ----
  	void initNamespace();
  	void resetNamespace();
+ 	std::string getNamespace() const;
+ 
  	virtual KIND_TYPE getMyKind() const = 0;
  	std::string getMyKindStr() const;

Index: ConstraintFuncRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConstraintFuncRep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConstraintFuncRep.cpp	21 Jul 2006 19:31:18 -0000	1.3
--- ConstraintFuncRep.cpp	22 Sep 2006 22:27:13 -0000	1.4
***************
*** 43,47 ****
  	}
  	m_context = contexttype;
! 	bool modify = true;// if we modify the context that is just for the ConstraintManager's sake (otherwise it would crash)
  	if( modify && m_ptr->isInLibrary() && !m_namespace.empty())
  	{
--- 43,47 ----
  	}
  	m_context = contexttype;
! 	bool modify = false;// if we modify the context that is just for the ConstraintManager's sake (otherwise it would crash)
  	if( modify && m_ptr->isInLibrary() && !m_namespace.empty())
  	{

Index: ModelRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ModelRep.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ModelRep.cpp	21 Jun 2005 17:16:46 -0000	1.17
--- ModelRep.cpp	22 Sep 2006 22:27:13 -0000	1.18
***************
*** 712,715 ****
--- 712,718 ----
  					std::string str_cons_name;
  					str_cons_name = "Valid" + getName() + "PartCardinality" + std::string(str_id);
+ 					int pos = str_cons_name.find( "::");
+ 					if( pos != std::string::npos) 
+ 						str_cons_name.replace( pos, 2, 2, '_');
  
  					int iEventMask = 0;

Index: RoleRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/RoleRep.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RoleRep.cpp	30 Jul 2004 00:10:23 -0000	1.5
--- RoleRep.cpp	22 Sep 2006 22:27:13 -0000	1.6
***************
*** 139,143 ****
  { 
  	if ( m_longForm) return m_ptr->getName() + m_roleName;
! 	else if (m_roleName != "") return m_roleName;
  	else return m_ptr->getName();
  }
--- 139,143 ----
  { 
  	if ( m_longForm) return m_ptr->getName() + m_roleName;
! 	else if (m_roleName != "") return (m_ptr->getNamespace().empty() ? "" : ( m_ptr->getNamespace() + Any::NamespaceDelimiter_str)) + m_roleName;
  	else return m_ptr->getName();
  }

Index: Dumper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Dumper.cpp	27 Jun 2005 15:54:02 -0000	1.30
--- Dumper.cpp	22 Sep 2006 22:27:13 -0000	1.31
***************
*** 1666,1670 ****
  
  	} catch(...) {
! 		proj->consoleMsg("[MetaInterpreter] Option load did not succeed.", MSG_ERROR);
  	}
  
--- 1666,1670 ----
  
  	} catch(...) {
! 		global_vars.err << MSG_ERROR << "[MetaInterpreter] Option load did not succeed.";
  	}
  
***************
*** 1692,1696 ****
  				Options::saveOpts( proj, v1, v2, v3, vp, dont_ask);
  			} catch(...) { 
! 				proj->consoleMsg("[MetaInterpreter] Option saving did not succeed.", MSG_ERROR);
  			}
  		}
--- 1692,1696 ----
  				Options::saveOpts( proj, v1, v2, v3, vp, dont_ask);
  			} catch(...) { 
! 				global_vars.err << MSG_ERROR << "[MetaInterpreter] Option saving did not succeed.";
  			}
  		}

Index: ConnJoint.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnJoint.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ConnJoint.cpp	21 Jun 2005 17:16:46 -0000	1.12
--- ConnJoint.cpp	22 Sep 2006 22:27:13 -0000	1.13
***************
*** 391,394 ****
--- 391,401 ----
  	src_cons_name = "Valid" + conn_name + m_srcLabel + "Cardinality" + cons_id1_str;
  	dst_cons_name = "Valid" + conn_name + m_dstLabel + "Cardinality" + cons_id2_str;
+ 	int pos = 0;
+ 	pos = src_cons_name.find( "::");
+ 	if( pos != std::string::npos) 
+ 		src_cons_name.replace( pos, 2, 2, '_');
+ 	pos = dst_cons_name.find( "::");
+ 	if( pos != std::string::npos)
+ 		dst_cons_name.replace( pos, 2, 2, '_');
  
  	int iEventMask = 0;
***************
*** 400,405 ****
  
  	std::string src_expr_begin, dst_expr_begin;
! 	src_expr_begin = "let srcCount = self.attachingConnections( \"" + m_dstLabel + "\", " + conn_name + " ) -> size in\n                     ";
! 	dst_expr_begin = "let dstCount = self.attachingConnections( \"" + m_srcLabel + "\", " + conn_name + " ) -> size in\n                     "; 
  	
  	std::string src_expr_end, dst_expr_end;
--- 407,412 ----
  
  	std::string src_expr_begin, dst_expr_begin;
! 	src_expr_begin = "let srcCount = self.attachingConnections( \"" + m_dstLabel + "\", meta::" + conn_name + " ) -> size in\n                     ";
! 	dst_expr_begin = "let dstCount = self.attachingConnections( \"" + m_srcLabel + "\", meta::" + conn_name + " ) -> size in\n                     "; 
  	
  	std::string src_expr_end, dst_expr_end;

Index: FolderRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FolderRep.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FolderRep.cpp	21 Jul 2006 19:31:18 -0000	1.13
--- FolderRep.cpp	22 Sep 2006 22:27:13 -0000	1.14
***************
*** 261,264 ****
--- 261,267 ----
  			std::string str_cons_name;
  			str_cons_name = "Valid" + getName() + "PartCardinality" + std::string(str_id);
+ 			int pos = str_cons_name.find( "::");
+ 			if( pos != std::string::npos) 
+ 				str_cons_name.replace( pos, 2, 2, '_');
  
  			int iEventMask = 0;