Changeset 4828 for trunk/MagicSoft/Mars/mbase

Timestamp:

09/02/04 14:32:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParContainer.h (modified) (1 diff)
• MParList.cc (modified) (2 diffs)
• MParList.h (modified) (2 diffs)
• MTaskList.cc (modified) (4 diffs)
• MTaskList.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -101 +101 @@
     virtual void SetDisplay(MStatusDisplay *d) { fDisplay = d; }
 
-    // FIXME: Change to ostream!
+    // FIXME: Change to ostream! Seems to be difficult, because
+    //        MTaskListStreamPrimitive calls SavePrimitive(ofstream&).
+    //        Maybe with a cast?
     virtual void StreamPrimitive(ofstream &out) const;
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -51 +51 @@
 
 #include "MIter.h"
+#include "MTaskList.h"
 
 ClassImp(MParList);
@@ -376 +377 @@
     TObject *l = FindObject(tlist, "MTaskList");
     return (MTask*)(l ? l->FindObject(name) : NULL);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Find a tasklist which contains a task with name name
+//
+MTaskList *MParList::FindTaskListWithTask(const char *name) const
+{
+    TIter Next(fContainer);
+    TObject *o=0;
+    while ((o=Next()))
+    {
+        MTaskList *l1 = dynamic_cast<MTaskList*>(o);
+        if (!l1)
+            continue;
+
+        MTaskList *l2 = l1->FindTaskList(name);
+        if (l2)
+            return l2;
+    }
+    return 0;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Find a tasklist which contains a task task
+//
+MTaskList *MParList::FindTaskListWithTask(const MTask *task) const
+{
+    TIter Next(fContainer);
+    TObject *o=0;
+    while ((o=Next()))
+    {
+        MTaskList *l1 = dynamic_cast<MTaskList*>(o);
+        if (!l1)
+            continue;
+
+        MTaskList *l2 = l1->FindTaskList(task);
+        if (l2)
+            return l2;
+    }
+    return 0;
 }
 

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -22 +22 @@
 class MLog;
 class MTask;
+class MTaskList;
 
 class MParList : public MParContainer
@@ -53 +54 @@
     void SetDisplay(MStatusDisplay *d);
 
-    TObject *FindObject(const char *name) const;
-    TObject *FindObject(const TObject *obj) const;
+    TObject   *FindObject(const char *name) const;
+    TObject   *FindObject(const TObject *obj) const;
 
-    TObject *FindObject(const char *name, const char *classname) const;
-    TObject *FindObject(const TObject *obj, const char *classname) const;
+    TObject   *FindObject(const char *name, const char *classname) const;
+    TObject   *FindObject(const TObject *obj, const char *classname) const;
 
-    MTask   *FindTask(const char *name, const char *tlist="MTaskList") const;
+    MTask     *FindTask(const char *name, const char *tlist="MTaskList") const;
+    MTaskList *FindTaskListWithTask(const char *name) const;
+    MTaskList *FindTaskListWithTask(const MTask *task) const;
 
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -229 +229 @@
 Bool_t MTaskList::AddToListBefore(MTask *task, const MTask *where, const char *type)
 {
+    if (task==this)
+    {
+        *fLog << warn << "WARNING - You cannot add a tasklist to itself.  This" << endl;
+        *fLog << "          would create infinite recursions...ignored." << endl;
+        return kFALSE;
+
+    }
+
     // FIXME: We agreed to put the task into list in an ordered way.
     if (!CheckAddToList(task, type, where))
@@ -249 +257 @@
 Bool_t MTaskList::AddToListAfter(MTask *task, const MTask *where, const char *type)
 {
+    if (task==this)
+    {
+        *fLog << warn << "WARNING - You cannot add a tasklist to itself.  This" << endl;
+        *fLog << "          would create infinite recursions...ignored." << endl;
+        return kFALSE;
+
+    }
+
     // FIXME: We agreed to put the task into list in an ordered way.
-
     if (!CheckAddToList(task, type, where))
         return kFALSE;
@@ -270 +285 @@
 Bool_t MTaskList::AddToList(MTask *task, const char *type)
 {
+    if (task==this)
+    {
+        *fLog << warn << "WARNING - You cannot add a tasklist to itself.  This" << endl;
+        *fLog << "          would create infinite recursions...ignored." << endl;
+        return kFALSE;
+
+    }
+
     // FIXME: We agreed to put the task into list in an ordered way.
-
     if (!CheckAddToList(task, type))
         return kFALSE;
@@ -301 +323 @@
 {
     return fTasks->FindObject(obj);
+}
+
+// --------------------------------------------------------------------------
+//
+// find recursively a tasklist which contains a task with name task
+//
+MTaskList *MTaskList::FindTaskList(const char *task)
+{
+    if (FindObject(task))
+        return this;
+
+    TIter Next(fTasks);
+    TObject *o = 0;
+    while ((o=Next()))
+    {
+        MTaskList *l = dynamic_cast<MTaskList*>(o);
+        if (!l)
+            continue;
+
+        if (l->FindObject(task))
+            return l;
+    }
+    return 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// find recursively a tasklist which contains a task task
+//
+MTaskList *MTaskList::FindTaskList(const MTask *task)
+{
+    if (FindObject(task))
+        return this;
+
+    TIter Next(fTasks);
+    TObject *o = 0;
+    while ((o=Next()))
+    {
+        MTaskList *l = dynamic_cast<MTaskList*>(o);
+        if (!l)
+            continue;
+
+        if (l->FindObject(task))
+            return l;
+    }
+
+    return 0;
 }
 

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -62 +62 @@
         return (MTask*)FindObject(obj);
     }
+    MTaskList *FindTaskList(const char *task);
+    MTaskList *FindTaskList(const MTask *task);
 
     Bool_t ReInit(MParList *pList=NULL);