Changeset 6253 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/04/05 13:31:19 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MFilter.cc (modified) (1 diff)
• MParContainer.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -95 +95 @@
 TString MFilter::GetRule() const
 {
-    return "<GetRule n/a for " + fName + ">";
+    return ClassName(); //"<GetRule n/a for " + fName + ">";
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -534 +534 @@
 MParContainer *MParContainer::GetNewObject(const char *name, TClass *base) const
 {
+    return base ? GetNewObject(name, base->GetName()) : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return a new object of class 'name'. Make sure that the object
+// derives from the class base.
+//
+// In case of failure return NULL
+//
+// The caller is responsible of deleting the object!
+//
+MParContainer *MParContainer::GetNewObject(const char *name, const char *base) const
+{
     TClass *cls = GetConstructor(name);
     if (!cls || !base)
@@ -540 +554 @@
     if (!cls->InheritsFrom(base))
     {
-        *fLog << " - Class doesn't inherit from " << base->GetName() << endl;
+        *fLog << err;
+        *fLog << dbginf << GetDescriptor() << " - Cannot create new instance of class '" << name << "': ";
+        *fLog << " - Class " << cls->GetName() << " doesn't inherit from " << base << endl;
         return NULL;
     }
@@ -550 +566 @@
     if (!obj)
     {
-        *fLog << " - Class has no default constructor." << endl;
-        *fLog << " - An abstract member functions of a base class is not overwritten." << endl;
-        return NULL;
-    }
-
-    return (MParContainer*)obj;
-}
-
-// --------------------------------------------------------------------------
-//
-// Return a new object of class 'name'. Make sure that the object
-// derives from the class base.
-//
-// In case of failure return NULL
-//
-// The caller is responsible of deleting the object!
-//
-MParContainer *MParContainer::GetNewObject(const char *name, const char *base) const
-{
-    TClass *cls = GetConstructor(name);
-    if (!cls || !base)
-        return NULL;
-
-    if (!cls->InheritsFrom(base))
-    {
-        *fLog << " - Class doesn't inherit from " << base << endl;
-        return NULL;
-    }
-
-    //
-    // create the parameter container of the the given class type
-    //
-    TObject *obj = (TObject*)cls->New();
-    if (!obj)
-    {
-        *fLog << " - Class has no default constructor." << endl;
+        *fLog << err;
+        *fLog << dbginf << GetDescriptor() << " - Cannot create new instance of class '" << name << "': ";
+        *fLog << " - Class " << cls->GetName() << " has no default constructor." << endl;
         *fLog << " - An abstract member functions of a base class is not overwritten." << endl;
         return NULL;
@@ -766 +749 @@
         return kFALSE;
 
-    *fLog << warn << "WARNING - Resource " << prefix+fName << " found, but no " << ClassName() << "::ReadEnv." << endl;
+    *fLog << warn << "WARNING - " << fName << ": Resource " << prefix << " found, but no " << ClassName() << "::ReadEnv." << endl;
     return kTRUE;
 }