Changeset 113

Timestamp:

06/22/10 10:30:33 (14 years ago)

Author:

hozdoba

Message:

Quelques changements de portée essentiellement. Modificiations mineures.

Location:

XMLIO_V2/dev/dev_rv/src/XMLIO

Files:

• attribut.hpp (modified) (3 diffs)
• attribut_registrar.hpp (modified) (3 diffs)
• axis.hpp (modified) (1 diff)
• base_attribut.hpp (modified) (2 diffs)
• container.hpp (modified) (1 diff)
• context.hpp (modified) (2 diffs)
• field.hpp (modified) (1 diff)
• file.hpp (modified) (1 diff)
• grid.hpp (modified) (1 diff)
• group_template.hpp (modified) (2 diffs)
• xml_node.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/XMLIO/attribut.hpp

@@ -37 +37 @@
       public :
 
-         bool hasValue ;
-         Ctype value ;
+         operator Ctype() const
+         {
+            if (!hasValue) throw XMLIOUndefinedValueException("L'attribut \"" + this->getName() + "\" est invalide !");
+            return (value) ;
+         }
 
-         virtual bool _hasValue() const { return hasValue; }
+         virtual bool _hasValue() const { return (hasValue); }
+
+      protected :
 
          Attribut(void) : hasValue(false) {} ;
@@ -64 +69 @@
          }
 
-         operator Ctype() const
-         {
-            if (!hasValue) throw XMLIOUndefinedValueException("L'attribut \"" + this->getName() + "\" est invalide !");
-            return value ;
-         }
-
          virtual void assignValue(const BaseAttribut* _ba)
          { value = ((Attribut*)_ba) -> value; hasValue = true; }
@@ -85 +84 @@
          }
 
+      private :
+
+         bool hasValue ;
+         Ctype value ;
+
    }; // class Attribut
 }; // namespace XMLIOSERVER

XMLIO_V2/dev/dev_rv/src/XMLIO/attribut_registrar.hpp

@@ -10 +10 @@
    class AttributRegistrar
    {
-      public :
+      protected :
 
          AttributRegistrar():attrList()
@@ -18 +18 @@
          const StrHashMap<BaseAttribut>& getAttributList(void) const { return (attrList); }
          size_t getNbAttributes() const {return (attrList.getSize()); }
-         bool hasAttribut(const string& _id) { return (attrList.hasMappedValue(_id)); }
+         bool hasAttribut(const string& _id) const { return (attrList.hasMappedValue(_id)); }
 
          BaseAttribut* getAttribut(const string& _id) throw (XMLIOUndefinedValueException) { return (attrList[_id]); }
@@ -56 +56 @@
          }
 
-      public :
-
         ~AttributRegistrar(void)
         {/* Ne rien faire de plus */}
 
-      protected :
+      private :
+
          StrHashMap<BaseAttribut> attrList;
 

XMLIO_V2/dev/dev_rv/src/XMLIO/axis.hpp

@@ -18 +18 @@
          static string GetName(void) {return ("axis"); }
 
-         ~CAxis(void)
+         virtual ~CAxis(void)
          { /* Ne rien faire de plus */ }
 

XMLIO_V2/dev/dev_rv/src/XMLIO/base_attribut.hpp

@@ -17 +17 @@
          virtual ostream & print(ostream& o) const = 0  ;
 
-         friend ostream& operator <<(ostream& o,const BaseAttribut& Attr)
-         {return Attr.print(o) ; }
+         friend ostream& operator <<(ostream& o,const BaseAttribut& Attr) { return (Attr.print(o)) ; }
+
+         bool hasId(void) const { return (true); }
+
+         virtual string getId(void) const { return (getName()); } ;
 
          virtual void assignValue(const BaseAttribut*) = 0;
-
-         virtual string getId(void) const {return getName();} ;
-         bool hasId(void){return (true);}
-
          virtual void setFromString(const std::string str) = 0;
+         virtual bool _hasValue() const = 0;
 
 #define  SETTER_AND_GETTER(TYPE) \
@@ -45 +45 @@
 #undef SETTER_AND_GETTER
 
-
-         virtual bool _hasValue() const = 0;
-
          static void error_set(void)
          { throw XMLIOIncompatibleTypeException("BaseAttribut::set<type> > Setting value type is incompatible with attribut type"); }

XMLIO_V2/dev/dev_rv/src/XMLIO/container.hpp

@@ -33 +33 @@
          }
 
-         bool hasMappedValue(const Key& kval) {return (find(kval) != this->end());}
+         bool hasMappedValue(const Key& kval) const {return (find(kval) != this->end());}
 
          const vector<Mapped*>& getVector(void) const { return (this->_elemList); }

