Changeset 251 for trunk/nom/class_c/nomcls.c

Timestamp:

Mar 11, 2007, 2:22:39 PM (18 years ago)

Author:

cinc

Message:

Implemented some methods. Bug fixes and documentation.

File:

• trunk/nom/class_c/nomcls.c (modified) (4 diffs)

trunk/nom/class_c/nomcls.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
+/** \file noncls.c
+    
+    Implementation file for the NOMClass class.
+*/
 #ifndef NOM_NOMClass_IMPLEMENTATION_FILE
 #define NOM_NOMClass_IMPLEMENTATION_FILE
@@ -83 +87 @@
   ncp=(NOMClassPriv*)_ncpObject;
 
+  /* Allocate memory big enough to hold an object. This means the size is that of the
+     mtab pointer and all instance variables. */
   if((nObj=_nomAllocate(nomSelf, ncp->mtab->ulInstanceSize, NULLHANDLE))==NULLHANDLE)
     return NULLHANDLE;
@@ -149 +155 @@
 
 /**
-   Function which implements the nomGetName() method of NOMClass.
+   Function which implements the nomGetCreatedClassName() method of NOMClass.
 */
-NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomGetName(NOMClass* nomSelf, CORBA_Environment *ev)
-{
-  return nomSelf->mtab->nomClassName;
+NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomGetCreatedClassName(NOMClass* nomSelf, CORBA_Environment *ev)
+{
+  NOMClassPriv* ncp;
+
+  /* The private struct characterizing the objects this meta class can create. */
+  ncp=_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);
+
+  if(!ncp)
+    return ""; /* That can not happen but anyway... */
+
+  //  return nomSelf->mtab->nomClassName;
+  return ncp->mtab->nomClassName;
 }
 
@@ -212 +227 @@
 
       /* FIXME: no use of version information, yet. */
-      //nomPrintf("I'm here (%s): ", _nomGetName(nomSelf, NULLHANDLE));
-      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
+      
+      //The following was used before changing nomGetname()
+      //if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
+      //                        0, 0, NULLHANDLE))
+      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetClassName(nomSelf, NULLHANDLE),
                               0, 0, NULLHANDLE))
+
         {
           NOMClassPriv* ncPriv;