Author: dkulp
Date: Tue Aug 28 20:13:27 2012
New Revision: 1378288
URL: http://svn.apache.org/viewvc?rev=1378288&view=rev
Log:
Update a couple of tests so that they will compile if xerces 2.10 is pulled in
instead of 2.9
Modified:
cxf/trunk/api/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
cxf/trunk/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
Modified:
cxf/trunk/api/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java?rev=1378288&r1=1378287&r2=1378288&view=diff
==============================================================================
---
cxf/trunk/api/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
(original)
+++
cxf/trunk/api/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
Tue Aug 28 20:13:27 2012
@@ -69,19 +69,21 @@ public class ImportRepairTest extends As
static boolean dumpSchemas;
- private static final class ListLSInput implements LSInputList {
- private final List<DOMLSInput> inputs;
-
- private ListLSInput(List<DOMLSInput> inputs) {
- this.inputs = inputs;
+ @SuppressWarnings("rawtypes")
+ private static final class ListLSInput extends ArrayList implements
LSInputList {
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unchecked")
+ private ListLSInput(List inputs) {
+ super(inputs);
}
public int getLength() {
- return inputs.size();
+ return size();
}
public LSInput item(int index) {
- return inputs.get(index);
+ return (LSInput)get(index);
}
}
Modified:
cxf/trunk/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java?rev=1378288&r1=1378287&r2=1378288&view=diff
==============================================================================
---
cxf/trunk/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
(original)
+++
cxf/trunk/common/xerces-xsd-validation/src/main/java/org/apache/cxf/xsdvalidation/XercesSchemaValidationUtils.java
Tue Aug 28 20:13:27 2012
@@ -46,22 +46,24 @@ import org.apache.xerces.xs.XSLoader;
*/
class XercesSchemaValidationUtils {
- private static final class ListLSInput implements LSInputList {
- private final List<DOMLSInput> inputs;
-
- private ListLSInput(List<DOMLSInput> inputs) {
- this.inputs = inputs;
+ @SuppressWarnings("rawtypes")
+ private static final class ListLSInput extends ArrayList implements
LSInputList {
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("unchecked")
+ private ListLSInput(List inputs) {
+ super(inputs);
}
public int getLength() {
- return inputs.size();
+ return size();
}
public LSInput item(int index) {
- return inputs.get(index);
+ return (LSInput)get(index);
}
}
-
+
private XSImplementation impl;
XercesSchemaValidationUtils() {
