Changeset 8721

Timestamp:

02/17/09 19:28:59 (4 years ago)

Author:

mcarrick

Message:

restructured, removed inheritance

Location:

ossiedev/branches/mcarrick/DPD

Files:

• DPDParser.cpp (modified) (1 diff)
• DPDParser.h (modified) (3 diffs)
• DeviceClass.cpp (modified) (1 diff)
• DeviceClass.h (modified) (1 diff)
• DevicePkg.cpp (modified) (2 diffs)
• DevicePkg.h (modified) (3 diffs)
• DevicePkgRef.cpp (modified) (1 diff)
• DevicePkgRef.h (modified) (1 diff)
• HWDeviceRegistration.cpp (modified) (5 diffs)
• HWDeviceRegistration.h (modified) (6 diffs)
• PropertyFile.cpp (modified) (1 diff)
• PropertyFile.h (modified) (1 diff)
• testApp.cpp (modified) (3 diffs)
• xml/devicePkg.xml (deleted)
• xml/test.dpd.xml (added)

ossiedev/branches/mcarrick/DPD/DPDParser.cpp

@@ -1 +1 @@
 #include "DPDParser.h"
 
-DPDParser::DPDParser(TiXmlElement *elem):DevicePkg(elem)
+DPDParser::DPDParser(TiXmlElement *elem)
 {
+        devPkg = new DevicePkg(elem);
 }
 
 DPDParser::~DPDParser()
 {
+        delete devPkg;
 }
 
+DevicePkg* DPDParser::getDevicePkg()
+{
+        return devPkg;
+}
+

ossiedev/branches/mcarrick/DPD/DPDParser.h

@@ -12 +12 @@
 
 //class OSSIEPARSER_API DPDParser:public DevicePkg
-class DPDParser:public DevicePkg
+class DPDParser
 {
         public:
@@ -18 +18 @@
                 DPDParser(TiXmlElement *elem);
                 ~DPDParser();
+
+                DevicePkg* getDevicePkg();
 
         protected:
@@ -25 +27 @@
                 DPDParser(const DPDParser &aDPDParser); // no copying
 
+                DevicePkg *devPkg;
 };
 

ossiedev/branches/mcarrick/DPD/DeviceClass.cpp

@@ -36 +36 @@
 }
 
-std::vector <std::string> DeviceClass::getDeviceClass()
+std::vector <std::string> DeviceClass::getClass()
 {
         return deviceClass;

ossiedev/branches/mcarrick/DPD/DeviceClass.h

@@ -16 +16 @@
                 ~DeviceClass();
 
-                std::vector <std::string> getDeviceClass();
+                std::vector <std::string> getClass();
 
         protected:

ossiedev/branches/mcarrick/DPD/DevicePkg.cpp

@@ -5 +5 @@
 #include "include/tinyxml.h"
 
-DevicePkg::DevicePkg(TiXmlElement *elem):HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"))
+DevicePkg::DevicePkg(TiXmlElement *elem)
 {
         parseElement(elem); // parse elements within devicepkg
+        hwDev = new HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"));
 }
 
 DevicePkg::~DevicePkg()
 {
+        delete hwDev;
 }
 
@@ -119 +121 @@
 }
 
-std::string DevicePkg::getDevPkgID()
+std::string DevicePkg::getID()
 {
         return id;
 }
 
-std::string DevicePkg::getDevPkgName()
+std::string DevicePkg::getName()
 {
         return name;
 }
 
-std::string DevicePkg::getDevPkgVersion()
+std::string DevicePkg::getVersion()
 {
         return version;
 }
 
-std::string DevicePkg::getDevPkgTitle()
+std::string DevicePkg::getTitle()
 {
         return title;
 }
 
-std::string DevicePkg::getDevPkgAuthor()
+std::string DevicePkg::getAuthor()
 {
         return author;
 }
 
-std::string DevicePkg::getDevPkgDescription()
+std::string DevicePkg::getDescription()
 {
         return description;
 }
 
+HWDeviceRegistration* DevicePkg::getHWDeviceRegistration()
+{
+        return hwDev;
+}

ossiedev/branches/mcarrick/DPD/DevicePkg.h

