ENH: Remove XdmfObject since it was unnecessary and broke Java wrapping for NetDMF.

Xdmf.i

@@ -16,7 +16,6 @@ swig -v -c++ -python -o XdmfPython.cpp Xdmf.i
 	#include <XdmfInformation.hpp>
 	#include <XdmfItem.hpp>
 	#include <XdmfItemProperty.hpp>
-	#include <XdmfObject.hpp>
 	#include <XdmfVisitor.hpp>
 	#include <XdmfWriter.hpp>
 

XdmfAttribute.cpp

@@ -14,12 +14,10 @@ XdmfAttribute::XdmfAttribute() :
 	mAttributeType(XdmfAttributeType::NoAttributeType()),
 	mAttributeCenter(XdmfAttributeCenter::Grid())
 {
-	std::cout << "Created Attribute " << this << std::endl;
 }
 
 XdmfAttribute::~XdmfAttribute()
 {
-	std::cout << "Deleted Attribute " << this << std::endl;
 }
 
 const std::string XdmfAttribute::ItemTag = "Attribute";

XdmfAttribute.hpp

@@ -18,7 +18,17 @@ class XdmfAttribute : public XdmfDataItem {
 
 public:
 
-	XdmfNewMacro(XdmfAttribute);
+	/**
+	 * Create a new XdmfAttribute.
+	 *
+	 * @return constructed XdmfAttribute.
+	 */
+	static boost::shared_ptr<XdmfAttribute> New()
+	{
+		boost::shared_ptr<XdmfAttribute> p(new XdmfAttribute());
+		return p;
+	};
+
 	virtual ~XdmfAttribute();
 
 	LOKI_DEFINE_VISITABLE(XdmfAttribute, XdmfDataItem)

XdmfAttributeType.cpp

@@ -53,12 +53,10 @@ boost::shared_ptr<const XdmfAttributeType> XdmfAttributeType::GlobalId()
 XdmfAttributeType::XdmfAttributeType(const std::string & name) :
 	mName(name)
 {
-	std::cout << "CRRRRREATED" << std::endl;
 }
 
 XdmfAttributeType::~XdmfAttributeType()
 {
-	std::cout << "DEEEELETED" << std::endl;
 }
 
 boost::shared_ptr<const XdmfAttributeType> XdmfAttributeType::New(const std::map<std::string, std::string> & itemProperties)

XdmfDomain.cpp

@@ -11,12 +11,10 @@
 
 XdmfDomain::XdmfDomain()
 {
-	std::cout << "Created Domain " << this << std::endl;
 }
 
 XdmfDomain::~XdmfDomain()
 {
-  std::cout << "Deleted Domain " << this << std::endl;
 }
 
 const std::string XdmfDomain::ItemTag = "Domain";

XdmfDomain.hpp

@@ -18,7 +18,17 @@ class XdmfDomain : public virtual XdmfItem {
 
 public:
 
-	XdmfNewMacro(XdmfDomain);
+	/**
+	 * Create a new XdmfDomain.
+	 *
+	 * @return constructed XdmfDomain.
+	 */
+	static boost::shared_ptr<XdmfDomain> New()
+	{
+		boost::shared_ptr<XdmfDomain> p(new XdmfDomain());
+		return p;
+	};
+
 	virtual ~XdmfDomain();
 
 	LOKI_DEFINE_VISITABLE(XdmfDomain, XdmfItem)

XdmfGeometry.cpp

@@ -13,12 +13,10 @@ XdmfGeometry::XdmfGeometry() :
 	mGeometryType(XdmfGeometryType::NoGeometryType()),
 	mNumberPoints(0)
 {
-	std::cout << "Created Geometry " << this << std::endl;
 }
 
 XdmfGeometry::~XdmfGeometry()
 {
-	std::cout << "Deleted Geometry " << this << std::endl;
 }
 
 const std::string XdmfGeometry::ItemTag = "Geometry";

XdmfGeometry.hpp

@@ -18,7 +18,17 @@ class XdmfGeometry : public XdmfDataItem {
 
 public:
 
-	XdmfNewMacro(XdmfGeometry);
+	/**
+	 * Create a new XdmfGeometry.
+	 *
+	 * @return constructed XdmfGeometry.
+	 */
+	static boost::shared_ptr<XdmfGeometry> New()
+	{
+		boost::shared_ptr<XdmfGeometry> p(new XdmfGeometry());
+		return p;
+	};
+
 	virtual ~XdmfGeometry();
 
 	LOKI_DEFINE_VISITABLE(XdmfGeometry, XdmfDataItem)

XdmfGrid.cpp

@@ -18,12 +18,10 @@ XdmfGrid::XdmfGrid() :
 	mTopology(XdmfTopology::New()),
 	mName("Grid")
 {
-	std::cout << "Created Grid " << this << std::endl;
 }
 
 XdmfGrid::~XdmfGrid()
 {
-  std::cout << "Deleted Grid " << this << std::endl;
 }
 
 const std::string XdmfGrid::ItemTag = "Grid";

XdmfGrid.hpp

@@ -23,7 +23,17 @@ class XdmfGrid : public virtual XdmfItem {
 
 public:
 
-	XdmfNewMacro(XdmfGrid);
+	/**
+	 * Create a new XdmfGrid.
+	 *
+	 * @return constructed XdmfGrid.
+	 */
+	static boost::shared_ptr<XdmfGrid> New()
+	{
+		boost::shared_ptr<XdmfGrid> p(new XdmfGrid());
+		return p;
+	};
+
 	virtual ~XdmfGrid();
 
 	LOKI_DEFINE_VISITABLE(XdmfGrid, XdmfItem)

XdmfGridCollection.cpp

@@ -12,12 +12,10 @@ XdmfGridCollection::XdmfGridCollection() :
 	mCollectionType(XdmfGridCollectionType::NoCollectionType())
 {
 	mName = "Collection";
-	std::cout << "Created Collection " << this << std::endl;
 }
 
 XdmfGridCollection::~XdmfGridCollection()
 {
-  std::cout << "Deleted Collection " << this << std::endl;
 }
 
 const std::string XdmfGridCollection::ItemTag = "Grid";

XdmfGridCollection.hpp

@@ -20,7 +20,17 @@ class XdmfGridCollection : public XdmfGrid, public XdmfDomain {
 
 public:
 
-	XdmfNewMacro(XdmfGridCollection);
+	/**
+	 * Create a new XdmfGridCollection.
+	 *
+	 * @return constructed XdmfGridCollection.
+	 */
+	static boost::shared_ptr<XdmfGridCollection> New()
+	{
+		boost::shared_ptr<XdmfGridCollection> p(new XdmfGridCollection());
+		return p;
+	};
+
 	virtual ~XdmfGridCollection();
 
 	LOKI_DEFINE_VISITABLE(XdmfGridCollection, XdmfGrid)

XdmfItemFactory.hpp

@@ -14,7 +14,17 @@ class XdmfItemFactory : public XdmfCoreItemFactory {
 
 public:
 
-	XdmfNewMacro(XdmfItemFactory);
+	/**
+	 * Create a new XdmfItemFactory.
+	 *
+	 * @return constructed XdmfItemFactory.
+	 */
+	static boost::shared_ptr<XdmfItemFactory> New()
+	{
+		boost::shared_ptr<XdmfItemFactory> p(new XdmfItemFactory());
+		return p;
+	};
+
 	virtual ~XdmfItemFactory();
 
 	virtual boost::shared_ptr<XdmfItem> createItem(const std::string & itemTag, const std::map<std::string, std::string> & itemProperties) const;

XdmfReader.cpp

@@ -7,10 +7,8 @@
 XdmfReader::XdmfReader() :
 	XdmfCoreReader(XdmfItemFactory::New())
 {
-	std::cout << "Created XdmfReader " << this << std::endl;
 }
 
 XdmfReader::~XdmfReader()
 {
-	std::cout << "Deleted XdmfReader " << this << std::endl;
 }

XdmfReader.hpp

@@ -14,7 +14,17 @@ class XdmfReader : public XdmfCoreReader {
 
 public:
 
-	XdmfNewMacro(XdmfReader);
+	/**
+	 * Create a new XdmfReader.
+	 *
+	 * @return constructed XdmfReader.
+	 */
+	static boost::shared_ptr<XdmfReader> New()
+	{
+		boost::shared_ptr<XdmfReader> p(new XdmfReader());
+		return p;
+	};
+
 	virtual ~XdmfReader();
 
 protected:

XdmfSet.cpp

@@ -12,12 +12,10 @@ XdmfSet::XdmfSet() :
 	mSetType(XdmfSetType::NoSetType()),
 	mName("")
 {
-	std::cout << "Created Set " << this << std::endl;
 }
 
 XdmfSet::~XdmfSet()
 {
-	std::cout << "Deleted Set " << this << std::endl;
 }
 
 const std::string XdmfSet::ItemTag = "Set";

XdmfSet.hpp

@@ -19,7 +19,17 @@ class XdmfSet : public XdmfDataItem {
 
 public:
 
-	XdmfNewMacro(XdmfSet);
+	/**
+	 * Create a new XdmfSet.
+	 *
+	 * @return constructed XdmfSet.
+	 */
+	static boost::shared_ptr<XdmfSet> New()
+	{
+		boost::shared_ptr<XdmfSet> p(new XdmfSet());
+		return p;
+	};
+
 	virtual ~XdmfSet();
 
 	LOKI_DEFINE_VISITABLE(XdmfSet, XdmfDataItem)

XdmfTime.cpp

@@ -11,12 +11,10 @@
 XdmfTime::XdmfTime(const double & value) :
 	mValue(value)
 {
-	std::cout << "Created Time " << this << std::endl;
 }
 
 XdmfTime::~XdmfTime()
 {
-	std::cout << "Deleted Time " << this << std::endl;
 }
 
 const std::string XdmfTime::ItemTag = "Time";

XdmfTopology.cpp

@@ -13,12 +13,10 @@
 XdmfTopology::XdmfTopology() :
 	mTopologyType(XdmfTopologyType::NoTopologyType())
 {
-	std::cout << "Created Topology " << this << std::endl;
 }
 
 XdmfTopology::~XdmfTopology()
 {
-	std::cout << "Deleted Topology " << this << std::endl;
 }
 
 const std::string XdmfTopology::ItemTag = "Topology";

XdmfTopology.hpp

@@ -18,7 +18,17 @@ class XdmfTopology : public XdmfDataItem {
 
 public:
 
-	XdmfNewMacro(XdmfTopology);
+	/**
+	 * Create a new XdmfTopology.
+	 *
+	 * @return constructed XdmfTopology.
+	 */
+	static boost::shared_ptr<XdmfTopology> New()
+	{
+		boost::shared_ptr<XdmfTopology> p(new XdmfTopology());
+		return p;
+	};
+
 	virtual ~XdmfTopology();
 
 	LOKI_DEFINE_VISITABLE(XdmfTopology, XdmfDataItem)