[Corelinux-clcvs] CVS: clfw/src/libs/clfw FrameworkString.cpp,NONE,1.1 Attribute.cpp,1.2,1.3 Concept.cpp,1.2,1.3 Makefile.am,1.23,1.24

[Frank V. C. <fr...@us...>]

Update of /cvsroot/corelinux/clfw/src/libs/clfw
In directory usw-pr-cvs1:/tmp/cvs-serv25128/src/libs/clfw

Modified Files:
	Attribute.cpp Concept.cpp Makefile.am 
Added Files:
	FrameworkString.cpp 
Log Message:
115287 - Continued infrastructure work

***** Error reading new file: [Errno 2] No such file or directory: 'FrameworkString.cpp'
Index: Attribute.cpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Attribute.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Attribute.cpp	2001/03/31 14:04:59	1.2
--- Attribute.cpp	2001/03/31 22:21:45	1.3
***************
*** 36,40 ****
        :
        Aggregate(),
!       theName( NULLPTR ),
        theValue( NULLPTR )
     {
--- 36,40 ----
        :
        Aggregate(),
!       theKey( NULLPTR ),
        theValue( NULLPTR )
     {
***************
*** 48,52 ****
        :
        Aggregate( aType ),
!       theName( aType.getName() ),
        theValue( aType.getValue() )
     {
--- 48,52 ----
        :
        Aggregate( aType ),
!       theKey( aType.getKey() ),
        theValue( aType.getValue() )
     {
***************
*** 71,78 ****
        bool  isSame( false );
  
!       if( this->getName() != NULLPTR && 
!          aAttribute.getName() != NULLPTR )
        {
!          isSame = !(std::strcmp( this->getName(), aAttribute.getName() ));
  
           if( isSame == true )
--- 71,78 ----
        bool  isSame( false );
  
!       if( this->getKey() != NULLPTR && 
!          aAttribute.getKey() != NULLPTR )
        {
!          isSame = this->getKey()->equals( aAttribute.getKey() );
  
           if( isSame == true )
***************
*** 131,139 ****
     CLOSE_METATYPE_PARENT;
  
!    DEFINE_INSTANCEDATA_DESCRIPTOR( Attribute, CharPtr , Name );
     DEFINE_CLASSINSTANCE_DESCRIPTOR( Attribute, FrameworkEntityPtr, FrameworkEntity, Value );
  
     OPEN_INSTANCEDATA( Attribute )
!       DEFINE_INSTANCEDATA( Attribute, Name )
        DEFINE_INSTANCEDATA( Attribute, Value )
        CLOSE_INSTANCEDATA;
--- 131,139 ----
     CLOSE_METATYPE_PARENT;
  
!    DEFINE_CLASSINSTANCE_DESCRIPTOR( Attribute, FrameworkEntityPtr, FrameworkEntity, Key );
     DEFINE_CLASSINSTANCE_DESCRIPTOR( Attribute, FrameworkEntityPtr, FrameworkEntity, Value );
  
     OPEN_INSTANCEDATA( Attribute )
!       DEFINE_INSTANCEDATA( Attribute, Key )
        DEFINE_INSTANCEDATA( Attribute, Value )
        CLOSE_INSTANCEDATA;

Index: Concept.cpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Concept.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Concept.cpp	2001/03/31 14:05:00	1.2
--- Concept.cpp	2001/03/31 22:21:45	1.3
***************
*** 81,85 ****
     }
  
!    AttributePtr      Concept::getAttribute( CharPtr )
     {
        return AttributePtr( NULLPTR );
--- 81,85 ----
     }
  
!    AttributePtr      Concept::getAttributeFromKey( FrameworkEntityPtr )
     {
        return AttributePtr( NULLPTR );
***************
*** 100,104 ****
  
     }
!    void  Concept::removeAttribute( CharPtr  )
     {
  
--- 100,104 ----
  
     }
!    void  Concept::removeKey( FrameworkEntityPtr  )
     {
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/corelinux/clfw/src/libs/clfw/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Makefile.am	2001/03/30 11:48:38	1.23
--- Makefile.am	2001/03/31 22:21:45	1.24
***************
*** 21,24 ****
--- 21,25 ----
  			MetaType.cpp 				\
  			FrameworkEntity.cpp			\
+ 			FrameworkString.cpp			\
  			Aggregate.cpp				\
  			Sponsor.cpp					\