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

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MTaskList.cc (modified) (17 diffs)

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -47 +47 @@
 #include "MTaskList.h"
 
+#include <TOrdCollection.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -63 +65 @@
 MTaskList::MTaskList(const char *name, const char *title)
 {
-    *fName  = name  ? name  : "MTaskList";
-    *fTitle = title ? title : "A list for tasks to be executed";
+    fName  = name  ? name  : "MTaskList";
+    fTitle = title ? title : "A list for tasks to be executed";
+
+    fTasks = new TOrdCollection;
 }
 
@@ -75 +79 @@
 MTaskList::MTaskList(MTaskList &ts)
 {
-    fTasks.AddAll(&ts.fTasks);
+    fTasks->AddAll(ts.fTasks);
 }
 
@@ -86 +90 @@
 {
     if (TestBit(kIsOwner))
-        fTasks.SetOwner();
+        fTasks->SetOwner();
+
+    delete fTasks;
 }
 
@@ -110 +116 @@
     // create the Iterator over the tasklist
     //
-    TIter Next(&fTasks);
+    TIter Next(fTasks);
 
     MTask *task=NULL;
@@ -147 +153 @@
     // Check if the new task is already existing in the list
     //
-    const TObject *objn = fTasks.FindObject(name);
-    const TObject *objt = fTasks.FindObject(task);
+    const TObject *objn = fTasks->FindObject(name);
+    const TObject *objt = fTasks->FindObject(task);
 
     if (objn || objt)
@@ -165 +171 @@
         // Otherwise add it to the list, but print a warning message
         //
-        *fLog << dbginf << "Warning: Task with the same name '" << task->GetName();
+        *fLog << dbginf << "Warning: Task '" << task->GetName();
         *fLog << "' already existing in '" << GetName() << "'." << endl;
         *fLog << "You may not be able to get a pointer to this task by name." << endl;
@@ -172 +178 @@
     if (where)
     {
-        if (!fTasks.FindObject(where))
+        if (!fTasks->FindObject(where))
         {
             *fLog << dbginf << "Error: Cannot find task after which the new task should be scheduled!" << endl;
@@ -182 +188 @@
 
     task->SetStreamId(type);
-    fTasks.Add(task);
+    fTasks->Add(task);
 
     *fLog << "Done." << endl;
@@ -196 +202 @@
 TObject *MTaskList::FindObject(const char *name) const
 {
-    return fTasks.FindObject(name);
+    return fTasks->FindObject(name);
 }
 
@@ -205 +211 @@
 TObject *MTaskList::FindObject(TObject *obj) const
 {
-    return fTasks.FindObject(obj);
+    return fTasks->FindObject(obj);
 }
 
@@ -221 +227 @@
     //  create the Iterator over the tasklist
     //
-    TIter Next(&fTasks);
+    TIter Next(fTasks);
 
     MTask *task=NULL;
@@ -260 +266 @@
     //  create the Iterator for the TaskList
     //
-    TIter Next(&fTasks);
+    TIter Next(fTasks);
     MTask *task=NULL;
 
@@ -271 +277 @@
         // if the task has the wrong stream id skip it.
         //
-        if (strcmp(GetStreamId(), task->GetStreamId()) &&
-            strcmp(task->GetStreamId(), "All"))
+        if (GetStreamId() != task->GetStreamId() &&
+            task->GetStreamId() !=  "All")
             continue;
 
@@ -331 +337 @@
     //  create the Iterator for the TaskList
     //
-    TIter Next(&fTasks);
+    TIter Next(fTasks);
 
     MTask *task=NULL;
@@ -377 +383 @@
     //  create the Iterator for the TaskList
     //
-    TIter Next(&fTasks);
+    TIter Next(fTasks);
 
     MTask *task=NULL;
@@ -396 +402 @@
     *fLog << "TaskList: " << GetName() << " <" << GetTitle() << ">" << endl;
 
-    fTasks.Print();
+    fTasks->Print();
 
     *fLog << endl;