diff -r ef2d00e46897 -r c2992fd74dad lemon/edge_set.h
--- a/lemon/edge_set.h	Wed Feb 22 12:45:59 2006 +0000
+++ b/lemon/edge_set.h	Wed Feb 22 18:26:56 2006 +0000
@@ -19,13 +19,8 @@
 #ifndef LEMON_EDGE_SET_H
 #define LEMON_EDGE_SET_H
 
-#include <lemon/bits/erasable_graph_extender.h>
-#include <lemon/bits/clearable_graph_extender.h>
-#include <lemon/bits/extendable_graph_extender.h>
-#include <lemon/bits/iterable_graph_extender.h>
-#include <lemon/bits/alteration_notifier.h>
-#include <lemon/bits/default_map.h>
-#include <lemon/bits/graph_extender.h>
+
+#include <lemon/bits/edge_set_extender.h>
 
 /// \ingroup graphs
 /// \file
@@ -229,26 +224,11 @@
   /// In the edge extension and removing it conforms to the 
   /// \ref concept::ErasableGraph "ErasableGraph" concept.
   template <typename _Graph>
-  class ListEdgeSet :
-    public ErasableEdgeSetExtender<
-    ClearableEdgeSetExtender<
-    ExtendableEdgeSetExtender<
-    MappableEdgeSetExtender<
-    IterableGraphExtender<
-    AlterableEdgeSetExtender<
-    GraphExtender<
-    ListEdgeSetBase<_Graph> > > > > > > > {
+  class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<_Graph> > {
 
   public:
 
-    typedef ErasableEdgeSetExtender<
-      ClearableEdgeSetExtender<
-      ExtendableEdgeSetExtender<
-      MappableEdgeSetExtender<
-      IterableGraphExtender<
-      AlterableEdgeSetExtender<
-      GraphExtender<
-      ListEdgeSetBase<_Graph> > > > > > > > Parent;
+    typedef EdgeSetExtender<ListEdgeSetBase<_Graph> > Parent;
     
     typedef typename Parent::Node Node;
     typedef typename Parent::Edge Edge;
@@ -336,26 +316,13 @@
   /// In the edge extension and removing it conforms to the 
   /// \ref concept::ErasableUGraph "ErasableUGraph" concept.
   template <typename _Graph>
-  class ListUEdgeSet :
-    public ErasableUEdgeSetExtender<
-    ClearableUEdgeSetExtender<
-    ExtendableUEdgeSetExtender<
-    MappableUEdgeSetExtender<
-    IterableUGraphExtender<
-    AlterableUEdgeSetExtender<
-    UGraphExtender<
-    ListEdgeSetBase<_Graph> > > > > > > > {
+  class ListUEdgeSet 
+    : public UEdgeSetExtender<UGraphBaseExtender<ListEdgeSetBase<_Graph> > > {
 
   public:
 
-    typedef ErasableUEdgeSetExtender<
-      ClearableUEdgeSetExtender<
-      ExtendableUEdgeSetExtender<
-      MappableUEdgeSetExtender<
-      IterableUGraphExtender<
-      AlterableUEdgeSetExtender<
-      UGraphExtender<
-      ListEdgeSetBase<_Graph> > > > > > > > Parent;
+    typedef UEdgeSetExtender<UGraphBaseExtender<
+      ListEdgeSetBase<_Graph> > > Parent;
     
     typedef typename Parent::Node Node;
     typedef typename Parent::Edge Edge;
@@ -567,24 +534,11 @@
   /// In the edge extension and removing it conforms to the 
   /// \ref concept::ExtendableGraph "ExtendableGraph" concept.
   template <typename _Graph>
-  class SmartEdgeSet :
-    public ClearableEdgeSetExtender<
-    ExtendableEdgeSetExtender<
-    MappableEdgeSetExtender<
-    IterableGraphExtender<
-    AlterableEdgeSetExtender<
-    GraphExtender<
-    SmartEdgeSetBase<_Graph> > > > > > > {
+  class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<_Graph> > {
 
   public:
 
-    typedef ClearableEdgeSetExtender<
-      ExtendableEdgeSetExtender<
-      MappableEdgeSetExtender<
-      IterableGraphExtender<
-      AlterableEdgeSetExtender<
-      GraphExtender<
-      SmartEdgeSetBase<_Graph> > > > > > > Parent;
+    typedef EdgeSetExtender<SmartEdgeSetBase<_Graph> > Parent;
     
     typedef typename Parent::Node Node;
     typedef typename Parent::Edge Edge;
@@ -671,24 +625,13 @@
   /// In the edge extension and removing it conforms to the 
   /// \ref concept::ExtendableUGraph "ExtendableUGraph" concept.
   template <typename _Graph>
-  class SmartUEdgeSet :
-    public ClearableUEdgeSetExtender<
-    ExtendableUEdgeSetExtender<
-    MappableUEdgeSetExtender<
-    IterableUGraphExtender<
-    AlterableUEdgeSetExtender<
-    UGraphExtender<
-    SmartEdgeSetBase<_Graph> > > > > > > {
+  class SmartUEdgeSet 
+    : public UEdgeSetExtender<UGraphBaseExtender<SmartEdgeSetBase<_Graph> > > {
 
   public:
 
-    typedef ClearableUEdgeSetExtender<
-      ExtendableUEdgeSetExtender<
-      MappableUEdgeSetExtender<
-      IterableUGraphExtender<
-      AlterableUEdgeSetExtender<
-      UGraphExtender<
-      SmartEdgeSetBase<_Graph> > > > > > > Parent;
+    typedef UEdgeSetExtender<UGraphBaseExtender<
+      SmartEdgeSetBase<_Graph> > > Parent;
     
     typedef typename Parent::Node Node;
     typedef typename Parent::Edge Edge;