Menu
▾
▴
[Corelinux-clcvs] CVS: clfw/clfw Array.hpp,1.4,1.5 Collection.hpp,1.2,1.3 FrameworkEntity.hpp,1.5,1.6 MetaType.hpp,1.29,1.30 SetCollection.hpp,1.1,1.2
|
From: Frank V. C. <fr...@us...> - 2001-03-01 03:18:55
|
Update of /cvsroot/corelinux/clfw/clfw
In directory usw-pr-cvs1:/tmp/cvs-serv10107/clfw
Modified Files:
Array.hpp Collection.hpp FrameworkEntity.hpp MetaType.hpp
SetCollection.hpp
Log Message:
233863 SetCollection added, almost
Index: Array.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Array.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Array.hpp 2001/02/27 13:51:10 1.4
--- Array.hpp 2001/03/01 03:20:16 1.5
***************
*** 84,89 ****
/// Fetch the current size (# of entities) of the array
! virtual Count size( void ) const;
/// Fetch entity at index
--- 84,93 ----
/// Fetch the current size (# of entities) of the array
! virtual Count getSize( void ) const;
+ /// Determines
+
+ virtual bool isEmpty( void ) const ;
+
/// Fetch entity at index
***************
*** 195,198 ****
--- 199,207 ----
// Implementation methods
//
+
+ /// Checks to see if entity in collection
+
+ bool checkForMember( FrameworkEntityCptr ) const;
+
/// Retrieve the array representation
Index: Collection.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/Collection.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Collection.hpp 2001/02/27 13:51:10 1.2
--- Collection.hpp 2001/03/01 03:20:16 1.3
***************
*** 66,69 ****
--- 66,75 ----
Collection( void );
+ /**
+ Copy constructor
+ */
+
+ Collection( CollectionCref );
+
/// Virtual destructor
***************
*** 95,100 ****
// Minimal functionality forced (replaced with meta info)
//
! virtual Count size( void ) const = 0;
virtual void addAll( CollectionCref )
--- 101,108 ----
// Minimal functionality forced (replaced with meta info)
//
+
+ virtual Count getSize( void ) const = 0;
! virtual bool isEmpty( void ) const = 0;
virtual void addAll( CollectionCref )
Index: FrameworkEntity.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/FrameworkEntity.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** FrameworkEntity.hpp 2001/02/27 13:51:10 1.5
--- FrameworkEntity.hpp 2001/03/01 03:20:16 1.6
***************
*** 60,63 ****
--- 60,70 ----
virtual MetaTypePtr getType( void ) const;
+ /**
+ The equals method is defined for each FrameworkEntity
+ type using MetaClass. It compares the type, then
+ the address of the pointer, and if needed will call
+ out to the types operator==
+ */
+
virtual bool equals( FrameworkEntityCptr ) const;
***************
*** 102,111 ****
*/
static FrameworkEntityPtr castDown( FrameworkEntityPtr );
/**
! Cast the pointer down to type
*/
static FrameworkEntityRef castDown( FrameworkEntityRef );
--- 109,120 ----
*/
+ static FrameworkEntityCptr castDown( FrameworkEntityCptr );
static FrameworkEntityPtr castDown( FrameworkEntityPtr );
/**
! Cast the reference down to type
*/
+ static FrameworkEntityCref castDown( FrameworkEntityCref );
static FrameworkEntityRef castDown( FrameworkEntityRef );
***************
*** 126,139 ****
private:
!
! /**
! the MetaType descriptor
! */
! static MetaType theTypeDesc;
! /// The individuals identifier
! UniversalIdentifier theOid;
--- 135,148 ----
private:
!
! /**
! the MetaType descriptor
! */
! static MetaType theTypeDesc;
! /// The individuals identifier
! UniversalIdentifier theOid;
Index: MetaType.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaType.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** MetaType.hpp 2001/02/27 13:51:10 1.29
--- MetaType.hpp 2001/03/01 03:20:16 1.30
***************
*** 88,93 ****
*/ \
static void destroy( className##Ptr aPointer ); \
! static className##Ptr castDown( corelinux::FrameworkEntityPtr ); \
! static className##Ref castDown( corelinux::FrameworkEntityRef ); \
/** \
redefine the operator new[] \
--- 88,95 ----
*/ \
static void destroy( className##Ptr aPointer ); \
! static className##Cptr castDown( corelinux::FrameworkEntityCptr ) ; \
! static className##Ptr castDown( corelinux::FrameworkEntityPtr ); \
! static className##Ref castDown( corelinux::FrameworkEntityRef ); \
! static className##Cref castDown( corelinux::FrameworkEntityCref ); \
/** \
redefine the operator new[] \
***************
*** 494,497 ****
--- 496,507 ----
return dynamic_cast<className##Ptr>(aP); \
} \
+ className##Cptr className::castDown( corelinux::FrameworkEntityCptr aP ) \
+ { \
+ return dynamic_cast<className##Cptr>(aP); \
+ } \
+ className##Cref className::castDown( corelinux::FrameworkEntityCref aP ) \
+ { \
+ return dynamic_cast<className##Cref>(aP); \
+ } \
/** \
redefine the operator new for className \
***************
*** 534,541 ****
--- 544,563 ----
Cast to type \
*/ \
+ className##Ref className::castDown( corelinux::FrameworkEntityRef aP ) \
+ { \
+ return dynamic_cast<className##Ref>(aP); \
+ } \
className##Ptr className::castDown( corelinux::FrameworkEntityPtr aP ) \
{ \
return dynamic_cast<className##Ptr>(aP); \
} \
+ className##Cptr className::castDown( corelinux::FrameworkEntityCptr aP ) \
+ { \
+ return dynamic_cast<className##Cptr>(aP); \
+ } \
+ className##Cref className::castDown( corelinux::FrameworkEntityCref aP ) \
+ { \
+ return dynamic_cast<className##Cref>(aP); \
+ } \
/** \
redefine the operator new for className \
***************
*** 615,622 ****
); \
} \
className##Ptr className::castDown( corelinux::FrameworkEntityPtr aP ) \
{ \
! return dynamic_cast<className##Ptr>(aP); \
} \
/** \
redefine the operator new for className \
--- 637,656 ----
); \
} \
+ className##Ref className::castDown( corelinux::FrameworkEntityRef aP ) \
+ { \
+ return dynamic_cast<className##Ref>(aP); \
+ } \
className##Ptr className::castDown( corelinux::FrameworkEntityPtr aP ) \
{ \
! return dynamic_cast<className##Ptr>(aP); \
} \
+ className##Cptr className::castDown( corelinux::FrameworkEntityCptr aP ) \
+ { \
+ return dynamic_cast<className##Cptr>(aP); \
+ } \
+ className##Cref className::castDown( corelinux::FrameworkEntityCref aP ) \
+ { \
+ return dynamic_cast<className##Cref>(aP); \
+ } \
/** \
redefine the operator new for className \
***************
*** 707,712 ****
else \
{ \
! ; \
} \
} \
return isSame; \
--- 741,751 ----
else \
{ \
! isSame = (*this) == \
! *(className::castDown( aPtr )); \
} \
+ } \
+ else \
+ { \
+ ; \
} \
return isSame; \
Index: SetCollection.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/SetCollection.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SetCollection.hpp 2001/02/27 13:51:10 1.1
--- SetCollection.hpp 2001/03/01 03:20:16 1.2
***************
*** 90,94 ****
/// Entity put operator
! SetCollectionRef operator=( FrameworkEntityPtr )
throw (NullPointerException,BoundsException);
--- 90,94 ----
/// Entity put operator
! SetCollectionRef operator+=( FrameworkEntityPtr )
throw (NullPointerException,BoundsException);
***************
*** 142,145 ****
--- 142,155 ----
throw (NullPointerException, BoundsException);
+ /// Add all the elements from the inbound collection
+
+ virtual void addAll( CollectionCref )
+ throw (BoundsException,IncompatibleClassException);
+
+ /// Add all the elements from the inbound collection at a offset
+
+ virtual void addAll( Index, CollectionCref )
+ throw (BoundsException,IncompatibleClassException);
+
//
// Member Declarations
***************
*** 152,155 ****
--- 162,167 ----
// Implementation methods
//
+
+ bool compareMembers( SetCollectionCref ) const;
private:
|
