[metacat-cvs] metacat/src/edu/ucsb/nceas/metacat NodeComparator.java ElementNode.java
Saurabh Garg
sgarg at ecoinformatics.org
Fri Nov 18 13:11:51 PST 2005
sgarg 05/11/18 13:11:51
Modified: src/edu/ucsb/nceas/metacat NodeComparator.java
ElementNode.java
Log:
Replaced access to NodeRecord.<variable> with NodeRecord.<getVariable>
Revision Changes Path
1.5 +5 -5 metacat/src/edu/ucsb/nceas/metacat/NodeComparator.java
Index: NodeComparator.java
===================================================================
RCS file: /cvs/metacat/src/edu/ucsb/nceas/metacat/NodeComparator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeComparator.java 18 Jan 2001 19:51:59 -0000 1.4
+++ NodeComparator.java 18 Nov 2005 21:11:51 -0000 1.5
@@ -6,9 +6,9 @@
* Authors: Matt Jones
* Release: @release@
*
- * '$Author: jones $'
- * '$Date: 2001/01/18 19:51:59 $'
- * '$Revision: 1.4 $'
+ * '$Author: sgarg $'
+ * '$Date: 2005/11/18 21:11:51 $'
+ * '$Revision: 1.5 $'
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -72,11 +72,11 @@
* its nodeindex is greater.
*/
public int compare(NodeRecord o1, NodeRecord o2) {
- if (o1.nodeid == o2.nodeid) {
+ if (o1.getNodeId() == o2.getNodeId()) {
return EQUALS;
- } else if (o1.nodeid < o2.nodeid) {
+ } else if (o1.getNodeId() < o2.getNodeId()) {
return LESS;
- } else if (o1.nodeid > o2.nodeid) {
+ } else if (o1.getNodeId() > o2.getNodeId()) {
return GREATER;
/* // This is old code that used to sort the records into breadth-first
1.27 +39 -39 metacat/src/edu/ucsb/nceas/metacat/ElementNode.java
Index: ElementNode.java
===================================================================
RCS file: /cvs/metacat/src/edu/ucsb/nceas/metacat/ElementNode.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ElementNode.java 10 Oct 2005 17:50:28 -0000 1.26
+++ ElementNode.java 18 Nov 2005 21:11:51 -0000 1.27
@@ -8,8 +8,8 @@
* Release: @release@
*
* '$Author: sgarg $'
- * '$Date: 2005/10/10 17:50:28 $'
- * '$Revision: 1.26 $'
+ * '$Date: 2005/11/18 21:11:51 $'
+ * '$Revision: 1.27 $'
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -60,54 +60,54 @@
Iterator it = nodeRecordList.iterator();
while (it.hasNext()) {
NodeRecord currentNode = (NodeRecord)it.next();
- if (currentNode.nodeid == nodeid) {
- logMetacat.info("Got Node ID: " + currentNode.nodeid +
- " (" + currentNode.parentnodeid +
- ", " + currentNode.nodeindex +
- ", " + currentNode.nodetype + ")");
+ if (currentNode.getNodeId() == nodeid) {
+ logMetacat.info("Got Node ID: " + currentNode.getNodeId() +
+ " (" + currentNode.getParentNodeId() +
+ ", " + currentNode.getNodeIndex() +
+ ", " + currentNode.getNodeType() + ")");
// Process the current node
- setNodeType(currentNode.nodetype);
- setNodeID(currentNode.nodeid);
- setParentID(currentNode.parentnodeid);
- setTagName(currentNode.nodename);
+ setNodeType(currentNode.getNodeType());
+ setNodeID(currentNode.getNodeId());
+ setParentID(currentNode.getParentNodeId());
+ setTagName(currentNode.getNodeName());
} else {
// Process the children nodes
- if (currentNode.parentnodeid == getNodeID()) {
- logMetacat.info(" Processing child: " + currentNode.nodeid +
- " (" + currentNode.parentnodeid +
- ", " + currentNode.nodeindex +
- ", " + currentNode.nodetype + ")");
+ if (currentNode.getParentNodeId() == getNodeID()) {
+ logMetacat.info(" Processing child: " + currentNode.getNodeId() +
+ " (" + currentNode.getParentNodeId() +
+ ", " + currentNode.getNodeIndex() +
+ ", " + currentNode.getNodeType() + ")");
- if ((currentNode.nodetype).equals("ELEMENT")) {
- logMetacat.info("Creating child node: " + currentNode.nodeid);
+ if ((currentNode.getNodeType()).equals("ELEMENT")) {
+ logMetacat.info("Creating child node: " + currentNode.getNodeId());
ElementNode child = new ElementNode(nodeRecordList,
- currentNode.nodeid);
+ currentNode.getNodeId());
addChildNode(child);
- } else if (currentNode.nodetype.equals("ATTRIBUTE")) {
- setAttribute(currentNode.nodename,currentNode.nodedata);
- } else if (currentNode.nodetype.equals("TEXT")) {
- TextNode child = new TextNode(currentNode.nodeid,
- currentNode.parentnodeid,
- currentNode.nodedata);
+ } else if (currentNode.getNodeType().equals("ATTRIBUTE")) {
+ setAttribute(currentNode.getNodeName(),currentNode.getNodeData());
+ } else if (currentNode.getNodeType().equals("TEXT")) {
+ TextNode child = new TextNode(currentNode.getNodeId(),
+ currentNode.getParentNodeId(),
+ currentNode.getNodeData());
addChildNode(child);
- } else if (currentNode.nodetype.equals("COMMENT")) {
- CommentNode child = new CommentNode(currentNode.nodeid,
- currentNode.parentnodeid,
- currentNode.nodedata);
+ } else if (currentNode.getNodeType().equals("COMMENT")) {
+ CommentNode child = new CommentNode(currentNode.getNodeId(),
+ currentNode.getParentNodeId(),
+ currentNode.getNodeData());
addChildNode(child);
- } else if (currentNode.nodetype.equals("PI")) {
- PINode child = new PINode(currentNode.nodeid,
- currentNode.parentnodeid,
- currentNode.nodename,
- currentNode.nodedata);
+ } else if (currentNode.getNodeType().equals("PI")) {
+ PINode child = new PINode(currentNode.getNodeId(),
+ currentNode.getParentNodeId(),
+ currentNode.getNodeName(),
+ currentNode.getNodeData());
addChildNode(child);
}
} else {
- logMetacat.info(" Discarding child: " + currentNode.nodeid +
- " (" + currentNode.parentnodeid +
- ", " + currentNode.nodeindex +
- ", " + currentNode.nodetype + ")");
+ logMetacat.info(" Discarding child: " + currentNode.getNodeId() +
+ " (" + currentNode.getParentNodeId() +
+ ", " + currentNode.getNodeIndex() +
+ ", " + currentNode.getNodeType() + ")");
}
}
}
More information about the Metacat-cvs
mailing list