X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FElementProxy.h;h=d4738179aa88f3d91090f7c3443a6d8ec00b0616;hb=46e58c5a60b09e12fbeba2b87e197662244c3c98;hp=a10d87383dcc6109ca8f6eb9efc89360adef904b;hpb=77769b2e300d1295b8a5d717d9ede50e27d70cea;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/ElementProxy.h b/xmltooling/ElementProxy.h
index a10d873..d473817 100644
--- a/xmltooling/ElementProxy.h
+++ b/xmltooling/ElementProxy.h
@@ -1,59 +1,49 @@
-/*
- *  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 xmltooling/ElementProxy.h
- * 
- * An XMLObject with an open content model 
- */
-
-#ifndef __xmltooling_eleproxy_h__
-#define __xmltooling_eleproxy_h__
-
-#include <xmltooling/XMLObject.h>
-#include <xmltooling/util/XMLObjectChildrenList.h>
-
-using namespace xercesc;
-
-namespace xmltooling {
-
-    /**
-     * An XMLObject that exposes its children via mutable list.
-     */
-    class XMLTOOL_API ElementProxy : public virtual XMLObject
-    {
-    public:
-        ElementProxy() {}
-        virtual ~ElementProxy() {}
-        
-        /**
-         * Gets a mutable list of child objects
-         * 
-         * @return  mutable list of child objects
-         */
-        virtual ListOf(XMLObject) getXMLObjects()=0;
-
-        /**
-         * Gets an immutable list of child objects
-         * 
-         * @return  immutable list of child objects
-         */
-        virtual const std::list<XMLObject*>& getXMLObjects() const=0;
-    };
-    
-};
-
-#endif /* __xmltooling_eleproxy_h__ */
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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 xmltooling/ElementProxy.h
+ * 
+ * An XMLObject with an open content model 
+ */
+
+#ifndef __xmltooling_eleproxy_h__
+#define __xmltooling_eleproxy_h__
+
+#include <xmltooling/AttributeExtensibleXMLObject.h>
+#include <xmltooling/ElementExtensibleXMLObject.h>
+
+namespace xmltooling {
+
+    /**
+     * An XMLObject with an open content model.
+     */
+    class XMLTOOL_API ElementProxy : public virtual AttributeExtensibleXMLObject, public virtual ElementExtensibleXMLObject
+    {
+    protected:
+        ElementProxy();
+
+    public:
+        virtual ~ElementProxy();
+    };
+    
+};
+
+#endif /* __xmltooling_eleproxy_h__ */