--- trunk/src/utils/GenericData.hpp	2005/01/12 22:41:40	246
+++ trunk/src/utils/GenericData.hpp	2005/03/01 20:10:14	385
@@ -181,44 +181,45 @@ namespace oopse{
     * @template ContainerType
     * @template ElemDataType
     */
-    template <template<typename ELEM, typename = std::allocator<ELEM> > class ContainerType,
-                     typename ElemDataType > 
-    class STLContainerTypeData : public GenericData, public ContainerType<ElemDataType>{
+    template <typename ElemDataType > 
+    class VectorTypeData : public GenericData {
         public:
-            typedef STLContainerTypeData<ContainerType, ElemDataType> SelfType;
-            typedef ContainerType<ElemDataType> STLContainerType;
+            typedef VectorTypeData<ElemDataType> SelfType;
 
-            STLContainerTypeData(const std::string& id) 
-                : GenericData(id),  ContainerType<ElemDataType> () {}
+            VectorTypeData(const std::string& id) 
+                : GenericData(id){}
             
-            STLContainerTypeData(const SelfType& s) : SelfType(s){}
+            VectorTypeData(const SelfType& s) : SelfType(s){}
 
             SelfType& operator =(const SelfType& s){
                 if (this == &s)
                     return *this;
 
-                STLContainerType::operator=(s);
+                this->data_ = s.data_;
                 return *this;
             }
+            
+        private:
+            std::vector<ElemDataType> data_;
     };
 
     /**
      * @typedef IntVectorGenericData
      * A generic data type contains a  std::vector<int> variable.
      */  
-    typedef STLContainerTypeData<std::vector, int> IntVectorGenericData;
+    typedef VectorTypeData<int> IntVectorGenericData;
 
     /**
      * @typedef IntVectorGenericData
      * A generic data type contains a  std::vector<float> variable.
      */  
-    typedef STLContainerTypeData<std::vector, float> FloatVectorGenericData;
+    typedef VectorTypeData<float> FloatVectorGenericData;
 
     /**
      * @typedef IntVectorGenericData
      * A generic data type contains a  std::vector<double> variable.
      */  
-    typedef STLContainerTypeData<std::vector, double> DoubleVectorGenericData;
+    typedef VectorTypeData<double> DoubleVectorGenericData;
 
     /** 
      * @typedef StringVectorGenericData
@@ -248,17 +249,8 @@ namespace oopse{
      *  }
      * @endcode
      */  
-    typedef STLContainerTypeData<std::vector, std::string> StringVectorGenericData;
-
-    /**
-     * @typedef IntVectorGenericData
-     * A generic data type contains a   std::list<vector<string> >  variable.
-     */  
-    typedef STLContainerTypeData<std::list, std::vector<int> > IntVectorListGenericData;
+    typedef VectorTypeData<std::string> StringVectorGenericData;
   
-#define CHIVALUE_ID "CHIVALUE"
-#define INTEGRALOFCHIDT_ID "INTEGRALOFCHIDT"
-#define ETAVALUE_ID "ETAVALUE"
 
 } // namespace oopse
 #endif //UTIL _GENERICDATA_HPP