@@ -12 +12 @@
 
 //class OSSIEPARSER_API DevicePkg
-class DevicePkg:public HWDeviceRegistration
+class DevicePkg
 {
         public:
@@ -18 +18 @@
                 ~DevicePkg();
 
-                std::string getDevPkgID();
-                std::string getDevPkgName();
-                std::string getDevPkgVersion();
-                std::string getDevPkgTitle();
-                std::string getDevPkgAuthor();
-                std::string getDevPkgDescription();
+                std::string getID();
+                std::string getName();
+                std::string getVersion();
+                std::string getTitle();
+                std::string getAuthor();
+                std::string getDescription();
+
+                HWDeviceRegistration* getHWDeviceRegistration();
 
         protected:
@@ -43 +45 @@
                 std::string name;
                 std::string version;
-
                 std::string title;
                 std::string author;
                 std::string description;
 
-                HWDeviceRegistration hwDev(TiXmlElement *elem);
+                HWDeviceRegistration *hwDev;
 };
 

ossiedev/branches/mcarrick/DPD/DevicePkgRef.cpp

@@ -50 +50 @@
 }
 
-std::string DevicePkgRef::getDevPkgRefType()
+std::string DevicePkgRef::getType()
 {
         return type;
 }
 
-std::string DevicePkgRef::getDevPkgRefLocalFile()
+std::string DevicePkgRef::getLocalFile()
 {
         return localfile;

ossiedev/branches/mcarrick/DPD/DevicePkgRef.h

@@ -16 +16 @@
                 ~DevicePkgRef();
 
-                std::string getDevPkgRefType();
-                std::string getDevPkgRefLocalFile();
+                std::string getType();
+                std::string getLocalFile();
 
         protected:

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

@@ -5 +5 @@
 #include "include/tinyxml.h"
 
-HWDeviceRegistration::HWDeviceRegistration(TiXmlElement *elem):PropertyFile(elem->FirstChildElement("propertyfile")),
-DeviceClass(elem->FirstChildElement("deviceclass"))
+HWDeviceRegistration::HWDeviceRegistration(TiXmlElement *elem)
 {
         parseElement(elem); // parse tags in hwdeviceregistration, with exception of propertyfile, deviceclass, childhwdevice
+
+        propFile = new PropertyFile(elem->FirstChildElement("propertyfile"));
+        devClass = new DeviceClass(elem->FirstChildElement("deviceclass"));
+
         constructChildHWDevice(elem->FirstChildElement("childhwdevice")); 
 }
@@ -17 +20 @@
         {
                 delete childHWDevices[i];
-        }
+                childHWDevices[i] = NULL;
+        }
+
+        delete propFile;
+        propFile = NULL;
+        delete devClass;
+        devClass = NULL;
 
 }
@@ -145 +154 @@
 }
 
-ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref"))
+ChildHWDevice::ChildHWDevice(TiXmlElement *elem)
 {
         hwDeviceReg = new HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"));
+        devPkgRef = new DevicePkgRef(elem->FirstChildElement("devicepkgref"));
 }
 
@@ -160 +170 @@
 }
 
-std::string HWDeviceRegistration::getHWDevRegID()
+PropertyFile* HWDeviceRegistration::getPropertyFile()
+{
+        return propFile;
+}
+
+DeviceClass* HWDeviceRegistration::getDeviceClass()
+{
+        return devClass;
+}
+
+std::string HWDeviceRegistration::getID()
 {
         return id;
 }
 
-std::string HWDeviceRegistration::getHWDevRegVersion()
+std::string HWDeviceRegistration::getVersion()
 {
         return version;
 }
 
-std::string HWDeviceRegistration::getHWDevRegName()
+std::string HWDeviceRegistration::getName()
 {
         return name;
 }
 
-std::string HWDeviceRegistration::getHWDevRegDescription()
+std::string HWDeviceRegistration::getDescription()
 {
         return description;
 }
 
-std::string HWDeviceRegistration::getHWDevRegManufacturer()
+std::string HWDeviceRegistration::getManufacturer()
 {
         return manufacturer;
 }
 
