[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Any.cpp,1.12,1.13 Any.h,1.7,1.8 AspectRep.cpp,1.13,1.14 ConnectionRep.cpp,1.9,1.10 FCO.cpp,1.12,1.13 FolderRep.cpp,1.10,1.11

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

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

Modified Files:
	Any.cpp Any.h AspectRep.cpp ConnectionRep.cpp FCO.cpp 
	FolderRep.cpp 
Log Message:
Allowing the user to choose a displayed name for equivalent objects also.


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.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Any.cpp	26 Jan 2005 17:31:06 -0000	1.12
--- Any.cpp	7 Apr 2005 21:26:24 -0000	1.13
***************
*** 25,28 ****
--- 25,29 ----
  /*static*/ const std::string Any::DisplayedName_str = "DisplayedName";
  /*static*/ const std::string Any::NameSelectorNode_str = "myNameIs";
+ /*static*/ const std::string Any::DisplayedNameSelectorNode_str = "myDisplayedNameIs";
  
  /*static*/ const std::string Any::KIND_TYPE_STR[] =

Index: AspectRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AspectRep.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AspectRep.cpp	26 Jan 2005 17:31:06 -0000	1.13
--- AspectRep.cpp	7 Apr 2005 21:26:24 -0000	1.14
***************
*** 148,152 ****
  	if( m_respPointer) // not a plain fco, it has its resppointer set
  	{
! 		return "";
  	}
  	else if( m_ptr)
--- 148,153 ----
  	if( m_respPointer) // not a plain fco, it has its resppointer set
  	{
! 		//return "";
! 		return m_userSelectedDisplayName;
  	}
  	else if( m_ptr)

Index: FCO.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FCO.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FCO.cpp	26 Jan 2005 17:31:06 -0000	1.12
--- FCO.cpp	7 Apr 2005 21:26:24 -0000	1.13
***************
*** 89,93 ****
  	if( m_respPointer) // not a plain fco, it has its resppointer set
  	{
! 		return "";
  	}
  	else
--- 89,94 ----
  	if( m_respPointer) // not a plain fco, it has its resppointer set
  	{
! 		// previously return "";
! 		return m_userSelectedDisplayName;
  	}
  	else

Index: ConnectionRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/ConnectionRep.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConnectionRep.cpp	26 Jan 2005 17:31:06 -0000	1.9
--- ConnectionRep.cpp	7 Apr 2005 21:26:24 -0000	1.10
***************
*** 41,45 ****
  	m_isInRootFolder = m_isInRootFolder || m_ptr->getAttribute( InRootFolder_str)->getBooleanValue();
  
! 	// isAbstract: true if all objects are true
  	//m_isAbstract = m_isAbstract && m_ptr->getAttribute( IsAbstract_str)->getBooleanValue();
  	bool isabs = true; // if any of the set values is false it will change
--- 41,45 ----
  	m_isInRootFolder = m_isInRootFolder || m_ptr->getAttribute( InRootFolder_str)->getBooleanValue();
  
! 	// isAbstract: true iff all values (which are set) are true
  	//m_isAbstract = m_isAbstract && m_ptr->getAttribute( IsAbstract_str)->getBooleanValue();
  	bool isabs = true; // if any of the set values is false it will change

Index: Any.h
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Any.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Any.h	30 Jul 2004 00:10:23 -0000	1.7
--- Any.h	7 Apr 2005 21:26:24 -0000	1.8
***************
*** 27,30 ****
--- 27,31 ----
  
  	static const std::string NameSelectorNode_str;
+ 	static const std::string DisplayedNameSelectorNode_str;
  public: // types
  	typedef enum
***************
*** 83,86 ****
--- 84,88 ----
  	void setParentFolder( const BON::Folder& folder) { m_parentFolder = folder; }
  	void setEquivPeers( const std::set< BON::FCO >& ps) { m_equivs = ps; }
+ 	void setDisplayedName( const std::string& dispnm) { m_userSelectedDisplayName = dispnm; }
  
  	virtual std::string getMyPrefix() const;
***************
*** 110,113 ****
--- 112,118 ----
  	std::set< BON::FCO > m_equivs;
  	bool	m_isInRootFolder;
+ 
+ 	// displayed name (if name selection dialog used) 
+ 	std::string m_userSelectedDisplayName;
  
  	// initial and final constraints

Index: FolderRep.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FolderRep.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FolderRep.cpp	26 Jan 2005 17:31:06 -0000	1.10
--- FolderRep.cpp	7 Apr 2005 21:26:24 -0000	1.11
***************
*** 71,75 ****
  	if( m_respPointer) // not a plain folder, it has its resppointer set
  	{
! 		return "";
  	}
  	else
--- 71,76 ----
  	if( m_respPointer) // not a plain folder, it has its resppointer set
  	{
! 		//return "";
! 		return m_userSelectedDisplayName;
  	}
  	else