Changeset 171 for cpp/frams/util

Timestamp:

03/13/14 01:00:33 (11 years ago)

Author:

sz

Message:

getObjectTarget is now the recommended way to retrieve object from ExtValue?, can post the standard warning message about missing object

Location:

cpp/frams/util

Files:

• extvalue.cpp (modified) (10 diffs)
• extvalue.h (modified) (2 diffs)

cpp/frams/util/extvalue.cpp

@@ -56 +56 @@
 if (!(subtype&1)) return false;
 if (dbobject->refcount==1) return false;
-VectorObject* v=VectorObject::fromObject(*this);
+VectorObject* v=VectorObject::fromObject(*this,false);
 if (v)
         {
@@ -72 +72 @@
 }
 
-void* ExtObject::getTarget(const char* classname, bool through_barrier) const
+void* ExtObject::getTarget(const char* classname, bool through_barrier, bool warn) const
 {
 if (!strcmp(interfaceName(),classname))
@@ -81 +81 @@
         BarrierObject *bo=BarrierObject::fromObject(*this);
         if (bo)
-                return bo->getSourceObject().getTarget(classname);
+                return bo->getSourceObject().getTarget(classname,true,warn);
         }
 #endif
+
+if (warn)
+        {
+        FMprintf("ExtValue","getObjectTarget",FMLV_WARN,"%s object expected, %s found",classname,interfaceName());
+        }
+
 return NULL;
 }
@@ -173 +179 @@
 
 if (isEmpty()) return SString();
-VectorObject *vec=VectorObject::fromObject(*this);
+VectorObject *vec=VectorObject::fromObject(*this,false);
 if (vec)
         return vec->serialize();
-DictionaryObject *dic=DictionaryObject::fromObject(*this);
+DictionaryObject *dic=DictionaryObject::fromObject(*this,false);
 if (dic)
         return dic->serialize();
@@ -215 +221 @@
 ///////////////////////////////////////
 
+void *ExtValue::getObjectTarget(const char* classname,bool warn) const
+{
+if (type!=TObj)
+        {
+        if (warn)
+                {
+                SString tmp=getString();
+                if (tmp.len()>30) tmp=tmp.substr(0,30)+"...";
+                if (type==TString) tmp=SString("\"")+tmp+SString("\"");
+                FMprintf("ExtValue","getObjectTarget",FMLV_WARN,"%s object expected, %s found",classname,(const char*)tmp);
+                }
+        return NULL;
+        }
+
+return getObject().getTarget(classname,true,warn);
+}
+
 void ExtValue::set(const ExtValue& src)
 {
@@ -326 +349 @@
         case TObj:
                 {
-                VectorObject *vec=VectorObject::fromObject(getObject());
-                VectorObject *vec2=VectorObject::fromObject(src.getObject());
+                VectorObject *vec=VectorObject::fromObject(getObject(),false);
+                VectorObject *vec2=VectorObject::fromObject(src.getObject(),false);
                 if (vec && vec2)
                         {
@@ -368 +391 @@
         case TObj:
                 {
-                VectorObject *vec=VectorObject::fromObject(getObject());
+                VectorObject *vec=VectorObject::fromObject(getObject(),false);
                 if (vec)
                         {
@@ -532 +555 @@
         case TString:
         {
-        VectorObject *vec=VectorObject::fromObject(src.getObject());
+        VectorObject *vec=VectorObject::fromObject(src.getObject(),false);
         if (vec)
                 sdata()=format(sdata(),(const ExtValue**)&vec->data.getref(0),vec->data.size());
@@ -815 +838 @@
         if (cls && (tmp.getType()!=TUnknown) && (tmp.getType()!=TInvalid))
                 {
-                VectorObject *vec=VectorObject::fromObject(tmp.getObject());
+                VectorObject *vec=VectorObject::fromObject(tmp.getObject(),false);
                 if (vec)
                         {
@@ -826 +849 @@
                                 }
                         }
-                DictionaryObject *dic=DictionaryObject::fromObject(tmp.getObject());
+                DictionaryObject *dic=DictionaryObject::fromObject(tmp.getObject(),false);
                 if (dic)
                         {

cpp/frams/util/extvalue.h

@@ -58 +58 @@
 bool matchesInterfaceName(ParamInterface* pi) const {return !strcmp(interfaceName(),pi->getName());}
 void* getTarget() const {return (subtype&1)?dbobject:object;}
-void* getTarget(const char* classname, bool through_barrier=true) const;
+void* getTarget(const char* classname, bool through_barrier=true, bool warn=true) const;
 void setEmpty() {decref();subtype=0;param=NULL;object=NULL;}
 int isEmpty() const {return !param;}
@@ -142 +142 @@
 bool makeUnique() {return (type==TObj) && odata().makeUnique();} //< @return false if nothing has changed
 ExtPType getType() {return type;}
-void *getObjectTarget(const char* classname) {return (type==TObj)?getObject().getTarget(classname):0;}
+void *getObjectTarget(const char* classname,bool warn=true) const;
 void setInt(long v) {if (type!=TInt) setri(v); else idata()=v;}
 void setDouble(double v) {if (type!=TDouble) setrd(v); else ddata()=v;}