Author: mrglavas
Date: Wed Feb 22 20:42:27 2006
New Revision: 380041
URL: http://svn.apache.org/viewcvs?rev=380041&view=rev
Log:
JIRA Issue #1133:
https://issues.apache.org/jira/browse/XERCESJ-1133
Increasing visibility of DOM setOwnerDocument() methods from package private to
protected.
Increasing visibility of HTMLElementImpl constructor from package private to
public.
These changes have been made on request from Jacob Kjome.
Modified:
xerces/java/trunk/src/org/apache/html/dom/HTMLElementImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/AttrImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/DocumentTypeImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/ElementImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/NamedNodeMapImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/NodeImpl.java
xerces/java/trunk/src/org/apache/xerces/dom/ParentNode.java
Modified: xerces/java/trunk/src/org/apache/html/dom/HTMLElementImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/html/dom/HTMLElementImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/html/dom/HTMLElementImpl.java (original)
+++ xerces/java/trunk/src/org/apache/html/dom/HTMLElementImpl.java Wed Feb 22
20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2000,2004,2005 The Apache Software Foundation.
+ * Copyright 1999,2000,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@
* @param owner The owner HTML document
* @param tagName The element's tag name
*/
- HTMLElementImpl( HTMLDocumentImpl owner, String tagName )
+ public HTMLElementImpl( HTMLDocumentImpl owner, String tagName )
{
super( owner, tagName.toUpperCase(Locale.ENGLISH) );
}
Modified: xerces/java/trunk/src/org/apache/xerces/dom/AttrImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/AttrImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/AttrImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/AttrImpl.java Wed Feb 22
20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -189,14 +189,14 @@
* NON-DOM
* set the ownerDocument of this node and its children
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
if (needsSyncChildren()) {
synchronizeChildren();
}
super.setOwnerDocument(doc);
if (!hasStringValue()) {
for (ChildNode child = (ChildNode) value;
- child != null; child = child.nextSibling) {
+ child != null; child = child.nextSibling) {
child.setOwnerDocument(doc);
}
}
Modified: xerces/java/trunk/src/org/apache/xerces/dom/DocumentTypeImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/DocumentTypeImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/DocumentTypeImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/DocumentTypeImpl.java Wed Feb
22 20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -321,7 +321,7 @@
* NON-DOM
* set the ownerDocument of this node and its children
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
super.setOwnerDocument(doc);
entities.setOwnerDocument(doc);
notations.setOwnerDocument(doc);
Modified: xerces/java/trunk/src/org/apache/xerces/dom/ElementImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/ElementImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/ElementImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/ElementImpl.java Wed Feb 22
20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -226,8 +226,8 @@
* NON-DOM
* set the ownerDocument of this node, its children, and its attributes
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
- super.setOwnerDocument(doc);
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
+ super.setOwnerDocument(doc);
if (attributes != null) {
attributes.setOwnerDocument(doc);
}
Modified: xerces/java/trunk/src/org/apache/xerces/dom/NamedNodeMapImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/NamedNodeMapImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/NamedNodeMapImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/NamedNodeMapImpl.java Wed Feb
22 20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004,2005 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -387,7 +387,7 @@
* NON-DOM
* set the ownerDocument of this node, and the attributes it contains
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
if (nodes != null) {
for (int i = 0; i < nodes.size(); i++) {
((NodeImpl)item(i)).setOwnerDocument(doc);
Modified: xerces/java/trunk/src/org/apache/xerces/dom/NodeImpl.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/NodeImpl.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/NodeImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/NodeImpl.java Wed Feb 22
20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004,2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -322,13 +322,13 @@
* NON-DOM
* set the ownerDocument of this node
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
if (needsSyncData()) {
synchronizeData();
}
// if we have an owner we rely on it to have it right
// otherwise ownerNode is our ownerDocument
- if (!isOwned()) {
+ if (!isOwned()) {
ownerNode = doc;
}
}
Modified: xerces/java/trunk/src/org/apache/xerces/dom/ParentNode.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/src/org/apache/xerces/dom/ParentNode.java?rev=380041&r1=380040&r2=380041&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/ParentNode.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/ParentNode.java Wed Feb 22
20:42:27 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004,2005 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -171,16 +171,16 @@
* NON-DOM
* set the ownerDocument of this node and its children
*/
- void setOwnerDocument(CoreDocumentImpl doc) {
+ protected void setOwnerDocument(CoreDocumentImpl doc) {
if (needsSyncChildren()) {
synchronizeChildren();
}
super.setOwnerDocument(doc);
ownerDocument = doc;
- for (ChildNode child = firstChild;
- child != null; child = child.nextSibling) {
- child.setOwnerDocument(doc);
- }
+ for (ChildNode child = firstChild;
+ child != null; child = child.nextSibling) {
+ child.setOwnerDocument(doc);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
