Author: mukulg
Date: Fri Apr 1 10:49:34 2011
New Revision: 1087642
URL: http://svn.apache.org/viewvc?rev=1087642&view=rev
Log:
removing another unused method parameter, and a little bit of variable renaming.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java?rev=1087642&r1=1087641&r2=1087642&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xpath/XPath20Assert.java
Fri Apr 1 10:49:34 2011
@@ -17,7 +17,6 @@
package org.apache.xerces.impl.xpath;
-import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.NamespaceContext;
/**
@@ -28,16 +27,15 @@ import org.apache.xerces.xni.NamespaceCo
*/
public class XPath20Assert {
- protected final String fExpression;
- protected final NamespaceContext fContext;
+ protected final String fExpressionStr;
+ protected final NamespaceContext fNsContext;
- public XPath20Assert(String xpath, SymbolTable symbolTable,
- NamespaceContext context) {
- fExpression = xpath;
- fContext = context;
+ public XPath20Assert(String xpathStr, NamespaceContext nsContext) {
+ fExpressionStr = xpathStr;
+ fNsContext = nsContext;
}
public String toString() {
- return fExpression;
+ return fExpressionStr;
}
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=1087642&r1=1087641&r2=1087642&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Fri Apr 1 10:49:34 2011
@@ -508,7 +508,7 @@ abstract class XSDAbstractTraverser {
// create an assertion object
XSAssertImpl assertImpl = new XSAssertImpl(typeDef,
annotations, fSchemaHandler);
- Test testExpr = new Test(new XPath20Assert(test,
fSymbolTable, new SchemaNamespaceSupport(schemaDoc.fNamespaceSupport)),
assertImpl);
+ Test testExpr = new Test(new XPath20Assert(test, new
SchemaNamespaceSupport(schemaDoc.fNamespaceSupport)), assertImpl);
assertImpl.setAssertKind(XSConstants.ASSERTION_FACET);
assertImpl.setTest(testExpr, content);
assertImpl.setXPathDefaultNamespace(xpathDefaultNamespace);
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=1087642&r1=1087641&r2=1087642&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Fri Apr 1 10:49:34 2011
@@ -1716,7 +1716,7 @@ class XSDComplexTypeTraverser extends X
// create an assertion object
XSAssertImpl assertImpl = new XSAssertImpl(enclosingCT,
annotations, fSchemaHandler);
- Test testExpr = new Test(new XPath20Assert(test, fSymbolTable, new
SchemaNamespaceSupport(schemaDoc.fNamespaceSupport)), assertImpl);
+ Test testExpr = new Test(new XPath20Assert(test, new
SchemaNamespaceSupport(schemaDoc.fNamespaceSupport)), assertImpl);
assertImpl.setTest(testExpr, assertElement);
assertImpl.setXPathDefaultNamespace(xpathDefaultNamespace);
assertImpl.setXPath2NamespaceContext(new
SchemaNamespaceSupport(schemaDoc.fNamespaceSupport));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