XMLIO_V2/dev/dev_rv/src/XMLIO/context.hpp

@@ -91 +91 @@
 
                   if (name.compare(FieldDefinition::GetDefName()) == 0) // Parsing définition des champs.
-                  { fieldDef = CreateInstanceAndParse<FieldDefinition>(attributes, _node, "field_definition"); continue; }
+                  { fieldDef = CreateInstanceAndParse<FieldDefinition>(attributes, _node, FieldDefinition::GetDefName().c_str()); continue; }
 
                   if (name.compare(FileDefinition::GetDefName()) == 0) // Parsing définition des fichiers.
-                  { fileDef = CreateInstanceAndParse<FileDefinition>(attributes, _node, "file_definition"); continue; }
+                  { fileDef  = CreateInstanceAndParse<FileDefinition >(attributes, _node, FileDefinition ::GetDefName().c_str()); continue; }
 
                   if (name.compare(AxisDefinition::GetDefName()) == 0) // Parsing pour la définition des axes.
-                  { axisDef = CreateInstanceAndParse<AxisDefinition>(attributes, _node, "axis_definition");  continue; }
+                  { axisDef  = CreateInstanceAndParse<AxisDefinition >(attributes, _node, AxisDefinition ::GetDefName().c_str());  continue; }
 
                   if (name.compare(GridDefinition::GetDefName()) == 0) // Parsing pour la définition des grilles.
-                  { gridDef = CreateInstanceAndParse<GridDefinition>(attributes, _node, "grid_definition"); continue; }
+                  { gridDef  = CreateInstanceAndParse<GridDefinition >(attributes, _node, GridDefinition ::GetDefName().c_str()); continue; }
 
                   WARNING("La définition est invalide, seules les champs, grilles, axes et fichiers peuvent être définis !");
@@ -117 +117 @@
          virtual bool hasChild(void) const
          { return ((fieldDef != NULL) or (fileDef != NULL)  or (axisDef != NULL) or (gridDef != NULL)); }
+
          virtual void printChild(ostream& out) const
          {

XMLIO_V2/dev/dev_rv/src/XMLIO/field.hpp

@@ -27 +27 @@
          }
 
-         ~CField(void)
+         virtual ~CField(void)
          { /* Ne rien faire de plus */ }
 

XMLIO_V2/dev/dev_rv/src/XMLIO/file.hpp

@@ -55 +55 @@
          FieldGroup* getVirtualFieldGroup(void) { return (vfieldGroup); }
 
-         ~CFile(void)
+         virtual  ~CFile(void)
          { if(vfieldGroup != NULL) delete vfieldGroup; }
 

XMLIO_V2/dev/dev_rv/src/XMLIO/grid.hpp

@@ -16 +16 @@
          {/* Ne rien faire de plus */}
 
-         static string GetName(void) {return ("grid"); }
+         static string GetName(void) { return ("grid"); }
 
-         ~CGrid(void)
+         virtual ~CGrid(void)
          { /* Ne rien faire de plus */ }
 

XMLIO_V2/dev/dev_rv/src/XMLIO/group_template.hpp

@@ -65 +65 @@
          bool hasGroup(const string _id) { return (groupList.hasMappedValue(_id)); }
 
-         const StrHashMap<GroupTemplate<T, U>* >& getGroupList(void) { return (groupList); }
+         const StrHashMap<GroupTemplate<T, U>* >& getGroupList(void) const { return (groupList); }
 
          size_t getNbGroup() const {return (groupList.getVectorSize()); }
@@ -88 +88 @@
          bool hasChild(const string _id) { return (childList.hasMappedValue(_id)); }
 
-         const StrHashMap<T*>& getCurrentListChild(void) { return (childList); }
-         const vector<T*>& getCurrentVectorChild(void) { return (childList.getVector()); }
+         const StrHashMap<T*>& getCurrentListChild(void) const { return (childList); }
+         const vector<T*>& getCurrentVectorChild(void) const { return (childList.getVector()); }
 
          size_t getNbChild() const {return (childList.getVectorSize()); }

XMLIO_V2/dev/dev_rv/src/XMLIO/xml_node.hpp

@@ -145 +145 @@
             void setCNode(Node* other) { this->cNode = other; }
 
-            static bool IsPtrNull(Node* ptr) {return (ptr==NULL);}
+            static bool IsPtrNull(Node* ptr) { return (ptr==NULL); }
 
          private :
 
-            string& _toLower(string& _str) const
+            const string& _toLower(string& _str) const
             {
                for (unsigned int i = 0; i < _str.size(); i++)