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

Timestamp:

07/21/08 09:11:21 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -130 +130 @@
 
     TIter Next(fContainer);
-    TObject *o;
+    TObject *o=0;
     while ((o=Next()))
         if (o->TestBit(kCanDelete))
@@ -136 +136 @@
 
     // FIXME? If fContainer is owner do we have to remove the object
-    //   from fAutodelete due to the acces when checking for a
+    //   from fAutodelete due to the access when checking for a
     //   garbage collection?
-
     delete fContainer;
     delete fAutodelete;
@@ -572 +571 @@
     // try to get class from root environment
     //
-    TClass *cls = gROOT->GetClass(cname);
-    Int_t rc = 0;
+    *fLog << err;
+    TClass *cls = GetClass(cname, fLog);
     if (!cls)
-        rc =1;
-    else
-    {
-        if (!cls->Property())
-            rc = 5;
-        if (!cls->Size())
-            rc = 4;
-        if (!cls->IsLoaded())
-            rc = 3;
-        if (!cls->HasDefaultConstructor())
-            rc = 2;
-    }
-
-    if (rc)
-    {
-        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "': ";
-        switch (rc)
-        {
-        case 1:
-            *fLog << "gROOT->GetClass() returned NULL." << endl;
-            return NULL;
-        case 2:
-            *fLog << "no default constructor." << endl;
-            return NULL;
-        case 3:
-            *fLog << "not loaded." << endl;
-            return NULL;
-        case 4:
-            *fLog << "zero size." << endl;
-            return NULL;
-        case 5:
-            *fLog << "no property." << endl;
-            return NULL;
-        }
-    }
+        return NULL;
 
     if (!cls->InheritsFrom(MParContainer::Class()))
@@ -811 +776 @@
     // try to get class from root environment
     //
-    TClass *cls = gROOT->GetClass(cname);
+    TClass *cls = GetClass(cname);
     if (!cls)
-    {
-        //
-        // if class is not existing in the root environment
-        //
-        gLog << dbginf << "Class '" << cname << "' not existing in dictionary." << endl;
+        return list;
+
+    if (!cls->InheritsFrom(MParContainer::Class()))
+    {
+        *fLog << err << dbginf << "Cannot create new instance of class '" << cname << "': " << endl;
+        *fLog << "Class doesn't inherit from MParContainer." << endl;
         return list;
     }