You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mi...@apache.org on 2005/10/22 17:52:22 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/lib ExsltDatetime.java
minchau 2005/10/22 08:52:22
Modified: java/src/org/apache/xalan/xsltc/compiler QName.java
SymbolTable.java
java/src/org/apache/xalan/templates FuncDocument.java
java/src/org/apache/xpath/compiler OpMap.java
java/src/org/apache/xalan/xsltc/compiler/util ErrorMsg.java
java/src/org/apache/xalan/lib ExsltDatetime.java
Log:
Fix for XALANJ-2217 applied, except for the change to ElemNumber.
Patch was submitted by Dave Brosius and reviewed and approved
by Brian Minchau
Revision Changes Path
1.7 +2 -3 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/QName.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QName.java 16 Feb 2004 22:24:29 -0000 1.6
+++ QName.java 22 Oct 2005 15:52:22 -0000 1.7
@@ -76,7 +76,6 @@
}
public String dump() {
- return new String("QName: " + _namespace + "(" + _prefix + "):"
- + _localname);
+ return "QName: " + _namespace + "(" + _prefix + "):" + _localname;
}
}
1.12 +2 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SymbolTable.java
Index: SymbolTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SymbolTable.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SymbolTable.java 16 Feb 2004 22:25:10 -0000 1.11
+++ SymbolTable.java 22 Oct 2005 15:52:22 -0000 1.12
@@ -143,7 +143,7 @@
private int _nsCounter = 0;
public String generateNamespacePrefix() {
- return(new String("ns"+(_nsCounter++)));
+ return("ns"+(_nsCounter++));
}
/**
1.37 +2 -2 xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java
Index: FuncDocument.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- FuncDocument.java 17 Aug 2004 18:35:33 -0000 1.36
+++ FuncDocument.java 22 Oct 2005 15:52:22 -0000 1.37
@@ -268,7 +268,7 @@
try
{
- if ((null != uri) && (uri.toString().length() > 0))
+ if ((null != uri) && (uri.length() > 0))
{
newDoc = treeMgr.getSourceTree(source, xctxt.getSAXLocator(), xctxt);
1.17 +2 -2 xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java
Index: OpMap.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/OpMap.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OpMap.java 17 Feb 2004 04:32:49 -0000 1.16
+++ OpMap.java 22 Oct 2005 15:52:22 -0000 1.17
@@ -238,7 +238,7 @@
else
{
throw new RuntimeException(
- XSLMessages.createXPATHMessage(XPATHErrorResources.ER_UNKNOWN_STEP, new Object[]{new Integer(stepType).toString()}));
+ XSLMessages.createXPATHMessage(XPATHErrorResources.ER_UNKNOWN_STEP, new Object[]{String.valueOf(stepType)}));
//"Programmer's assertion in getNextStepPos: unknown stepType: " + stepType);
}
}
1.28 +2 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
Index: ErrorMsg.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ErrorMsg.java 3 Jun 2005 15:52:45 -0000 1.27
+++ ErrorMsg.java 22 Oct 2005 15:52:22 -0000 1.28
@@ -256,7 +256,7 @@
*/
public String toString() {
String suffix = (_params == null) ?
- (null != _code ? new String(getErrorMessage()) : _message)
+ (null != _code ? getErrorMessage() : _message)
: MessageFormat.format(getErrorMessage(), _params);
return formatLine() + suffix;
}
1.17 +3 -3 xml-xalan/java/src/org/apache/xalan/lib/ExsltDatetime.java
Index: ExsltDatetime.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltDatetime.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ExsltDatetime.java 15 Jul 2005 21:45:11 -0000 1.16
+++ ExsltDatetime.java 22 Oct 2005 15:52:22 -0000 1.17
@@ -160,7 +160,7 @@
*/
public static String date()
{
- String datetime = dateTime().toString();
+ String datetime = dateTime();
String date = datetime.substring(0, datetime.indexOf("T"));
String zone = datetime.substring(getZoneStart(datetime));
return (date + zone);
@@ -211,7 +211,7 @@
*/
public static String time()
{
- String datetime = dateTime().toString();
+ String datetime = dateTime();
String time = datetime.substring(datetime.indexOf("T")+1);
// The datetime() function returns the zone on the datetime string. If we
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org