[GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep Any.cpp,1.10,1.11
Any.h,1.7,1.8 AtomRep.cpp,1.3,1.4 AtomRep.h,1.3,1.4
ConnectionRep.cpp,1.5,1.6 ConnectionRep.h,1.3,1.4 FCO.cpp,1.16,1.17
FCO.h,1.13,1.14 FcoRep.cpp,1.3,1.4 FcoRep.h,1.3,1.4
FolderRep.cpp,1.8,1.9 ModelRep.cpp,1.11,1.12 ModelRep.h,1.5,1.6
ReferenceRep.cpp,1.8,1.9 ReferenceRep.h,1.4,1.5 SetRep.cpp,1.9,1.10
SetRep.h,1.5,1.6 Sheet.cpp,1.7,1.8 Sheet.h,1.6,1.7
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Jul 29 20:37:51 CDT 2004
Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep
In directory braindrain:/tmp/cvs-serv19479/BonExtension/Rep
Modified Files:
Any.cpp Any.h AtomRep.cpp AtomRep.h ConnectionRep.cpp
ConnectionRep.h FCO.cpp FCO.h FcoRep.cpp FcoRep.h
FolderRep.cpp ModelRep.cpp ModelRep.h ReferenceRep.cpp
ReferenceRep.h SetRep.cpp SetRep.h Sheet.cpp Sheet.h
Log Message:
Syncing with MetaInterpreter.
CVS User: zolmol
Index: Any.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Any.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Any.cpp 16 Jul 2004 22:39:06 -0000 1.10
--- Any.cpp 30 Jul 2004 00:37:49 -0000 1.11
***************
*** 18,21 ****
--- 18,22 ----
/*static*/ const std::string Any::m_endUPToken = "///EUP";
/*static*/ const std::string Any::InRootFolder_str = "InRootFolder";
+ /*static*/ const std::string Any::NameSelectorNode_str = "myNameIs";
***************
*** 216,220 ****
! std::string Any::getMyPrefix() const
{
if ( this->m_ptr)
--- 217,221 ----
! std::string Any::getMyPrefix( int which /* = 0*/) const
{
if ( this->m_ptr)
***************
*** 232,235 ****
--- 233,238 ----
std::string tmp = name.substr(1) + '-' + t + '-' + kind;
+ if( which) // in case when special metainterpreter registry is needed
+ return tmp;
return "BonExtender/" + tmp;
}
***************
*** 246,249 ****
--- 249,259 ----
}
+ BON::RegistryNode Any::getMIRegistry() const // the metainterpreter registry
+ {
+ if ( this->m_ptr && this->m_parentFolder)
+ return m_parentFolder->getRegistry()->getChild( getMyPrefix( 1));
+
+ throw 1;
+ }
void Any::prepareMacros()
Index: Any.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Any.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Any.h 16 Jul 2004 22:39:06 -0000 1.7
--- Any.h 30 Jul 2004 00:37:49 -0000 1.8
***************
*** 23,26 ****
--- 23,27 ----
public: // constant strings
static const std::string InRootFolder_str;//"InRootFolder"
+ static const std::string NameSelectorNode_str; //"myNameIs"
public: // types
typedef enum
***************
*** 74,79 ****
void setEquivPeers( const std::set< BON::FCO >& ps) { m_equivs = ps; }
! std::string getMyPrefix() const;
BON::RegistryNode getMyRegistry() const;
bool isFCO() const;
--- 75,81 ----
void setEquivPeers( const std::set< BON::FCO >& ps) { m_equivs = ps; }
! std::string getMyPrefix( int which = 0) const;
BON::RegistryNode getMyRegistry() const;
+ BON::RegistryNode getMIRegistry() const;
bool isFCO() const;
Index: AtomRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/AtomRep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AtomRep.cpp 10 Mar 2004 02:50:18 -0000 1.3
--- AtomRep.cpp 30 Jul 2004 00:37:49 -0000 1.4
***************
*** 7,11 ****
#include "logger.h"
! AtomRep::AtomRep( BON::FCO& ptr): FCO( ptr)
{
}
--- 7,12 ----
#include "logger.h"
! AtomRep::AtomRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
{
}
Index: AtomRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/AtomRep.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AtomRep.h 10 Mar 2004 02:50:18 -0000 1.3
--- AtomRep.h 30 Jul 2004 00:37:49 -0000 1.4
***************
*** 9,13 ****
{
public:
! AtomRep( BON::FCO& ptr);
inline Any::KIND_TYPE getMyKind() const { return Any::ATOM; }
std::string doDump();
--- 9,13 ----
{
public:
! AtomRep( BON::FCO& ptr, BON::FCO& resp_ptr);
inline Any::KIND_TYPE getMyKind() const { return Any::ATOM; }
std::string doDump();
Index: ConnectionRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ConnectionRep.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConnectionRep.cpp 16 Jun 2004 18:35:02 -0000 1.5
--- ConnectionRep.cpp 30 Jul 2004 00:37:49 -0000 1.6
***************
*** 13,17 ****
! ConnectionRep::ConnectionRep( BON::FCO& ptr): FCO( ptr)
{
m_jointList.clear();
--- 13,18 ----
! ConnectionRep::ConnectionRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
{
m_jointList.clear();
Index: ConnectionRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ConnectionRep.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConnectionRep.h 10 Mar 2004 02:50:18 -0000 1.3
--- ConnectionRep.h 30 Jul 2004 00:37:49 -0000 1.4
***************
*** 10,14 ****
{
public:
! ConnectionRep( BON::FCO& ptr);
/*virtual*/ ~ConnectionRep();
--- 10,14 ----
{
public:
! ConnectionRep( BON::FCO& ptr, BON::FCO& resp_ptr);
/*virtual*/ ~ConnectionRep();
Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FCO.cpp 16 Jul 2004 22:39:06 -0000 1.16
--- FCO.cpp 30 Jul 2004 00:37:49 -0000 1.17
***************
*** 16,21 ****
/*static*/ const std::string FCO::IsAbstract_str = "IsAbstract";
! FCO::FCO( BON::FCO& ptr)
: Any( ptr)
, m_isAbstract( false)
, m_references()
--- 16,22 ----
/*static*/ const std::string FCO::IsAbstract_str = "IsAbstract";
! FCO::FCO( BON::FCO& ptr, BON::FCO& resp_ptr)
: Any( ptr)
+ , m_respPointer( resp_ptr)
, m_isAbstract( false)
, m_references()
***************
*** 47,50 ****
--- 48,52 ----
FCO::~FCO()
{
+ m_respPointer = BON::FCO();
m_references.clear();
m_finalReferences.clear();
***************
*** 71,74 ****
--- 73,103 ----
m_clique[i] = 0;
}
+ }
+
+ std::string FCO::getName() const
+ {
+ if( this->m_respPointer) // there are equivalents
+ {
+ std::string regname = getMIRegistry()->getValueByPath( "/" + Any::NameSelectorNode_str);
+ if( !regname.empty()) return regname;
+ else return m_respPointer->getName();
+ }
+ else if ( this->m_ptr)
+ {
+ return m_ptr->getName();
+ }
+ return "NullPtrError";
+ }
+
+
+ std::string FCO::getDispName() const
+ {
+ if ( this->m_ptr)
+ {
+ std::string nm = getName();
+ Any::convertToValidName( nm);
+ return nm;
+ }
+ return "NullPtrError";
}
Index: FCO.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FCO.h 16 Jul 2004 22:39:06 -0000 1.13
--- FCO.h 30 Jul 2004 00:37:49 -0000 1.14
***************
*** 41,48 ****
public:
! FCO( BON::FCO& ptr);
virtual ~FCO();
virtual KIND_TYPE getMyKind() const = 0;
/*virtual*/ void initAttributes();
// abstract
--- 41,51 ----
public:
! FCO( BON::FCO& ptr, BON::FCO& resp_ptr);
virtual ~FCO();
virtual KIND_TYPE getMyKind() const = 0;
+ /*virtual*/ std::string getName() const;
+ /*virtual*/ std::string getDispName() const;
+
/*virtual*/ void initAttributes();
// abstract
***************
*** 179,182 ****
--- 182,188 ----
protected:
+ // the name responsible in case of equivalences
+ BON::FCO m_respPointer;
+
// the IsAbstract attribute value
bool m_isAbstract;
Index: FcoRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FcoRep.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FcoRep.cpp 10 Mar 2004 02:50:18 -0000 1.3
--- FcoRep.cpp 30 Jul 2004 00:37:49 -0000 1.4
***************
*** 7,11 ****
#include "logger.h"
! FcoRep::FcoRep( BON::FCO& ptr): FCO( ptr)
{
}
--- 7,12 ----
#include "logger.h"
! FcoRep::FcoRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
{
}
Index: FcoRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FcoRep.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FcoRep.h 10 Mar 2004 02:50:18 -0000 1.3
--- FcoRep.h 30 Jul 2004 00:37:49 -0000 1.4
***************
*** 10,14 ****
public:
! FcoRep( BON::FCO& ptr);
Any::KIND_TYPE getMyKind() const { return Any::FCO_REP; }
std::string doDump();
--- 10,14 ----
public:
! FcoRep( BON::FCO& ptr, BON::FCO& resp_ptr);
Any::KIND_TYPE getMyKind() const { return Any::FCO_REP; }
std::string doDump();
Index: FolderRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FolderRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FolderRep.cpp 17 Mar 2004 00:24:14 -0000 1.8
--- FolderRep.cpp 30 Jul 2004 00:37:49 -0000 1.9
***************
*** 34,37 ****
--- 34,38 ----
std::string FolderRep::getName() const
{
+ #if(0)
if (m_respPointer == BON::FCO())
{
***************
*** 40,43 ****
--- 41,57 ----
}
return m_respPointer->getName();
+ #else
+ if( this->m_respPointer) // there are equivalents
+ {
+ std::string regname = getMIRegistry()->getValueByPath( "/" + Any::NameSelectorNode_str);
+ if( !regname.empty()) return regname;
+ else return m_respPointer->getName();
+ }
+ else if ( this->m_ptr)
+ {
+ return m_ptr->getName();
+ }
+ return "NullPtrError";
+ #endif
}
Index: ModelRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ModelRep.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ModelRep.cpp 16 Jun 2004 18:35:02 -0000 1.11
--- ModelRep.cpp 30 Jul 2004 00:37:49 -0000 1.12
***************
*** 16,21 ****
extern int h_ind;
! ModelRep::ModelRep( BON::FCO& ptr)
! : FCO( ptr)
, m_initialRoleMap()
, m_finalRoleMap()
--- 16,21 ----
extern int h_ind;
! ModelRep::ModelRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
, m_initialRoleMap()
, m_finalRoleMap()
Index: ModelRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ModelRep.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ModelRep.h 16 Jun 2004 18:35:02 -0000 1.5
--- ModelRep.h 30 Jul 2004 00:37:49 -0000 1.6
***************
*** 32,36 ****
public:
! ModelRep( BON::FCO& ptr);
~ModelRep();
--- 32,36 ----
public:
! ModelRep( BON::FCO& ptr, BON::FCO& resp_ptr);
~ModelRep();
Index: ReferenceRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ReferenceRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ReferenceRep.cpp 16 Jun 2004 18:35:02 -0000 1.8
--- ReferenceRep.cpp 30 Jul 2004 00:37:49 -0000 1.9
***************
*** 15,20 ****
extern int h_ind;
! ReferenceRep::ReferenceRep( BON::FCO& ptr)
! : FCO( ptr)
, m_initialReferees()
, m_finalReferees()
--- 15,20 ----
extern int h_ind;
! ReferenceRep::ReferenceRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
, m_initialReferees()
, m_finalReferees()
Index: ReferenceRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ReferenceRep.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReferenceRep.h 16 Jun 2004 18:35:02 -0000 1.4
--- ReferenceRep.h 30 Jul 2004 00:37:49 -0000 1.5
***************
*** 14,18 ****
public:
! ReferenceRep( BON::FCO& ptr);
~ReferenceRep();
/*virtual*/ Any::KIND_TYPE getMyKind() const { return Any::REF; }
--- 14,18 ----
public:
! ReferenceRep( BON::FCO& ptr, BON::FCO& resp_ptr);
~ReferenceRep();
/*virtual*/ Any::KIND_TYPE getMyKind() const { return Any::REF; }
Index: SetRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/SetRep.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SetRep.cpp 16 Jun 2004 18:35:02 -0000 1.9
--- SetRep.cpp 30 Jul 2004 00:37:49 -0000 1.10
***************
*** 16,21 ****
extern int h_ind;
! SetRep::SetRep( BON::FCO& ptr)
! : FCO( ptr)
, m_memberList()
, m_finalMemberList()
--- 16,21 ----
extern int h_ind;
! SetRep::SetRep( BON::FCO& ptr, BON::FCO& resp_ptr)
! : FCO( ptr, resp_ptr)
, m_memberList()
, m_finalMemberList()
Index: SetRep.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/SetRep.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SetRep.h 16 Jun 2004 18:35:02 -0000 1.5
--- SetRep.h 30 Jul 2004 00:37:49 -0000 1.6
***************
*** 26,30 ****
public: // types
! SetRep( BON::FCO& ptr);
~SetRep();
--- 26,30 ----
public: // types
! SetRep( BON::FCO& ptr, BON::FCO& resp_ptr);
~SetRep();
Index: Sheet.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Sheet.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Sheet.cpp 16 Jul 2004 22:39:06 -0000 1.7
--- Sheet.cpp 30 Jul 2004 00:37:49 -0000 1.8
***************
*** 195,201 ****
! FcoRep* Sheet::createFcoRep( BON::FCO& ptr)
{
! FcoRep * ll = new FcoRep( ptr);
addFcoRep( ll);
return ll;
--- 195,201 ----
! FcoRep* Sheet::createFcoRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! FcoRep * ll = new FcoRep( ptr, resp_ptr);
addFcoRep( ll);
return ll;
***************
*** 203,209 ****
! AtomRep* Sheet::createAtomRep( BON::FCO& ptr)
{
! AtomRep * ll = new AtomRep( ptr);
addAtomRep( ll);
return ll;
--- 203,209 ----
! AtomRep* Sheet::createAtomRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! AtomRep * ll = new AtomRep( ptr, resp_ptr);
addAtomRep( ll);
return ll;
***************
*** 211,217 ****
! ModelRep* Sheet::createModelRep( BON::FCO& ptr)
{
! ModelRep * ll = new ModelRep( ptr);
addModelRep( ll);
return ll;
--- 211,217 ----
! ModelRep* Sheet::createModelRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! ModelRep * ll = new ModelRep( ptr, resp_ptr);
addModelRep( ll);
return ll;
***************
*** 219,225 ****
! ConnectionRep* Sheet::createConnectionRep( BON::FCO& ptr)
{
! ConnectionRep * ll = new ConnectionRep( ptr);
addConnectionRep( ll);
return ll;
--- 219,225 ----
! ConnectionRep* Sheet::createConnectionRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! ConnectionRep * ll = new ConnectionRep( ptr, resp_ptr);
addConnectionRep( ll);
return ll;
***************
*** 227,233 ****
! SetRep* Sheet::createSetRep( BON::FCO& ptr)
{
! SetRep * ll = new SetRep( ptr);
addSetRep( ll);
return ll;
--- 227,233 ----
! SetRep* Sheet::createSetRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! SetRep * ll = new SetRep( ptr, resp_ptr);
addSetRep( ll);
return ll;
***************
*** 235,241 ****
! ReferenceRep* Sheet::createReferenceRep( BON::FCO& ptr)
{
! ReferenceRep * ll = new ReferenceRep( ptr);
addReferenceRep( ll);
return ll;
--- 235,241 ----
! ReferenceRep* Sheet::createReferenceRep( BON::FCO& ptr, BON::FCO& resp_ptr)
{
! ReferenceRep * ll = new ReferenceRep( ptr, resp_ptr);
addReferenceRep( ll);
return ll;
Index: Sheet.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/Sheet.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Sheet.h 16 Jul 2004 22:39:06 -0000 1.6
--- Sheet.h 30 Jul 2004 00:37:49 -0000 1.7
***************
*** 35,44 ****
void setProjName( const std::string& name);
! FcoRep* createFcoRep( BON::FCO& ptr);
! AtomRep* createAtomRep( BON::FCO& ptr);
! ModelRep* createModelRep( BON::FCO& ptr);
! ConnectionRep* createConnectionRep( BON::FCO& ptr);
! SetRep* createSetRep( BON::FCO& ptr);
! ReferenceRep* createReferenceRep( BON::FCO& ptr);
FolderRep* createFolderRep( BON::FCO& ptr, BON::FCO& resp_ptr);
--- 35,44 ----
void setProjName( const std::string& name);
! FcoRep* createFcoRep( BON::FCO& ptr, BON::FCO& resp_ptr);
! AtomRep* createAtomRep( BON::FCO& ptr, BON::FCO& resp_ptr);
! ModelRep* createModelRep( BON::FCO& ptr, BON::FCO& resp_ptr);
! ConnectionRep* createConnectionRep( BON::FCO& ptr, BON::FCO& resp_ptr);
! SetRep* createSetRep( BON::FCO& ptr, BON::FCO& resp_ptr);
! ReferenceRep* createReferenceRep( BON::FCO& ptr, BON::FCO& resp_ptr);
FolderRep* createFolderRep( BON::FCO& ptr, BON::FCO& resp_ptr);
More information about the GME-commit
mailing list