Changeset 1967 in Sophya for trunk/SophyaLib/SkyMap

Timestamp:

Apr 26, 2002, 6:48:22 PM (23 years ago)

Author:

ansari

Message:

Ajout throw TypeMismatchExc ds PPersist_X::SetDataObj() ds les differents classes handler PPersist, a place du return simple, lorsque le type d'objet n'etait pas bon ... Reza 26/4/2002

Location:

trunk/SophyaLib/SkyMap

Files:

• fiolocalmap.cc (modified) (2 diffs)
• fiospherethetaphi.cc (modified) (2 diffs)
• spherepos.cc (modified) (2 diffs)

trunk/SophyaLib/SkyMap/fiolocalmap.cc

@@ -4 +4 @@
 #include "pexceptions.h"
 #include "fiondblock.h"
+#include "datatype.h"
+#include <typeinfo>
 
 //*******************************************************************
@@ -72 +74 @@
 {
   LocalMap<T> * po = dynamic_cast< LocalMap<T> * >(&o);
-  if (po == NULL) return;
+  if (po == NULL) {
+    char buff[160];
+    sprintf(buff,"FIO_LocalMap<%s>::SetDataObj(%s) - Object type  error ! ",
+            DataTypeInfo<T>::getTypeName().c_str(), typeid(o).name());
+    throw TypeMismatchExc(PExcLongMessage(buff));    
+  }
   if (ownobj && dobj) delete dobj;
   dobj = po; ownobj = false;

trunk/SophyaLib/SkyMap/fiospherethetaphi.cc

@@ -4 +4 @@
 #include "pexceptions.h"
 #include "fiondblock.h"
+#include "datatype.h"
+#include <typeinfo>
 
 ///////////////////////////////////////////////////////////
@@ -57 +59 @@
 {
   SphereThetaPhi<T> * po = dynamic_cast< SphereThetaPhi<T> * >(&o);
-  if (po == NULL) return;
+  if (po == NULL) {
+    char buff[160];
+    sprintf(buff,"FIO_SphereThetaPhi<%s>::SetDataObj(%s) - Object type  error ! ",
+            DataTypeInfo<T>::getTypeName().c_str(), typeid(o).name());
+    throw TypeMismatchExc(PExcLongMessage(buff));    
+  }
+
   if (ownobj && dobj) delete dobj;
   dobj = po; ownobj = false;

trunk/SophyaLib/SkyMap/spherepos.cc

@@ -2 +2 @@
 
 #include "spherepos.h"
+#include "datatype.h"
+#include <typeinfo>
 
-static char *head_spherepos_cc_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.cc,v 1.1.1.1 2000-03-02 17:05:39 ansari Exp $";
+static char *head_spherepos_cc_ = "$Header: /Users/garnier/temp/CVSSophya/SophyaLib/SkyMap/spherepos.cc,v 1.2 2002-04-26 16:48:22 ansari Exp $";
 
 
@@ -72 +74 @@
 {
   SphereCoordSys * po = dynamic_cast<SphereCoordSys *>(&o);
-  if (po == NULL) return;
+  if (po == NULL) {
+    char buff[160];
+    sprintf(buff,"FIO_SphereCoordSys::SetDataObj(%s) - Object type  error ! ",
+            typeid(o).name());
+    throw TypeMismatchExc(PExcLongMessage(buff));    
+  }
+
   if (ownobj && dobj) delete dobj;  
   dobj = po; ownobj = false;