Add FieldBuilder::begin() and Field::build()

Boilerplate reduction in structure
definition and instanciation.

src/factory/FieldCreateFactory.cpp

@@ -25,6 +25,7 @@
 #include <pv/factory.h>
 #include <pv/serializeHelper.h>
 #include <pv/thread.h>
+#include <pv/pvData.h>
 
 using std::tr1::static_pointer_cast;
 using std::size_t;
@@ -102,6 +103,11 @@ Field::~Field() {
     }
 }
 
+std::tr1::shared_ptr<PVField> Field::build() const
+{
+    FieldConstPtr self(shared_from_this());
+    return getPVDataCreate()->createPVField(self);
+}
 
 std::ostream& operator<<(std::ostream& o, const Field& f)
 {
@@ -172,6 +178,11 @@ void Scalar::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*contro
 }
 
 
+std::tr1::shared_ptr<PVScalar> Scalar::build() const
+{
+    return getPVDataCreate()->createPVScalar(std::tr1::static_pointer_cast<const Scalar>(shared_from_this()));
+}
+
 
 
 std::string BoundedString::getID() const
@@ -338,6 +349,11 @@ void ScalarArray::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*c
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+std::tr1::shared_ptr<PVScalarArray> ScalarArray::build() const
+{
+    return getPVDataCreate()->createPVScalarArray(std::tr1::static_pointer_cast<const ScalarArray>(shared_from_this()));
+}
+
 
 BoundedScalarArray::~BoundedScalarArray() {}
 
@@ -418,6 +434,11 @@ void StructureArray::deserialize(ByteBuffer* /*buffer*/, DeserializableControl*
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+std::tr1::shared_ptr<PVValueArray<std::tr1::shared_ptr<PVStructure> > > StructureArray::build() const
+{
+    return getPVDataCreate()->createPVStructureArray(std::tr1::static_pointer_cast<const StructureArray>(shared_from_this()));
+}
+
 UnionArray::UnionArray(UnionConstPtr const & _punion)
 : Array(unionArray),punion(_punion)
 {
@@ -460,6 +481,11 @@ void UnionArray::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*co
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+std::tr1::shared_ptr<PVValueArray<std::tr1::shared_ptr<PVUnion> > > UnionArray::build() const
+{
+    return getPVDataCreate()->createPVUnionArray(std::tr1::static_pointer_cast<const UnionArray>(shared_from_this()));
+}
+
 const string Structure::DEFAULT_ID = Structure::defaultId();
 
 const string & Structure::defaultId()
@@ -597,6 +623,11 @@ void Structure::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*con
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+std::tr1::shared_ptr<PVStructure> Structure::build() const
+{
+    return getPVDataCreate()->createPVStructure(std::tr1::static_pointer_cast<const Structure>(shared_from_this()));
+}
+
 const string Union::DEFAULT_ID = Union::defaultId();
 
 const string & Union::defaultId()
@@ -795,6 +826,11 @@ void Union::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*control
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+std::tr1::shared_ptr<PVUnion> Union::build() const
+{
+    return getPVDataCreate()->createPVUnion(std::tr1::static_pointer_cast<const Union>(shared_from_this()));
+}
+
 FieldBuilder::FieldBuilder()
     :fieldCreate(getFieldCreate())
     ,idSet(false)
@@ -896,6 +932,19 @@ void FieldBuilder::reset()
 	fields.clear();
 }
 
+FieldBuilderPtr FieldBuilder::begin()
+{
+    FieldBuilderPtr ret(new FieldBuilder);
+    return ret;
+}
+
+FieldBuilderPtr FieldBuilder::begin(StructureConstPtr S)
+{
+    FieldBuilderPtr ret(new FieldBuilder(S.get()));
+    return ret;
+}
+
+
 FieldBuilderPtr FieldBuilder::setId(string const & id)
 {
     this->id = id;