mmidy 01/04/10 11:49:38
Modified: java/src/org/apache/xalan/processor
XSLTElementProcessor.java
java/src/org/apache/xalan/res XSLTErrorResources.java
java/src/org/apache/xalan/transformer
TransformSnapshotImpl.java TransformerImpl.java
Log:
Misc stuff left out from previous check in
Revision Changes Path
1.11 +3 -0
xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java
Index: XSLTElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSLTElementProcessor.java 2001/03/29 22:39:33 1.10
+++ XSLTElementProcessor.java 2001/04/10 18:49:36 1.11
@@ -223,6 +223,9 @@
{
if (m_savedLastOrder != null && !m_savedLastOrder.empty())
getElemDef().setLastOrder(m_savedLastOrder.pop());
+
+ if (!getElemDef().getRequiredFound())
+
handler.error(XSLTErrorResources.ER_REQUIRED_ELEM_NOT_FOUND, new
Object[]{getElemDef().getRequiredElem()}, null);
}
/**
1.18 +10 -1
xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java
Index: XSLTErrorResources.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XSLTErrorResources.java 2001/03/13 19:54:58 1.17
+++ XSLTErrorResources.java 2001/04/10 18:49:36 1.18
@@ -86,7 +86,7 @@
public static final String WARNING_SUFFIX = "WR";
/** Maximum error messages, this is needed to keep track of the number of
messages. */
- public static final int MAX_CODE = 109;
+ public static final int MAX_CODE = 110;
/** Maximum warnings, this is needed to keep track of the number of
warnings. */
public static final int MAX_WARNING = 26;
@@ -1091,6 +1091,15 @@
{
contents[ER_CLASS_NOT_FOUND_FOR_OPTION][1] =
"Class file not found for option {0}";
+ }
+
+ /** Required Element not found */
+ public static final int ER_REQUIRED_ELEM_NOT_FOUND = 110;
+
+ static
+ {
+ contents[ER_REQUIRED_ELEM_NOT_FOUND][1] =
+ "Required Element not found: {0}";
}
1.3 +0 -1
xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java
Index: TransformSnapshotImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransformSnapshotImpl.java 2001/04/09 21:06:25 1.2
+++ TransformSnapshotImpl.java 2001/04/10 18:49:36 1.3
@@ -4,7 +4,6 @@
import org.apache.xpath.VariableStack;
import org.apache.xml.utils.NodeVector;
import org.apache.xml.utils.BoolStack;
-import org.apache.xalan.serialize.SerializerToXML;
import java.util.Stack;
import org.xml.sax.helpers.NamespaceSupport;
import java.util.Enumeration;
1.93 +1 -2
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- TransformerImpl.java 2001/04/09 21:06:26 1.92
+++ TransformerImpl.java 2001/04/10 18:49:37 1.93
@@ -3026,8 +3026,7 @@
* This will execute the following XSLT instructions
* from the snapshot point.
*/
- public void resetToStylesheet(TransformSnapshot ts)
- //throws TransformerException
+ public void resetToStylesheet(TransformSnapshot ts)
{
((TransformSnapshotImpl)ts).apply(this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