-std::string HWDeviceRegistration::getHWDevRegModelNumber()
+std::string HWDeviceRegistration::getModelNumber()
 {
         return modelnumber;
@@ -195 +215 @@
 }
 
-
-
-
-
+DevicePkgRef* ChildHWDevice::getDevicePkgRef()
+{
+        return devPkgRef;
+}
+
+
+

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.h

@@ -17 +17 @@
 
 //class OSSIEPARSER_API HWDeviceRegistration
-class HWDeviceRegistration:public PropertyFile, public DeviceClass
+class HWDeviceRegistration
 {
         public:
@@ -23 +23 @@
                 ~HWDeviceRegistration();
 
-                std::string getHWDevRegID();
-                std::string getHWDevRegVersion();
-                std::string getHWDevRegName();
-                std::string getHWDevRegDescription();
-                std::string getHWDevRegManufacturer();
-                std::string getHWDevRegModelNumber();
+                std::string getID();
+                std::string getVersion();
+                std::string getName();
+                std::string getDescription();
+                std::string getManufacturer();
+                std::string getModelNumber();
 
                 std::vector <ChildHWDevice*> getChildHWDevice();
+                PropertyFile* getPropertyFile();
+                DeviceClass* getDeviceClass();
 
         protected:
@@ -48 +50 @@
                 HWDeviceRegistration(const HWDeviceRegistration& aHWDeviceRegistration); // no copying
 
-                std::vector <ChildHWDevice*> childHWDevices;
-
                 std::string id;
                 std::string version;
@@ -56 +56 @@
                 std::string manufacturer;
                 std::string modelnumber;
+
+                std::vector <ChildHWDevice*> childHWDevices;
+                PropertyFile *propFile;
+                DeviceClass *devClass;
 };
 
 // class OSSIEPARSER_API ChildHWDevice:public DevicePkgRef
-class ChildHWDevice:public DevicePkgRef
+class ChildHWDevice
 {
         public:
@@ -66 +70 @@
 
                 HWDeviceRegistration* getHWDeviceRegistration();
+                DevicePkgRef* getDevicePkgRef();
 
         private:
@@ -72 +77 @@
 
                 HWDeviceRegistration *hwDeviceReg;
+                DevicePkgRef *devPkgRef;
 };
 

ossiedev/branches/mcarrick/DPD/PropertyFile.cpp

@@ -50 +50 @@
 }
 
-std::string PropertyFile::getPropFileType()
+std::string PropertyFile::getType()
 {
         return type;
 }
 
