garyp 00/10/29 14:29:59
Modified: java/src/org/apache/xpath/objects XBoolean.java
XNodeSet.java XNull.java XNumber.java XObject.java
XRTreeFrag.java XString.java
Log:
Made getTypeString() public to improve error reporting for java extension
method errors.
Revision Changes Path
1.3 +3 -2 xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java
Index: XBoolean.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XBoolean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XBoolean.java 2000/09/26 14:57:24 1.2
+++ XBoolean.java 2000/10/29 22:29:58 1.3
@@ -99,7 +99,7 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#BOOLEAN";
}
@@ -149,7 +149,8 @@
if(obj2.getType() == XObject.CLASS_NODESET)
return obj2.equals(this);
- return m_val == obj2.bool();
}
+ return m_val == obj2.bool();
+ }
}
1.5 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNodeSet.java 2000/09/26 14:57:25 1.4
+++ XNodeSet.java 2000/10/29 22:29:58 1.5
@@ -114,7 +114,7 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#NODESET";
}
1.3 +6 -3 xml-xalan/java/src/org/apache/xpath/objects/XNull.java
Index: XNull.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNull.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNull.java 2000/09/26 14:57:26 1.2
+++ XNull.java 2000/10/29 22:29:58 1.3
@@ -89,10 +89,12 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#CLASS_NULL";
- }
/**
+ }
+
+ /**
* Cast result object to a number.
*/
public double num()
@@ -138,5 +140,6 @@
*/
public boolean equals(XObject obj2)
{
- return obj2.getType() == CLASS_NULL;
}
+ return obj2.getType() == CLASS_NULL;
+ }
}
1.4 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/XNumber.java
Index: XNumber.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNumber.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XNumber.java 2000/10/03 20:37:49 1.3
+++ XNumber.java 2000/10/29 22:29:58 1.4
@@ -88,7 +88,7 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#NUMBER";
}
1.3 +2 -2 xml-xalan/java/src/org/apache/xpath/objects/XObject.java
Index: XObject.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XObject.java 2000/09/26 14:57:28 1.2
+++ XObject.java 2000/10/29 22:29:58 1.3
@@ -165,9 +165,9 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
- return "#UNKNOWN";
+ return "#UNKNOWN (" + object().getClass().getName() + ")";
}
/**
1.7 +1 -1
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java
Index: XRTreeFrag.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XRTreeFrag.java 2000/10/17 15:41:54 1.6
+++ XRTreeFrag.java 2000/10/29 22:29:58 1.7
@@ -88,7 +88,7 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#RTREEFRAG";
}
1.3 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/XString.java
Index: XString.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XString.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XString.java 2000/09/26 14:57:29 1.2
+++ XString.java 2000/10/29 22:29:58 1.3
@@ -89,7 +89,7 @@
* Given a request type, return the equivalent string.
* For diagnostic purposes.
*/
- protected String getTypeString()
+ public String getTypeString()
{
return "#STRING";
}
