Changeset 571:9632ea8be6ca in lemon-0.x for src/work/deba/map_registry.h

Timestamp:

05/07/04 10:18:30 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@746

Message:

 

File:

• src/work/deba/map_registry.h (modified) (2 diffs)

src/work/deba/map_registry.h

@@ -29 +29 @@
           Container container;
 
-                Graph* graph;           
-                
                 
         public:
         
-                MapRegistry(Graph& g) : container(0), graph(&g) {}
+                MapRegistry() {}
+        
+                MapRegistry(const MapRegistry&) {}
+                
+                MapRegistry& operator=(const MapRegistry&) {
+                        for (it = container.begin(); it != container.end(); ++it) {
+                                (*it)->destroy();
+                                (*it)->graph = 0;
+                                (*it)->registry = 0;
+                        }
+                }
                                 
                 ~MapRegistry() {
                         typename Container::iterator it;
                         for (it = container.begin(); it != container.end(); ++it) {
-                                (*it)->destroy(*graph);
+                                (*it)->destroy();
                                 (*it)->registry = 0;
+                                (*it)->graph = 0;
                         }
                 }
         
-        private:
-                MapRegistry(const MapRegistry& ) {}
-                MapRegistry& operator=(const MapRegistry& ) {}
         
         public:
         
-                void add(Map& map) {
+                void attach(Map& map) {
                         if (map.registry) {
-                                map.registry->erase(map);
+                                map.registry->detach(map);
                         }
                         container.push_back(&map);
                         map.registry = this;
                         map.registry_index = container.size()-1;
-                        map.init(*graph);
+                        map.init();
                 } 
         
-                void erase(Map& map_base) {
-                        map_base.destroy(*graph);
+                void detach(Map& map_base) {
+                        map_base.destroy();
                         container.back()->registry_index = map_base.registry_index; 
                         container[map_base.registry_index] = container.back();
                         container.pop_back();
                         map_base.registry = 0;
+                        map_base.graph = 0;
                 }
         
@@ -83 +90 @@
                 }
 
-                Graph& getGraph() {
-                        return *graph;
-                }
-
-
         };