morten 01/10/30 07:49:32
Modified: java/src/org/apache/xalan/xsltc/dom AbsoluteIterator.java
CurrentNodeListIterator.java DOMImpl.java
FilterIterator.java FilteredStepIterator.java
MatchingIterator.java MultiDOM.java
NodeIteratorBase.java StepIterator.java
UnionIterator.java
Log:
Final code cleanup after i18n work.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.5 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
Index: AbsoluteIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbsoluteIterator.java 2001/09/20 14:22:36 1.4
+++ AbsoluteIterator.java 2001/10/30 15:49:31 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: AbsoluteIterator.java,v 1.4 2001/09/20 14:22:36 morten Exp $
+ * @(#)$Id: AbsoluteIterator.java,v 1.5 2001/10/30 15:49:31 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -95,7 +95,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.2 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
Index: CurrentNodeListIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CurrentNodeListIterator.java 2001/04/17 18:52:27 1.1
+++ CurrentNodeListIterator.java 2001/10/30 15:49:31 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: CurrentNodeListIterator.java,v 1.1 2001/04/17 18:52:27 sboag Exp
$
+ * @(#)$Id: CurrentNodeListIterator.java,v 1.2 2001/10/30 15:49:31 morten
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -112,7 +112,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.55 +16 -13
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- DOMImpl.java 2001/10/25 15:48:12 1.54
+++ DOMImpl.java 2001/10/30 15:49:32 1.55
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DOMImpl.java,v 1.54 2001/10/25 15:48:12 morten Exp $
+ * @(#)$Id: DOMImpl.java,v 1.55 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -1174,7 +1174,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
@@ -1326,8 +1327,10 @@
final AncestorIterator clone = (AncestorIterator)super.clone();
clone._startNode = _startNode;
return clone.reset();
- } catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ }
+ catch (CloneNotSupportedException e) {
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
@@ -1711,7 +1714,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
@@ -2336,9 +2340,8 @@
iterator = new NamespaceIterator();
break;
default:
- BasisLibrary.runTimeError("Error: iterator for axis '" +
- Axis.names[axis] + "' not implemented");
- System.exit(1);
+ BasisLibrary.runTimeError(BasisLibrary.AXIS_SUPPORT_ERR,
+ Axis.names[axis]);
}
return(iterator);
}
@@ -2403,11 +2406,11 @@
iterator = new TypedNamespaceIterator(type);
break;
default:
- BasisLibrary.runTimeError("Error: typed iterator for axis " +
- Axis.names[axis]+"not implemented");
+ BasisLibrary.runTimeError(BasisLibrary.TYPED_AXIS_SUPPORT_ERR,
+ Axis.names[axis]);
}
}
- return(iterator);
+ return(iterator);
}
/**
@@ -2433,8 +2436,8 @@
iterator = new NamespaceAttributeIterator(ns);
break;
default:
- BasisLibrary.runTimeError("Error: typed iterator for axis " +
- Axis.names[axis]+"not implemented");
+ BasisLibrary.runTimeError(BasisLibrary.TYPED_AXIS_SUPPORT_ERR,
+ Axis.names[axis]);
}
}
return(iterator);
1.3 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilterIterator.java
Index: FilterIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilterIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilterIterator.java 2001/10/05 09:47:56 1.2
+++ FilterIterator.java 2001/10/30 15:49:32 1.3
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilterIterator.java,v 1.2 2001/10/05 09:47:56 morten Exp $
+ * @(#)$Id: FilterIterator.java,v 1.3 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -89,7 +89,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.2 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
Index: FilteredStepIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilteredStepIterator.java 2001/04/17 18:52:31 1.1
+++ FilteredStepIterator.java 2001/10/30 15:49:32 1.2
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: FilteredStepIterator.java,v 1.1 2001/04/17 18:52:31 sboag Exp $
+ * @(#)$Id: FilteredStepIterator.java,v 1.2 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -90,7 +90,8 @@
return clone.resetPosition();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.4 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MatchingIterator.java
Index: MatchingIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MatchingIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MatchingIterator.java 2001/09/19 13:22:51 1.3
+++ MatchingIterator.java 2001/10/30 15:49:32 1.4
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: MatchingIterator.java,v 1.3 2001/09/19 13:22:51 morten Exp $
+ * @(#)$Id: MatchingIterator.java,v 1.4 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -84,7 +84,8 @@
return clone;
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.12 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
Index: MultiDOM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MultiDOM.java 2001/10/19 08:58:37 1.11
+++ MultiDOM.java 2001/10/30 15:49:32 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: MultiDOM.java,v 1.11 2001/10/19 08:58:37 morten Exp $
+ * @(#)$Id: MultiDOM.java,v 1.12 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -197,7 +197,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.5 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
Index: NodeIteratorBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeIteratorBase.java 2001/09/25 19:45:03 1.4
+++ NodeIteratorBase.java 2001/10/30 15:49:32 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NodeIteratorBase.java,v 1.4 2001/09/25 19:45:03 morten Exp $
+ * @(#)$Id: NodeIteratorBase.java,v 1.5 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -117,7 +117,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.7 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/StepIterator.java
Index: StepIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/StepIterator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StepIterator.java 2001/10/05 09:47:56 1.6
+++ StepIterator.java 2001/10/30 15:49:32 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StepIterator.java,v 1.6 2001/10/05 09:47:56 morten Exp $
+ * @(#)$Id: StepIterator.java,v 1.7 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -89,7 +89,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
1.7 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/UnionIterator.java
Index: UnionIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/UnionIterator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UnionIterator.java 2001/09/12 15:16:48 1.6
+++ UnionIterator.java 2001/10/30 15:49:32 1.7
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: UnionIterator.java,v 1.6 2001/09/12 15:16:48 morten Exp $
+ * @(#)$Id: UnionIterator.java,v 1.7 2001/10/30 15:49:32 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -130,7 +130,8 @@
return clone.reset();
}
catch (CloneNotSupportedException e) {
- BasisLibrary.runTimeError("Iterator clone not supported.");
+ BasisLibrary.runTimeError(BasisLibrary.ITERATOR_CLONE_ERR,
+ e.toString());
return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
