Changeset 294 for trunk/nom/class_c/nomclassmanager.c

Timestamp:

Apr 7, 2007, 4:29:56 PM (18 years ago)

Author:

cinc

Message:

Added ID to object mtab.

File:

• trunk/nom/class_c/nomclassmanager.c (modified) (8 diffs)

trunk/nom/class_c/nomclassmanager.c

@@ -62 +62 @@
    \remark This method isn't implemented yet.
  */
-NOM_Scope PNOMObject NOMLINK impl_NOMClassMgr_nomFindClassFromId(NOMClassMgr* nomSelf,
-                                                                 const CORBA_long classId,
-                                                                 const CORBA_long ulMajorVersion,
-                                                                 const CORBA_long ulMinorVersion,
-                                                                 CORBA_Environment *ev)
+NOM_Scope NOMClass* NOMLINK impl_NOMClassMgr_nomFindClassFromId(NOMClassMgr* nomSelf,
+                                                                const CORBA_long classId,
+                                                                const CORBA_long ulMajorVersion,
+                                                                const CORBA_long ulMinorVersion,
+                                                                CORBA_Environment *ev)
 {
   /*  NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf); */
@@ -79 +79 @@
    \brief Function which implements the nomFindClassFromName() method of NOMClassMgr.
  */
-NOM_Scope PNOMObject NOMLINK impl_NOMClassMgr_nomFindClassFromName(NOMClassMgr* nomSelf, 
-                                                                   const CORBA_char * className,
-                                                                   const CORBA_long ulMajorVersion,
-                                                                   const CORBA_long ulMinorVersion,
-                                                                   CORBA_Environment *ev)
+NOM_Scope NOMClass* NOMLINK impl_NOMClassMgr_nomFindClassFromName(NOMClassMgr* nomSelf, 
+                                                                  const CORBA_char * className,
+                                                                  const CORBA_long ulMajorVersion,
+                                                                  const CORBA_long ulMinorVersion,
+                                                                  CORBA_Environment *ev)
 {
   CORBA_Object nomRetval=NULLHANDLE;
@@ -95 +95 @@
   mtab=g_datalist_get_data(&_gdataClassList, className);
 
-  //nomPrintf("-----> %s %s %x\n", __FUNCTION__, className, mtab);
-
   if(mtab){
     NOMClassPriv* ncPriv;
     ncPriv=(NOMClassPriv*)mtab->nomClsInfo;
-    //if(1==ncPriv->ulIsMetaClass){
-    //    nomPrintf("%s: found %s\n", __FUNCTION__, mtab->nomClassName);
     nomRetval=(CORBA_Object)ncPriv->sci->nomCds->nomClassObject;
-    //}
-
   }
   return nomRetval;
@@ -142 +136 @@
   g_tree_insert(_pClassListTree, mtab, mtab->nomClassName); /* key is the mtab because we want to use
                                                                this tree for fast lookup of mtabs to 
-                                                               check for objects. */
-
-  //  g_datalist_set_data_full(&_gdataClassList, mtab->nomClassName, classMtab, priv_handleClassRemove);
-  //nomPrintf("%s: registering %lx, %s classList: %lx\n", __FUNCTION__, 
-  //classMtab, mtab->nomClassName, _gdataClassList);
+                                                               check for valid objects. */
+
+  //nomPrintf("%s: registering %lx, %s classList: %lx ID: %ld\n", __FUNCTION__, 
+  //        classMtab, mtab->nomClassName, _gdataClassList, g_quark_try_string(mtab->nomClassName));
+  mtab->classNomId=g_quark_try_string(mtab->nomClassName);
 }
 
@@ -156 +150 @@
 {
   NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf);
-  nomPrintf("    Entering %s  with nomSelf: 0x%x. nomSelf is: %s.\n",
-            __FUNCTION__, nomSelf, nomSelf->mtab->nomClassName);
 
   return _gdataClassList;
@@ -212 +204 @@
 
   g_datalist_set_data_full(&_gdataMethodList, chrMethodName, classMtab, priv_handleMethodRemoveFromList);
-  //g_datalist_set_data_full(&_gdataClassList, mtab->nomClassName, classMtab, priv_handleClassRemove);
-  // nomPrintf("%s: registering %lx, %s methodList: %lx\n", __FUNCTION__, classMtab, chrMethodName, _gdataMethodList);
-
 }
 
@@ -240 +229 @@
 {
 /* NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf); */
-  NOMObject* oClass;
-  NOMObject* rClass;
-
+  NOMClass* oClass;
+  NOMClass* rClass;
+  NOMClassPriv* ncp;
+
+  /* This returns a meta class */
   if((oClass=_nomFindClassFromName( nomSelf, oldClass, 0, 0, NULLHANDLE))==NULLHANDLE)
     return FALSE;
@@ -250 +241 @@
 
   /* Check if the class is a direct child */
+  ncp=(NOMClassPriv*)_nomGetObjectCreateInfo(rClass, NULLHANDLE);
+  
+  if(strcmp(ncp->parentMtabStruct.next->mtab->nomClassName, oldClass))
+    return FALSE;
 
   /* Save old class object pointer. Hmm, maybe not it's still in the old parentMtab */