-std::string PropertyFile::getPropFileLocalFile()
+std::string PropertyFile::getLocalFile()
 {
         return localfile;

ossiedev/branches/mcarrick/DPD/PropertyFile.h

@@ -15 +15 @@
                 PropertyFile(TiXmlElement *elem);
                 ~PropertyFile();
-                std::string getPropFileType();
-                std::string getPropFileLocalFile();
+                std::string getType();
+                std::string getLocalFile();
 
         protected:

ossiedev/branches/mcarrick/DPD/testApp.cpp

@@ -1 @@
-//#include "DevicePkg.h"
 #include "DPDParser.h"
 
@@ -19 +18 @@
         std::cout << "testDPDParser()" << std::endl;
 
-        char *root = "xml/devicePkg.xml";
+        char *root = "xml/test.dpd.xml";
         TiXmlDocument xmlDoc(root); // set up path to XML through char string
 
@@ -29 +28 @@
                 DPDParser parse(DPD);
 
-                std::cout << std::endl << std::endl;
-                std::cout << "<devpkg id=" << parse.getDevPkgID() << " version=" << parse.getDevPkgVersion();
-                        std::cout << " name=" << parse.getDevPkgName() << ">" << std::endl;
-                std::cout << "  <author>" << parse.getDevPkgAuthor() << "</author>" << std::endl;
-                std::cout << "  <description>" << parse.getDevPkgDescription() << "</description>" << std::endl;
-                std::cout << "  <title>" << parse.getDevPkgTitle() << "</title>" << std::endl;
-                std::cout << "  <hwdeviceregistration id=" << parse.getHWDevRegID() << " version=" << parse.getHWDevRegVersion();
-                        std::cout << " name=" << parse.getHWDevRegName() << ">" << std::endl;
-
-                std::cout << "          <propertyfile type=" << parse.getPropFileType() << ">" << std::endl;
-                std::cout << "                  <localfile name=" << parse.getPropFileLocalFile() << "/>" << std::endl;
-                std::cout << "          </propertyfile>" << std::endl;
-                std::cout << "          <description>" << parse.getHWDevRegDescription() << "</description>" << std::endl;
-                std::cout << "          <manufacturer>" << parse.getHWDevRegManufacturer() << "</manufacturer>" << std::endl;
-                std::cout << "          <modelnumber>" << parse.getHWDevRegModelNumber() << "</modelnumber>" << std::endl;
-                std::cout << "          <deviceclass>" << std::endl;
-                for (int i = 0; i < parse.getDeviceClass().size(); i++)
-                {
-                std::cout << "                  <class>" << parse.getDeviceClass()[i] << "</class>" << std::endl;
-                }
-                std::cout << "          </deviceclass>" << std::endl;
-
-                for (int i = 0; i < parse.getChildHWDevice().size(); i++)
-                {
-                std::cout << "          <childhwdevice>" << std::endl;
-                std::cout << "                  <hwdeviceregistration id=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegID();
-                        std::cout << " version=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegVersion();
-                        std::cout << " name=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegName() << ">" << std::endl;
-                std::cout << "                          <propertyfile type=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getPropFileType();
-                        std::cout << ">" << std::endl;
-                std::cout << "                                  <localfile name=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getPropFileLocalFile();
-                        std::cout << "/>" << std::endl;
-                std::cout << "                          </propertyfile>" << std::endl;
-
-                std::cout << "                          <description>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegDescription();
-                        std::cout << "</descripton>" << std::endl;
-                std::cout << "                          <manufacturer>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegManufacturer();
-                        std::cout << "</manufacturer>" << std::endl;
-                std::cout << "                          <modelnumber>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegModelNumber();
-                        std::cout << "</modelnumber>" << std::endl;
-                std::cout << "                          <deviceclass>" << std::endl;
-                for (int k = 0; k < parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getDeviceClass().size(); k++)
-                {
-                std::cout << "                                  <class>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getDeviceClass()[k];
-                        std::cout << "</class>" << std::endl;
-                }
-                std::cout << "                          </deviceclass>" << std::endl;
-
-
-                for (int j = 0; j < parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice().size(); j++)
-                {
-                std::cout << "                          <childhwdevice>" << std::endl;
-                std::cout << "                                  <hwdeviceregistration id=";
-                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegID();
-                        std::cout << " version=";
-                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegVersion();
-                        std::cout << " name=";
-                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegName();
-                        std::cout << ">" << std::endl;
-                        std::cout << "                                  ..." << std::endl;
-                std::cout << "                                  </hwdeviceregistration>" << std::endl;
-                std::cout << "                          </childhwdevice>" << std::endl;
-                }
-
-                }
-                std::cout << "  </hwdeviceregistration>" << std::endl;
-                std::cout << "</devpkg>" << std::endl;
+                std::cout << "devpkg: id=" << parse.getDevicePkg()->getID() << " name=" << parse.getDevicePkg()->getName();
+                        std::cout << " version=" << parse.getDevicePkg()->getVersion() << std::endl;
+                std::cout << "  title: " << parse.getDevicePkg()->getTitle() << std::endl;
+                std::cout << "  author: " << parse.getDevicePkg()->getAuthor() << std::endl;
+                std::cout << "  description: " << parse.getDevicePkg()->getDescription() << std::endl;
+                std::cout << "  hwdeviceregistration: id=" << parse.getDevicePkg()->getHWDeviceRegistration()->getID() << std::endl;
+                std::cout << "          deviceclass" << std::endl;
+                std::cout << "                  class: " << parse.getDevicePkg()->getHWDeviceRegistration()->getDeviceClass()->getClass()[0] << std::endl;
+                std::cout << "          childhwdevice: " << std::endl;
+                std::cout << "                  hwdeviceregistration: id=" << parse.getDevicePkg()->getHWDeviceRegistration()->getChildHWDevice()[0]->getHWDeviceRegistration()->getID() << std::endl;
 
         }