Changeset 604 for ossie/trunk/ossie/parser/ComponentSupportedInterface.cpp

Timestamp:

10/05/05 14:34:19 (8 years ago)

Author:

tuan

Message:

Fix up format and some Terminate stuffs

Files:

• ossie/trunk/ossie/parser/ComponentSupportedInterface.cpp (modified) (13 diffs)

ossie/trunk/ossie/parser/ComponentSupportedInterface.cpp

@@ -26 +26 @@
 
 #include "ossie/ComponentSupportedInterface.h"
-#define mdel(x) if (x!=NULL) delete x, x=NULL;
-#define sweetd(x) if (x!=NULL) delete []x, x=NULL;
+#define DELPTR(x) if (x!=NULL) delete x, x=NULL;
+#define DELARRAY(x) if (x!=NULL) delete []x, x=NULL;
 
 /**default constructor
@@ -48 +48 @@
 theFindBy(NULL)
 {
-        this->parseElement();
+    this->parseElement();
 }
 
@@ -61 +61 @@
 {
 
-        this->identifier = new char[strlen (_csi.identifier) + 1];
-        strcpy (identifier, _csi.identifier);
+    this->identifier = new char[strlen (_csi.identifier) + 1];
+    strcpy (identifier, _csi.identifier);
 
-        this->componentInstantiationRefId =
-        new char[strlen (_csi.componentInstantiationRefId) + 1];
-        strcpy (componentInstantiationRefId, _csi.componentInstantiationRefId);
+    this->componentInstantiationRefId =
+    new char[strlen (_csi.componentInstantiationRefId) + 1];
+    strcpy (componentInstantiationRefId, _csi.componentInstantiationRefId);
 
-        this->ifComponentInstantiationRef = _csi.ifComponentInstantiationRef;
-        this->ifFindBy = _csi.ifFindBy;
+    this->ifComponentInstantiationRef = _csi.ifComponentInstantiationRef;
+    this->ifFindBy = _csi.ifFindBy;
 
-        if (_csi.theFindBy != NULL) this->theFindBy = new FindBy (_csi.root);
+    if (_csi.theFindBy != NULL) this->theFindBy = new FindBy (_csi.root);
 }
 
@@ -77 +77 @@
 ComponentSupportedInterface::~ComponentSupportedInterface ()
 {
-        mdel(theFindBy);
-        sweetd(componentInstantiationRefId);
-        sweetd(identifier);
+    DELPTR(theFindBy);
+    DELARRAY(componentInstantiationRefId);
+    DELARRAY(identifier);
 }
 
@@ -85 +85 @@
 void ComponentSupportedInterface::parseElement()
 {
-        parseID(root);
-        parseComponentInstantiationRef(root);
+    parseID(root);
+    parseComponentInstantiationRef(root);
 }
 
@@ -92 +92 @@
 void ComponentSupportedInterface::parseID (DOMElement * _elem)
 {
-        tmpXMLStr = XMLString::transcode ("supportedidentifier"); 
-        DOMNodeList *nodeList = _elem->getElementsByTagName(tmpXMLStr);
-        sweetd(tmpXMLStr);
+    tmpXMLStr = XMLString::transcode("supportedidentifier");
+    DOMNodeList *nodeList = _elem->getElementsByTagName(tmpXMLStr);
+    XMLString::release(&tmpXMLStr);
 
-        if (nodeList->getLength() != 0)
-        {
-                identifier = getTextNode((DOMElement *) nodeList->item (0));
-        }
+    if (nodeList->getLength() != 0)
+    {
+        identifier = getTextNode((DOMElement *) nodeList->item (0));
+    }
 }
 
@@ -105 +105 @@
 (DOMElement* _elem)
 {
-        tmpXMLStr = XMLString::transcode ("componentinstantiationref"); 
-        DOMNodeList *nodeList =_elem->getElementsByTagName(tmpXMLStr);
-        sweetd(tmpXMLStr);
+    tmpXMLStr = XMLString::transcode ("componentinstantiationref"); 
+    DOMNodeList *nodeList =_elem->getElementsByTagName(tmpXMLStr);
+    XMLString::release(&tmpXMLStr);
 
-        if (nodeList->getLength () != 0)
-        {
-                ifComponentInstantiationRef = true;
-                DOMElement *_tmpElement = (DOMElement *) nodeList->item (0);
+    if (nodeList->getLength () != 0)
+    {
+        ifComponentInstantiationRef = true;
+        DOMElement *_tmpElement = (DOMElement *) nodeList->item (0);
 
-                tmpXMLStr = XMLString::transcode("refid");
-                const XMLCh *_tmp =_tmpElement->getAttribute(tmpXMLStr);
-                sweetd(tmpXMLStr);
-                componentInstantiationRefId = XMLString::transcode (_tmp);
-        }
+        tmpXMLStr = XMLString::transcode("refid");
+        const XMLCh *_tmp =_tmpElement->getAttribute(tmpXMLStr);
+        XMLString::release(&tmpXMLStr);
+        componentInstantiationRefId = XMLString::transcode (_tmp);
+    }
 }
 
@@ -124 +124 @@
 char* ComponentSupportedInterface::getTextNode(DOMElement * _elem)
 {
-        DOMNodeList *nodeList = _elem->getChildNodes();
+    DOMNodeList *nodeList = _elem->getChildNodes();
 
-        if (nodeList->getLength () == 0)
-        {
-                char* astr = new char[strlen("Not Specified") +1];
-                strcpy(astr,"Not Specified");
-                return astr;
-        }
-        else return XMLString::transcode(nodeList->item (0)->getNodeValue ());
+    if (nodeList->getLength () == 0)
+    {
+        char* astr = new char[strlen("Not Specified") +1];
+        strcpy(astr,"Not Specified");
+        return astr;
+    }
+    else return XMLString::transcode(nodeList->item (0)->getNodeValue ());
 }
 
@@ -138 +138 @@
 bool ComponentSupportedInterface::isComponentInstantiationRef()
 {
-        return ifComponentInstantiationRef;
+    return ifComponentInstantiationRef;
 }
 
@@ -144 +144 @@
 bool ComponentSupportedInterface::isFindBy()
 {
-        return ifFindBy;
+    return ifFindBy;
 }
 
@@ -150 +150 @@
 char* ComponentSupportedInterface::getID() const
 {
-        return identifier;
+    return identifier;
 }
 
@@ -156 +156 @@
 char* ComponentSupportedInterface::getComponentInstantiationRefId() const
 {
-        return componentInstantiationRefId;
+    return componentInstantiationRefId;
 }
 
@@ -162 +162 @@
 FindBy* ComponentSupportedInterface::getFindBy() const
 {
-        return theFindBy;
+    return theFindBy;
 }
 XMLCh* ComponentSupportedInterface::tmpXMLStr = NULL;