X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_XMLReader.h;h=119bd71c132542d662f3fb5b9f152207d4955fb1;hb=f1cd93fd02a54259f72e3191d037323a496b2bef;hp=798a975d2f720644617229cac911426a6979e5f0;hpb=db5492dd0ee02cfff7abd5710332f43483968bfa;p=modules%2Fshaper.git

diff --git a/src/Config/Config_XMLReader.h b/src/Config/Config_XMLReader.h
index 798a975d2..119bd71c1 100644
--- a/src/Config/Config_XMLReader.h
+++ b/src/Config/Config_XMLReader.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_XMLReader.h
  *
@@ -8,44 +10,55 @@
 #ifndef CONFIG_XMLREADER_H_
 #define CONFIG_XMLREADER_H_
 
-#include "Config.h"
-#include "Config_FeatureMessage.h"
+#include <Config_def.h>
 
-#include <string>
 #include <cstdarg>
+#include <string>
 
-//Forward declaration for xmlNodePtr.
+//>> Forward declaration of xmlNodePtr.
 typedef struct _xmlNode xmlNode;
 typedef xmlNode *xmlNodePtr;
 struct _xmlNode;
+//<<
 
+//>> Forward declaration of xmlDocPtr.
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+struct _xmlDoc;
+//<<
 
-class CONFIG_EXPORT Config_XMLReader {
-public:
-  Config_XMLReader(const std::string& theXmlFile);
-  virtual ~Config_XMLReader();
+/*
+ * Base class for all libxml readers. Provides high-level API
+ * for all xml operations.
+ *
+ */
+class Config_XMLReader
+{
+ public:
+  CONFIG_EXPORT Config_XMLReader(const std::string& theXmlFile);CONFIG_EXPORT virtual ~Config_XMLReader();
+
+  CONFIG_EXPORT void readAll();
 
-  void readAll();
+ public:
+  CONFIG_EXPORT xmlNodePtr findRoot();
 
-protected:
+ protected:
   virtual void processNode(xmlNodePtr aNode);
   virtual bool processChildren(xmlNodePtr aNode);
 
-  xmlNodePtr findRoot();
   void readRecursively(xmlNodePtr theParent);
 
   xmlNodePtr node(void* theNode);
-  std::string getProperty(xmlNodePtr theNode, const char* property);
-  /*
-   * Please note that this function should be called with NULL last argument. 
-   * In example: isNode(aNode, "type1", ["type2", ...], NULL);
-   * ", NULL" is required to use unlimited number of arguments.
-   * TODO(sbh): find a way to simplify calling this method.
-   */
-  bool isNode(xmlNodePtr theNode, const char* name, ...);
-
-private:
-  std::string m_DocumentPath;
+  std::string getNodeName(xmlNodePtr theNode);
+  void processValidator(xmlNodePtr theNode);
+  void processSelectionFilter(xmlNodePtr theNode);
+
+ protected:
+  std::string myCurrentFeature;
+
+ protected:
+  std::string myDocumentPath;
+  xmlDocPtr myXmlDoc;
 };
 
 #endif /* CONFIG_XMLREADER_H_ */