Changeset 8781

Timestamp:

02/25/09 15:10:51 (4 years ago)

Author:

mcarrick

Message:

reformatting debugging calls

Location:

ossiedev/trunk/system/ossie/parser

Files:

• DeviceClass.cpp (modified) (1 diff)
• DevicePkg.cpp (modified) (6 diffs)
• DevicePkgRef.cpp (modified) (2 diffs)
• HWDeviceRegistration.cpp (modified) (12 diffs)
• PropertyFile.cpp (modified) (2 diffs)

ossiedev/trunk/system/ossie/parser/DeviceClass.cpp

@@ -39 +39 @@
 void DeviceClass::parseElement(TiXmlElement *elem)
 {
+        DEBUG(4, DeviceClass, "in parseElement");
+
         TiXmlElement *classType = elem->FirstChildElement("class"); // set link to class tags
         

ossiedev/trunk/system/ossie/parser/DevicePkg.cpp

@@ -59 +59 @@
 void DevicePkg::parseAttributeID(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseAttributeID");
+
         if (elem->Attribute("id"))
         {
-                DEBUG(4, DevicePkg, "Found ID attribute");
                 id = elem->Attribute("id");
         }
@@ -73 +74 @@
 void DevicePkg::parseAttributeName(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseAttributeName");
+
         if (elem->Attribute("name"))
         {
-                DEBUG(4, DevicePkg, "Found NAME attribute");
                 name = elem->Attribute("name");
         }
@@ -87 +89 @@
 void DevicePkg::parseAttributeVersion(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseAttributeVersion");
+
         if (elem->Attribute("version"))
         {
-                DEBUG(4, DevicePkg, "Found VERSION attribute");
                 version = elem->Attribute("version");
         }
@@ -108 +111 @@
 void DevicePkg::parseAuthor(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseAuthor");
+
         TiXmlElement *auth = elem->FirstChildElement("author");
         if (auth)
         {
-                DEBUG(4, DevicePkg, "Found author");
                 author = auth->GetText();
         }
@@ -123 +127 @@
 void DevicePkg::parseTitle(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseTitle");
+
         TiXmlElement *titleElem = elem->FirstChildElement("title");
         if (titleElem)
         {
-                DEBUG(4, DevicePkg, "Found title");
                 title = titleElem->GetText();
         }
@@ -138 +143 @@
 void DevicePkg::parseDescription(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkg, "in parseDescription");
+
         TiXmlElement *descrip = elem->FirstChildElement("description");
         if (descrip)
         {
-                DEBUG(4, DevicePkg, "Found description");
                 description = descrip->GetText();
         }

ossiedev/trunk/system/ossie/parser/DevicePkgRef.cpp

@@ -48 +48 @@
 void DevicePkgRef::parseAttributes(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkgRef, "in parseAttributes");
+
         if (elem->Attribute("type"))
         {
-                DEBUG(4, DevicePkgRef, "Found type attribute");
                 type = elem->Attribute("type");
         }
@@ -62 +63 @@
 void DevicePkgRef::parseChildElements(TiXmlElement *elem)
 {
+        DEBUG(4, DevicePkgRef, "in parseChildElements");
+
         TiXmlElement *local = elem->FirstChildElement("localfile");
         if (local)
         {
-                DEBUG(4, DevicePkgRef, "Found localfile name");
                 localfile = local->Attribute("name");
         }

ossiedev/trunk/system/ossie/parser/HWDeviceRegistration.cpp

@@ -29 +29 @@
 HWDeviceRegistration::HWDeviceRegistration(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in constructor.");
+
         parseElement(elem); // parse tags in hwdeviceregistration, with exception of propertyfile, deviceclass, childhwdevice
 
@@ -54 +56 @@
 void HWDeviceRegistration::constructChildHWDevice(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in constructChildHWDevice");
+
         // parse childhwdevice tag(s)
         for (; elem; elem=elem->NextSiblingElement("childhwdevice"))
@@ -69 +73 @@
 void HWDeviceRegistration::parseElement(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseElement");
+
         // pull info from hwdeviceregistration tag
         parseAttributes(elem);
@@ -78 +84 @@
 void HWDeviceRegistration::parseAttributes(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseAttributes");
+
         parseAttributeID(elem);
         parseAttributeVersion(elem);
@@ -85 +93 @@
 void HWDeviceRegistration::parseAttributeID(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseAttributeID");
+
         // verify attribute exists to prevent seg fault
         if (elem->Attribute("id"))
@@ -99 +109 @@
 void HWDeviceRegistration::parseAttributeVersion(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseAttributeVersion");
+
         // verify attribute exists to prevent seg fault
         if (elem->Attribute("version"))
@@ -113 +125 @@
 void HWDeviceRegistration::parseAttributeName(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseAttributeName");
+
         // verify attribute exists to prevent seg fault
         if (elem->Attribute("name"))
@@ -127 +141 @@
 void HWDeviceRegistration::parseChildElements(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseChildElements");
+
         parseDescription(elem);
         parseManufacturer(elem);
@@ -134 +150 @@
 void HWDeviceRegistration::parseDescription(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseDescription");
+
         TiXmlElement *descrip = elem->FirstChildElement("description");
         if (descrip)
@@ -148 +166 @@
 void HWDeviceRegistration::parseManufacturer(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseManufacturer");
+
         TiXmlElement *manufac = elem->FirstChildElement("manufacturer");
         if (manufac)
@@ -162 +182 @@
 void HWDeviceRegistration::parseModelNumber(TiXmlElement *elem)
 {
+        DEBUG(4, HWDeviceRegistration, "in parseModelNumber");
+
         TiXmlElement *modNum = elem->FirstChildElement("modelnumber");
         if (modNum)
@@ -176 +198 @@
 ChildHWDevice::ChildHWDevice(TiXmlElement *elem)
 {
+        DEBUG(4, ChildHWDevice, "in constructor.");
+
         hwDeviceReg = new HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"));
         devPkgRef = new DevicePkgRef(elem->FirstChildElement("devicepkgref"));

ossiedev/trunk/system/ossie/parser/PropertyFile.cpp

@@ -47 +47 @@
 void PropertyFile::parseAttributes(TiXmlElement *elem)
 {
+        DEBUG(4, PropertyFile, "in parseAttributes");
+
         // verify attribute exists before parsing to prevent seg fault
         if (elem->Attribute("type"))
         {
-                DEBUG(4, PropertyFile, "Found TYPE attribute");
                 type = elem->Attribute("type");
         }
@@ -62 +63 @@
 void PropertyFile::parseChildElements(TiXmlElement *elem)
 {
+        DEBUG(4, PropertyFile, "in parseChildElements");
+
         TiXmlElement *local = elem->FirstChildElement("localfile");
         if (local)
         {
-                DEBUG(4, PropertyFile, "Found localfile name");
                 localfile = local->Attribute("name");
         }