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

Timestamp:

05/02/03 08:56:31 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -65 +65 @@
 #include "MLogManip.h"
 
+#include "MIter.h"
 #include "MFilter.h"
 #include "MParList.h"
@@ -288 +289 @@
     MTask *task=NULL;
     //
-    // loop over all tasks for preproccesing
+    // loop over all tasks for reinitialization
     //
     while ((task=(MTask*)Next()))
@@ -330 +331 @@
 {
     *fLog << all << "Preprocessing... " << flush;
+    if (fDisplay)
+    {
+        // Set status lines
+        fDisplay->SetStatusLine1("PreProcessing...");
+        fDisplay->SetStatusLine2("");
+    }
 
     fParList = pList;
@@ -347 +354 @@
     while ((task=(MTask*)Next()))
     {
-        *fLog << all << task->GetName() << "... " << flush;
-        if (fDisplay)
-            fDisplay->SetStatusLine2(*task);
-
         //
         // PreProcess the task and check for it's return value.
@@ -494 +497 @@
 {
     *fLog << all << "Postprocessing... " << flush;
+    if (fDisplay)
+    {
+        // Set status lines
+        fDisplay->SetStatusLine1("PostProcessing...");
+        fDisplay->SetStatusLine2("");
+    }
 
     //
@@ -518 +527 @@
     while ( (task=(MTask*)Next()) )
     {
-        *fLog << all << task->GetName() << "... " << flush;
-        if (fDisplay)
-            fDisplay->SetStatusLine2(*task);
-
         if (!task->CallPostProcess())
             return kFALSE;
@@ -602 +607 @@
     out << ";" << endl << endl;
 
-    TIter Next(fTasks);
+    MIter Next(fTasks);
 
     MParContainer *cont = NULL;
-    while ((cont=(MParContainer*)Next()))
+    while ((cont=Next()))
     {
         cont->SavePrimitive(out, "");
@@ -654 +659 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fTasks);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fTasks);
+    while ((cont=Next()))
     {
         if (cont->InheritsFrom("MTaskList"))
@@ -730 +735 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fTasks);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fTasks);
+    while ((cont=Next()))
         if (!cont->WriteEnv(env, prefix, print))
             return kFALSE;