Changeset 1003 for trunk/MagicSoft/Mars/mbase/MParList.cc

Timestamp:

10/29/01 11:15:53 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParList.cc (modified) (18 diffs)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -43 +43 @@
 #include <TNamed.h>
 #include <TClass.h>
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MLog.h"
@@ -57 +57 @@
 MParList::MParList(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MParList";
-    *fTitle = title ? title : "A list of Parameter Containers";
+    fName  = name  ? name  : "MParList";
+    fTitle = title ? title : "A list of Parameter Containers";
 
     //
@@ -64 +64 @@
     // that the destructor of the list deletes all it's objects
     //
-    fAutodelete.SetOwner();
+    fContainer  = new TOrdCollection;
+    fAutodelete = new TOrdCollection;
+
+    fAutodelete->SetOwner();
 }
 
@@ -76 +79 @@
 MParList::MParList(MParList &ts)
 {
-    fContainer.AddAll(&ts.fContainer);
+    fContainer->AddAll(ts.fContainer);
 }
 
@@ -87 +90 @@
 {
     if (TestBit(kIsOwner))
-        fContainer.SetOwner();
+        fContainer->SetOwner();
+
+    delete fContainer;
+    delete fAutodelete;
 }
 
@@ -107 +113 @@
 void MParList::SetLogStream(MLog *log)
 {
-    TIter Next(&fContainer);
+    TIter Next(fContainer);
 
     MParContainer *cont=NULL;
@@ -143 +149 @@
     // Check if the new container is already existing in the list
     //
-    const TObject *objn = fContainer.FindObject(name);
-    const TObject *objt = fContainer.FindObject(cont);
+    const TObject *objn = fContainer->FindObject(name);
+    const TObject *objt = fContainer->FindObject(cont);
 
     if (objn || objt)
@@ -172 +178 @@
     if (where)
     {
-        if (!fContainer.FindObject(where))
+        if (!fContainer->FindObject(where))
         {
             *fLog << dbginf << "Error: Cannot find parameter container after which the new one should be added!" << endl;
@@ -181 +187 @@
     *fLog << "Adding " << name << " to " << GetName() << "... " << flush;
 
-    fContainer.Add(cont);
+    fContainer->Add(cont);
     *fLog << "Done." << endl;
 
@@ -204 +210 @@
     while ((cont=(MParContainer*)Next()))
     {
-        //
+        AddToList(cont);
+/*        //
         // Get Name of new container
         //
@@ -212 +219 @@
         // Check if the new container is already existing in the list
         //
-        const TObject *objn = fContainer.FindObject(name);
-        const TObject *objt = fContainer.FindObject(cont);
+        const TObject *objn = fContainer->FindObject(name);
+        const TObject *objt = fContainer->FindObject(cont);
 
         if (objn || objt)
@@ -237 +244 @@
         *fLog << "Adding " << name << " to " << GetName() << "... " << flush;
 
-        fContainer.Add(cont);
-
-        *fLog << "Done." << endl;
+        fContainer->Add(cont);
+
+        *fLog << "Done." << endl;*/
     }
 }
@@ -250 +257 @@
 TObject *MParList::FindObject(const char *name) const
 {
-    return fContainer.FindObject(name);
+    return fContainer->FindObject(name);
 }
 
@@ -259 +266 @@
 TObject *MParList::FindObject(TObject *obj) const
 {
-    return fContainer.FindObject(obj);
+    return fContainer->FindObject(obj);
 }
 
@@ -358 +365 @@
     // if object is not existing in the list try to create one
     //
-    *fLog << dbginf << "Object '" << oname << "' [" << cname << "] not found... creating." << endl;
+    *fLog << "Object '" << oname << "' [" << cname << "] not yet in " << GetName() << "... creating." << endl;
 
     //
@@ -393 +400 @@
     // object is deleted together with the list
     //
-    fAutodelete.Add(pcont);
+    fAutodelete->Add(pcont);
 
     //
@@ -419 +426 @@
 void MParList::SetReadyToSave(Bool_t flag)
 {
-    TIter Next(&fContainer);
+    TIter Next(fContainer);
 
     MParContainer *cont=NULL;
@@ -438 +445 @@
 void MParList::Reset()
 {
-    TIter Next(&fContainer);
+    TIter Next(fContainer);
 
     MParContainer *cont=NULL;