[Corelinux-clcvs] CVS: clfw/clfw MetaSpace.hpp,1.5,1.6

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

Update of /cvsroot/corelinux/clfw/clfw
In directory usw-pr-cvs1:/tmp/cvs-serv31015/clfw

Modified Files:
	MetaSpace.hpp 
Log Message:
425600 Improve MetaClass resolution

Index: MetaSpace.hpp
===================================================================
RCS file: /cvsroot/corelinux/clfw/clfw/MetaSpace.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** MetaSpace.hpp	2000/11/15 23:07:20	1.5
--- MetaSpace.hpp	2001/05/25 04:10:08	1.6
***************
*** 26,32 ****
  #endif
  
  namespace   corelinux
  {
-    DECLARE_CLASS( Ontology );
     DECLARE_CLASS( MetaSpace );
     DECLARE_CLASS( MetaClass );
--- 26,39 ----
  #endif
  
+ #if   !defined(__ONTOLOGY_HPP)
+ #include <clfw/Ontology.hpp>
+ #endif
+ 
+ #if   !defined(__ASSOCIATIVEITERATOR_HPP)
+ #include <corelinux/AssociativeIterator.hpp>
+ #endif
+ 
  namespace   corelinux
  {
     DECLARE_CLASS( MetaSpace );
     DECLARE_CLASS( MetaClass );
***************
*** 41,44 ****
--- 48,55 ----
     public:
  
+       //
+       // Accessors
+       //
+ 
                 /**
                 Given a meta type, get it's meta class
***************
*** 49,58 ****
        static   MetaClassPtr  getClassForType( MetaTypePtr );
  
-                /**
-                stores a metatype prior to initialize
-                @param MetaType const pointer to type
-                */
- 
-       static   void  storeType( MetaTypeCptr );
  
                 /**
--- 60,63 ----
***************
*** 65,68 ****
--- 70,76 ----
        static   OntologyPtr getOntology( CharCptr domain = NULLPTR );
  
+       //
+       // Mutators
+       //
                 /**
                 Initialize the MetaSpace, creating
***************
*** 71,74 ****
--- 79,114 ----
  
        static   void  initialize( void );
+ 
+                /**
+                stores a metatype prior to initialize
+                @param MetaType const pointer to type
+                */
+ 
+       static   void  storeType( MetaTypeCptr );
+ 
+       //
+       // Iteration
+       //
+ 
+                /**
+                Create an iterator over all the ontologies
+                in the MetaSpace
+                @returns Iterator pointer of Ontology pointers
+                */
+ 
+       static   AssociativeIterator<CharCptr,OntologyPtr> *createIterator( void );
+ 
+                /**
+                Destroys the iterator
+                @param Iterator pointer of Ontology pointers
+                @exception NullPointer exception if pointer
+                argument is NULLPTR
+                */
+ 
+       static   void destroyIterator
+                   ( 
+                      AssociativeIterator<CharCptr,OntologyPtr> * 
+                   )
+                   throw ( NullPointerException );
  
     protected: