gcc const fix, converted linefeeds

[shibboleth/cpp-xmltooling.git] / xmltooling / validation / Validator.h

diff --git a/xmltooling/validation/Validator.h b/xmltooling/validation/Validator.h
index 7119883..b56f6a7 100644 (file)
--- a/xmltooling/validation/Validator.h
+++ b/xmltooling/validation/Validator.h
@@ -1,107 +1,55 @@
-/*\r
- *  Copyright 2001-2006 Internet2\r
- * \r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * @file Validator.h\r
- * \r
- * Rules checking of XMLObjects \r
- */\r
-\r
-#if !defined(__xmltooling_validator_h__)\r
-#define __xmltooling_validator_h__\r
-\r
-#include <map>\r
-#include <vector>\r
-#include <xmltooling/QName.h>\r
-#include <xmltooling/XMLObject.h>\r
-\r
-using namespace xercesc;\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( push )\r
-    #pragma warning( disable : 4250 4251 )\r
-#endif\r
-\r
-namespace xmltooling {\r
-\r
-    /**\r
-     * An interface for classes that implement rules for checking the \r
-     * validity of XMLObjects.\r
-     */\r
-    class XMLTOOL_API Validator\r
-    {\r
-    MAKE_NONCOPYABLE(Validator);\r
-    public:\r
-        virtual ~Validator() {}\r
-        \r
-        /**\r
-         * Checks to see if an XMLObject is valid.\r
-         * \r
-         * @param xmlObject the XMLObject to validate\r
-\r
-         * @throws ValidationException thrown if the element is not valid\r
-         */\r
-        virtual void validate(const XMLObject* xmlObject) const=0;\r
-\r
-        /**\r
-         * Evaluates the registered validators against the given XMLObject and it's children.\r
-         * \r
-         * @param xmlObject the XMLObject tree to validate\r
-         * \r
-         * @throws ValidationException thrown if the element tree is not valid\r
-         */\r
-        static void checkValidity(const XMLObject* xmlObject);\r
-\r
-        /**\r
-         * Registers a new validator for the given key.\r
-         * \r
-         * @param key       the key used to retrieve the validator\r
-         * @param validator the validator\r
-         */\r
-        static void registerValidator(const QName& key, Validator* validator) {\r
-            std::map< QName, std::vector<Validator*> >::iterator i=m_map.find(key);\r
-            if (i==m_map.end())\r
-                m_map.insert(std::make_pair(key,std::vector<Validator*>(1,validator)));\r
-            else\r
-                i->second.push_back(validator);\r
-        }\r
-\r
-        /**\r
-         * Deregisters validators.\r
-         * \r
-         * @param key       the key for the validators to be deregistered\r
-         */\r
-        static void deregisterValidators(const QName& key);\r
-\r
-        /**\r
-         * Unregisters and destroys all registered validators. \r
-         */\r
-        static void destroyValidators();\r
-\r
-    protected:\r
-        Validator() {}\r
-    \r
-    private:\r
-        static std::map< QName, std::vector<Validator*> > m_map;\r
-    };\r
-\r
-};\r
-\r
-#if defined (_MSC_VER)\r
-    #pragma warning( pop )\r
-#endif\r
-\r
-#endif /* __xmltooling_validator_h__ */\r
+/*
+ *  Copyright 2001-2006 Internet2
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file Validator.h
+ * 
+ * Rules checking of XMLObjects 
+ */
+
+#ifndef __xmltooling_validator_h__
+#define __xmltooling_validator_h__
+
+#include <xmltooling/XMLObject.h>
+
+namespace xmltooling {
+
+    /**
+     * An interface for classes that implement rules for checking the 
+     * validity of XMLObjects.
+     */
+    class XMLTOOL_API Validator
+    {
+    MAKE_NONCOPYABLE(Validator);
+    public:
+        virtual ~Validator() {}
+        
+        /**
+         * Checks to see if an XMLObject is valid.
+         * 
+         * @param xmlObject the XMLObject to validate
+
+         * @throws ValidationException thrown if the element is not valid
+         */
+        virtual void validate(const XMLObject* xmlObject) const=0;
+
+    protected:
+        Validator() {}
+    };
+
+};
+
+#endif /* __xmltooling_validator_h__ */