reworked the model classes according to manipulated GraphNode and removed some bugs resulting from a misunderstanding between abtract domain declarations and instances.

git-svn-id: file:///var/local/svn/basicwriter@29 daaaf23c-2e50-4459-9457-1e69db5a47bf

1 files changed, 6 insertions, 17 deletions

diff --git a/src/model/domain/Field.hpp b/src/model/domain/Field.hpp
index d1944ee..293a361 100644
--- a/src/model/domain/Field.hpp
+++ b/src/model/domain/Field.hpp
@@ -16,29 +16,27 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _FIELD_HPP_
-#define _FIELD_HPP_
+#ifndef _OUSIA_MODEL_DOMAIN_FIELD_HPP_
+#define _OUSIA_MODEL_DOMAIN_FIELD_HPP_
 
 #include <memory>
 
 #include <model/GraphNode.hpp>
 #include <model/types/Type.hpp>
-#include <model/types/Value.hpp>
 
-namespace ousia {
+namespace ousia{
 
 //namespace types {
 //	class Type;
 //	class Value;
 //}
-
+namespace model {
 namespace domain {
 
 class Field : public GraphNode {
 
 private:
 	std::shared_ptr<types::Type> type;
-	std::shared_ptr<types::Value> value;
 	bool optional;
 
 public:
@@ -54,16 +52,6 @@ public:
 		this->type = type;
 	}
 
-	std::shared_ptr<types::Value> getValue()
-	{
-		return value;
-	}
-
-	void setValue(std::shared_ptr<types::Value> value)
-	{
-		this->value = value;
-	}
-
 	bool getOptional()
 	{
 		return optional;
@@ -76,5 +64,6 @@ public:
 };
 }
 }
+}
 
-#endif /* _FIELD_HPP_ */
+#endif /* _OUSIA_MODEL_DOMAIN_FIELD_HPP_ */