Author: vgritsenko
Date: Sun Sep 2 03:51:37 2007
New Revision: 571948
URL: http://svn.apache.org/viewvc?rev=571948&view=rev
Log:
cleanup, minor changes
Modified:
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/AttrImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CommentImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBDocument.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBNode.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ElementImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NodeImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NotationImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java
xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/TextImpl.java
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/AttrImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/AttrImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/AttrImpl.java Sun Sep 2 03:51:37 2007
@@ -20,9 +20,9 @@
package org.apache.xindice.xml.dom;
import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.TypeInfo;
import org.w3c.dom.UserDataHandler;
@@ -41,12 +41,12 @@
public AttrImpl() {
}
- public AttrImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public AttrImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public AttrImpl(NodeImpl parentNode, String nodeName, String nsURI, short symbolID, String nodeValue) {
- super(parentNode, false);
+ public AttrImpl(NodeImpl parent, String nodeName, String nsURI, short symbolID, String nodeValue) {
+ super(parent, false);
this.nodeName = nodeName;
this.nsURI = nsURI;
this.symbolID = symbolID;
@@ -57,12 +57,12 @@
childNodes.add(text);
}
- public AttrImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public AttrImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public AttrImpl(NodeImpl parentNode, String nodeName) {
- super(parentNode, true);
+ public AttrImpl(NodeImpl parent, String nodeName) {
+ super(parent, true);
this.nodeName = nodeName;
}
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CDATASectionImpl.java Sun Sep 2 03:51:37 2007
@@ -27,21 +27,22 @@
*
* @version $Revision$, $Date$
*/
-public final class CDATASectionImpl extends TextImpl implements CDATASection {
+public final class CDATASectionImpl extends TextImpl
+ implements CDATASection {
public CDATASectionImpl() {
}
- public CDATASectionImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public CDATASectionImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public CDATASectionImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public CDATASectionImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public CDATASectionImpl(NodeImpl parentNode, String nodeValue) {
- super(parentNode, nodeValue);
+ public CDATASectionImpl(NodeImpl parent, String nodeValue) {
+ super(parent, nodeValue);
}
public short getNodeType() {
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CommentImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CommentImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CommentImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/CommentImpl.java Sun Sep 2 03:51:37 2007
@@ -27,21 +27,22 @@
*
* @version $Revision$, $Date$
*/
-public final class CommentImpl extends CharacterDataImpl implements Comment {
+public final class CommentImpl extends CharacterDataImpl
+ implements Comment {
public CommentImpl() {
}
- public CommentImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public CommentImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public CommentImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public CommentImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public CommentImpl(NodeImpl parentNode, String nodeValue) {
- super(parentNode, nodeValue);
+ public CommentImpl(NodeImpl parent, String nodeValue) {
+ super(parent, nodeValue);
}
public short getNodeType() {
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java Sun Sep 2 03:51:37 2007
@@ -54,12 +54,12 @@
public ContainerNodeImpl() {
}
- public ContainerNodeImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public ContainerNodeImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public ContainerNodeImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public ContainerNodeImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
protected boolean isNodeTypeValid(short type) {
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBDocument.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBDocument.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBDocument.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBDocument.java Sun Sep 2 03:51:37 2007
@@ -31,17 +31,17 @@
/**
* Cache control processing instruction
*/
- static final String CACHE_CONTROL = "xindice-cache";
+ String CACHE_CONTROL = "xindice-cache";
/**
* 'cache' value of the cache control processing instruction
*/
- static final String CACHE = "cache";
+ String CACHE = "cache";
/**
* 'no-cache' value of the cache control processing instruction
*/
- static final String NOCACHE = "no-cache";
+ String NOCACHE = "no-cache";
/**
* getCaching returns whether or not this Document should be cached
@@ -59,4 +59,3 @@
*/
void setCaching(boolean caching);
}
-
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBNode.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBNode.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBNode.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DBNode.java Sun Sep 2 03:51:37 2007
@@ -32,6 +32,7 @@
* @version $Revision$, $Date$
*/
public interface DBNode extends Node {
+
/**
* getSource returns a source for this Node.
*
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentFragmentImpl.java Sun Sep 2 03:51:37 2007
@@ -32,8 +32,8 @@
public DocumentFragmentImpl() {
}
- public DocumentFragmentImpl(NodeImpl parentNode) {
- super(parentNode, true);
+ public DocumentFragmentImpl(NodeImpl parent) {
+ super(parent, true);
}
public short getNodeType() {
@@ -44,5 +44,3 @@
return "#document-fragment";
}
}
-
-
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/DocumentImpl.java Sun Sep 2 03:51:37 2007
@@ -145,8 +145,7 @@
}
if (doc instanceof DBDocument) {
- DBDocument d = (DBDocument) doc;
- source = d.getSource();
+ source = ((DBDocument) doc).getSource();
}
}
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ElementImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ElementImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ElementImpl.java Sun Sep 2 03:51:37 2007
@@ -59,8 +59,8 @@
public ElementImpl() {
}
- public ElementImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public ElementImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
DocumentImpl doc = (DocumentImpl) getOwnerDocument();
try {
loadAttributes(doc.getSymbols());
@@ -71,12 +71,12 @@
}
}
- public ElementImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public ElementImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public ElementImpl(NodeImpl parentNode, String nodeName) {
- super(parentNode, true);
+ public ElementImpl(NodeImpl parent, String nodeName) {
+ super(parent, true);
this.nodeName = nodeName;
}
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityImpl.java Sun Sep 2 03:51:37 2007
@@ -37,12 +37,12 @@
public EntityImpl() {
}
- public EntityImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public EntityImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public EntityImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public EntityImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
public short getNodeType() {
@@ -108,5 +108,3 @@
this.version = version;
}
}
-
-
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java Sun Sep 2 03:51:37 2007
@@ -41,22 +41,20 @@
private static final Log log = LogFactory.getLog(EntityReferenceImpl.class);
- private short symbolID = -1;
-
public EntityReferenceImpl() {
}
- public EntityReferenceImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public EntityReferenceImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public EntityReferenceImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public EntityReferenceImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public EntityReferenceImpl(NodeImpl parentNode, String nodeName) {
- super(parentNode, true);
+ public EntityReferenceImpl(NodeImpl parent, String nodeName) {
+ super(parent, true);
this.nodeName = nodeName;
}
@@ -79,8 +77,7 @@
switch (entityType) {
case Signatures.ENT_DEFINED:
- symbolID = xci.readShort();
- nodeName = st.getName(symbolID);
+ nodeName = st.getName(xci.readShort());
break;
case Signatures.ENT_AMP:
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NodeImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NodeImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NodeImpl.java Sun Sep 2 03:51:37 2007
@@ -52,14 +52,14 @@
public static final String XMLNS_PREFIX = "xmlns";
- public static final String OBJECT_NS = "http://xml.apache.org/xindice/XMLObject";
+ public static final String OBJECT_NS = "http://xml.apache.org/xindice/XMLObject";
public static final String OBJECT_HREF = "href";
public static final String OBJECT_TYPE = "type";
public static final String TYPE_CONTENT = "content";
public static final String TYPE_REPLACE = "replace";
- public static final String TYPE_INSERT = "insert";
- public static final String TYPE_APPEND = "append";
+ public static final String TYPE_INSERT = "insert";
+ public static final String TYPE_APPEND = "append";
public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/";
@@ -159,35 +159,35 @@
/**
* Create node from compressed data
*
- * @param parentNode the parent node
+ * @param parent the parent node
* @param data compressed document data byte array
* @param pos offset in the data byte array
* @param len length of node's data
*/
- public NodeImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- this.parentNode = parentNode;
+ public NodeImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ this.parentNode = parent;
this.data = data;
this.pos = pos;
this.len = len;
- if (parentNode == null) {
+ if (parent == null) {
ownerDocument = null;
- } else if (parentNode.getNodeType() == DOCUMENT_TYPE_NODE) {
- this.ownerDocument = (Document) parentNode;
+ } else if (parent.getNodeType() == DOCUMENT_TYPE_NODE) {
+ this.ownerDocument = (Document) parent;
} else {
- this.ownerDocument = parentNode.getOwnerDocument();
+ this.ownerDocument = parent.getOwnerDocument();
}
}
- public NodeImpl(NodeImpl parentNode, boolean dirty) {
- this.parentNode = parentNode;
+ public NodeImpl(NodeImpl parent, boolean dirty) {
+ this.parentNode = parent;
- if (parentNode == null) {
- ownerDocument = null;
- } else if (parentNode.getNodeType() == DOCUMENT_TYPE_NODE) {
- this.ownerDocument = (Document) parentNode;
+ if (parent == null) {
+ this.ownerDocument = null;
+ } else if (parent.getNodeType() == DOCUMENT_TYPE_NODE) {
+ this.ownerDocument = (Document) parent;
} else {
- this.ownerDocument = parentNode.getOwnerDocument();
+ this.ownerDocument = parent.getOwnerDocument();
}
if (dirty) {
@@ -609,6 +609,7 @@
log.warn("invalid node type : " + getNodeType());
}
}
+
if (newNode != null) {
// cloned node must not have a parent
newNode.parentNode = null;
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NotationImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NotationImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NotationImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/NotationImpl.java Sun Sep 2 03:51:37 2007
@@ -32,12 +32,12 @@
public NotationImpl() {
}
- public NotationImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public NotationImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public NotationImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public NotationImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
public short getNodeType() {
@@ -67,5 +67,3 @@
return null;
}
}
-
-
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java Sun Sep 2 03:51:37 2007
@@ -42,16 +42,16 @@
public ProcessingInstructionImpl() {
}
- public ProcessingInstructionImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public ProcessingInstructionImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public ProcessingInstructionImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public ProcessingInstructionImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public ProcessingInstructionImpl(NodeImpl parentNode, String nodeName, String nodeValue) {
- super(parentNode, true);
+ public ProcessingInstructionImpl(NodeImpl parent, String nodeName, String nodeValue) {
+ super(parent, true);
this.nodeName = nodeName;
this.nodeValue = nodeValue;
}
Modified: xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/TextImpl.java
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/TextImpl.java?rev=571948&r1=571947&r2=571948&view=diff
==============================================================================
--- xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/TextImpl.java (original)
+++ xml/xindice/trunk/java/src/org/apache/xindice/xml/dom/TextImpl.java Sun Sep 2 03:51:37 2007
@@ -28,21 +28,22 @@
*
* @version $Revision$, $Date$
*/
-public class TextImpl extends CharacterDataImpl implements Text {
+public class TextImpl extends CharacterDataImpl
+ implements Text {
public TextImpl() {
}
- public TextImpl(NodeImpl parentNode, byte[] data, int pos, int len) {
- super(parentNode, data, pos, len);
+ public TextImpl(NodeImpl parent, byte[] data, int pos, int len) {
+ super(parent, data, pos, len);
}
- public TextImpl(NodeImpl parentNode, boolean dirty) {
- super(parentNode, dirty);
+ public TextImpl(NodeImpl parent, boolean dirty) {
+ super(parent, dirty);
}
- public TextImpl(NodeImpl parentNode, String nodeValue) {
- super(parentNode, nodeValue);
+ public TextImpl(NodeImpl parent, String nodeValue) {
+ super(parent, nodeValue);
}
public short getNodeType() {
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.