diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-22 19:42:58 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-22 19:42:58 +0000 |
commit | 07d83e4a68a79ed4336475f9334222fc9f254668 (patch) | |
tree | 8b3716931c98f46f535b6a64ae90590de3e99e74 /javax | |
parent | ece8fc725851e15b0383e0567126c2d8aa7d50c2 (diff) | |
download | classpath-07d83e4a68a79ed4336475f9334222fc9f254668.tar.gz |
Genericised javax.xml.* and gnu.xml.xpath.*.
2008-06-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/xml/xpath/BooleanFunction.java,
* gnu/xml/xpath/CeilingFunction.java,
* gnu/xml/xpath/ConcatFunction.java,
* gnu/xml/xpath/DocumentOrderComparator.java,
* gnu/xml/xpath/Expr.java,
* gnu/xml/xpath/IdFunction.java,
* gnu/xml/xpath/LangFunction.java,
* gnu/xml/xpath/LocalNameFunction.java,
* gnu/xml/xpath/NameFunction.java,
* gnu/xml/xpath/NormalizeSpaceFunction.java,
* gnu/xml/xpath/NotFunction.java,
* gnu/xml/xpath/NumberFunction.java,
* gnu/xml/xpath/Path.java,
* gnu/xml/xpath/RoundFunction.java,
* gnu/xml/xpath/Selector.java,
* gnu/xml/xpath/StartsWithFunction.java,
* gnu/xml/xpath/Steps.java,
* gnu/xml/xpath/StringFunction.java,
* gnu/xml/xpath/StringLengthFunction.java,
* gnu/xml/xpath/SubstringAfterFunction.java,
* gnu/xml/xpath/SubstringBeforeFunction.java,
* gnu/xml/xpath/SubstringFunction.java,
* gnu/xml/xpath/SumFunction.java,
* gnu/xml/xpath/TranslateFunction.java,
* gnu/xml/xpath/UnionExpr.java,
* gnu/xml/xpath/XPathParser.java,
* gnu/xml/xpath/XPathParser.y,
* gnu/xml/xpath/XPathTokenizer.java:
Genericised.
* javax/xml/datatype/DatatypeFactory.java:
Use new java.util.ServiceLoader framework.
* javax/xml/namespace/NamespaceContext.java,
* javax/xml/parsers/DocumentBuilderFactory.java,
* javax/xml/parsers/SAXParserFactory.java,
* javax/xml/stream/XMLEventFactory.java,
* javax/xml/stream/XMLEventReader.java,
* javax/xml/stream/XMLInputFactory.java,
* javax/xml/stream/XMLOutputFactory.java:
Genericised.
* javax/xml/stream/events/DTD.java,
* javax/xml/stream/events/EndElement.java,
* javax/xml/stream/events/StartElement.java:
Ignore unchecked errors due to API not using generics.
* javax/xml/transform/TransformerFactory.java,
* javax/xml/validation/SchemaFactory.java,
* javax/xml/xpath/XPathFactory.java:
Genericised.
* javax/xml/xpath/XPathFunction.java:
Ignore unchecked errors due to API not using generics.
Diffstat (limited to 'javax')
-rw-r--r-- | javax/xml/datatype/DatatypeFactory.java | 8 | ||||
-rw-r--r-- | javax/xml/namespace/NamespaceContext.java | 1 | ||||
-rw-r--r-- | javax/xml/parsers/DocumentBuilderFactory.java | 2 | ||||
-rw-r--r-- | javax/xml/parsers/SAXParserFactory.java | 2 | ||||
-rw-r--r-- | javax/xml/stream/XMLEventFactory.java | 7 | ||||
-rw-r--r-- | javax/xml/stream/XMLEventReader.java | 1 | ||||
-rw-r--r-- | javax/xml/stream/XMLInputFactory.java | 2 | ||||
-rw-r--r-- | javax/xml/stream/XMLOutputFactory.java | 2 | ||||
-rw-r--r-- | javax/xml/stream/events/DTD.java | 2 | ||||
-rw-r--r-- | javax/xml/stream/events/EndElement.java | 1 | ||||
-rw-r--r-- | javax/xml/stream/events/StartElement.java | 2 | ||||
-rw-r--r-- | javax/xml/transform/TransformerFactory.java | 4 | ||||
-rw-r--r-- | javax/xml/validation/SchemaFactory.java | 4 | ||||
-rw-r--r-- | javax/xml/xpath/XPathFactory.java | 2 | ||||
-rw-r--r-- | javax/xml/xpath/XPathFunction.java | 1 |
15 files changed, 27 insertions, 14 deletions
diff --git a/javax/xml/datatype/DatatypeFactory.java b/javax/xml/datatype/DatatypeFactory.java index 06f465c35..386d5b852 100644 --- a/javax/xml/datatype/DatatypeFactory.java +++ b/javax/xml/datatype/DatatypeFactory.java @@ -44,7 +44,7 @@ import java.math.BigInteger; import java.util.GregorianCalendar; import java.util.Iterator; import java.util.Properties; -import gnu.classpath.ServiceFactory; +import java.util.ServiceLoader; /** * Factory class to create new datatype objects mapping XML to and from Java @@ -97,11 +97,11 @@ public abstract class DatatypeFactory return (DatatypeFactory) Class.forName(className).newInstance(); } // 3. services - Iterator i = ServiceFactory.lookupProviders(DatatypeFactory.class); + Iterator<DatatypeFactory> i = ServiceLoader.load(DatatypeFactory.class).iterator(); if (i.hasNext()) - return (DatatypeFactory) i.next(); + return i.next(); // 4. fallback - Class t = Class.forName(DATATYPEFACTORY_IMPLEMENTATION_CLASS); + Class<?> t = Class.forName(DATATYPEFACTORY_IMPLEMENTATION_CLASS); return (DatatypeFactory) t.newInstance(); } catch (Exception e) diff --git a/javax/xml/namespace/NamespaceContext.java b/javax/xml/namespace/NamespaceContext.java index 1bcb85006..b9722a47a 100644 --- a/javax/xml/namespace/NamespaceContext.java +++ b/javax/xml/namespace/NamespaceContext.java @@ -61,6 +61,7 @@ public interface NamespaceContext /** * Returns all the prefixes currently bound to the given namespace URI. */ + @SuppressWarnings("unchecked") public Iterator getPrefixes(String namespaceURI); } diff --git a/javax/xml/parsers/DocumentBuilderFactory.java b/javax/xml/parsers/DocumentBuilderFactory.java index 9312e65e0..a1350c549 100644 --- a/javax/xml/parsers/DocumentBuilderFactory.java +++ b/javax/xml/parsers/DocumentBuilderFactory.java @@ -99,7 +99,7 @@ public abstract class DocumentBuilderFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (DocumentBuilderFactory) t.newInstance(); } diff --git a/javax/xml/parsers/SAXParserFactory.java b/javax/xml/parsers/SAXParserFactory.java index 549fe4b54..9f8f7bafe 100644 --- a/javax/xml/parsers/SAXParserFactory.java +++ b/javax/xml/parsers/SAXParserFactory.java @@ -99,7 +99,7 @@ public abstract class SAXParserFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (SAXParserFactory) t.newInstance(); } diff --git a/javax/xml/stream/XMLEventFactory.java b/javax/xml/stream/XMLEventFactory.java index cb850baae..30e160793 100644 --- a/javax/xml/stream/XMLEventFactory.java +++ b/javax/xml/stream/XMLEventFactory.java @@ -116,7 +116,7 @@ public abstract class XMLEventFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (XMLEventFactory) t.newInstance(); } @@ -217,6 +217,7 @@ public abstract class XMLEventFactory /** * Create a start-element event. */ + @SuppressWarnings("unchecked") public abstract StartElement createStartElement(QName name, Iterator attributes, Iterator namespaces); @@ -231,6 +232,7 @@ public abstract class XMLEventFactory /** * Create a start-element event. */ + @SuppressWarnings("unchecked") public abstract StartElement createStartElement(String prefix, String namespaceUri, String localName, @@ -240,6 +242,7 @@ public abstract class XMLEventFactory /** * Create a start-element event. */ + @SuppressWarnings("unchecked") public abstract StartElement createStartElement(String prefix, String namespaceUri, String localName, @@ -250,6 +253,7 @@ public abstract class XMLEventFactory /** * Create an end-element event. */ + @SuppressWarnings("unchecked") public abstract EndElement createEndElement(QName name, Iterator namespaces); @@ -263,6 +267,7 @@ public abstract class XMLEventFactory /** * Create an end-element event. */ + @SuppressWarnings("unchecked") public abstract EndElement createEndElement(String prefix, String namespaceUri, String localName, diff --git a/javax/xml/stream/XMLEventReader.java b/javax/xml/stream/XMLEventReader.java index 35ad5696e..ee0354f94 100644 --- a/javax/xml/stream/XMLEventReader.java +++ b/javax/xml/stream/XMLEventReader.java @@ -43,6 +43,7 @@ import javax.xml.stream.events.XMLEvent; /** * An XML parser. */ +@SuppressWarnings("unchecked") public interface XMLEventReader extends Iterator { diff --git a/javax/xml/stream/XMLInputFactory.java b/javax/xml/stream/XMLInputFactory.java index f88451e54..437bf83b5 100644 --- a/javax/xml/stream/XMLInputFactory.java +++ b/javax/xml/stream/XMLInputFactory.java @@ -229,7 +229,7 @@ public abstract class XMLInputFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (XMLInputFactory) t.newInstance(); } diff --git a/javax/xml/stream/XMLOutputFactory.java b/javax/xml/stream/XMLOutputFactory.java index e4c9dd40d..908f84f26 100644 --- a/javax/xml/stream/XMLOutputFactory.java +++ b/javax/xml/stream/XMLOutputFactory.java @@ -116,7 +116,7 @@ public abstract class XMLOutputFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (XMLOutputFactory) t.newInstance(); } diff --git a/javax/xml/stream/events/DTD.java b/javax/xml/stream/events/DTD.java index 6c7bcc4ce..943572ef3 100644 --- a/javax/xml/stream/events/DTD.java +++ b/javax/xml/stream/events/DTD.java @@ -60,11 +60,13 @@ public interface DTD /** * Returns the notations declared in the DTD. */ + @SuppressWarnings("unchecked") List getNotations(); /** * Returns the entities declared in the DTD. */ + @SuppressWarnings("unchecked") List getEntities(); } diff --git a/javax/xml/stream/events/EndElement.java b/javax/xml/stream/events/EndElement.java index 86a2e1617..3bde8f8ad 100644 --- a/javax/xml/stream/events/EndElement.java +++ b/javax/xml/stream/events/EndElement.java @@ -55,6 +55,7 @@ public interface EndElement /** * Returns the namespaces that have gone out of scope. */ + @SuppressWarnings("unchecked") Iterator getNamespaces(); } diff --git a/javax/xml/stream/events/StartElement.java b/javax/xml/stream/events/StartElement.java index a35b3b412..0916368c9 100644 --- a/javax/xml/stream/events/StartElement.java +++ b/javax/xml/stream/events/StartElement.java @@ -56,11 +56,13 @@ public interface StartElement /** * Returns the attributes declared on this element. */ + @SuppressWarnings("unchecked") Iterator getAttributes(); /** * Returns the namespaces declared on this element. */ + @SuppressWarnings("unchecked") Iterator getNamespaces(); /** diff --git a/javax/xml/transform/TransformerFactory.java b/javax/xml/transform/TransformerFactory.java index e3c895361..e3e6c0cbd 100644 --- a/javax/xml/transform/TransformerFactory.java +++ b/javax/xml/transform/TransformerFactory.java @@ -89,7 +89,7 @@ public abstract class TransformerFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (TransformerFactory) t.newInstance(); } @@ -107,7 +107,7 @@ public abstract class TransformerFactory while (className == null && count < 3); try { - Class t = + Class<?> t = Class.forName("gnu.xml.transform.TransformerFactoryImpl"); return (TransformerFactory) t.newInstance(); } diff --git a/javax/xml/validation/SchemaFactory.java b/javax/xml/validation/SchemaFactory.java index 0c2410444..0b83b6f4d 100644 --- a/javax/xml/validation/SchemaFactory.java +++ b/javax/xml/validation/SchemaFactory.java @@ -89,7 +89,7 @@ public abstract class SchemaFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); return (SchemaFactory) t.newInstance(); } @@ -118,7 +118,7 @@ public abstract class SchemaFactory for (String line = r.readLine(); line != null; line = r.readLine()) { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); SchemaFactory ret = (SchemaFactory) t.newInstance(); if (ret.isSchemaLanguageSupported(schemaLanguage)) diff --git a/javax/xml/xpath/XPathFactory.java b/javax/xml/xpath/XPathFactory.java index e87475f13..76a88a10c 100644 --- a/javax/xml/xpath/XPathFactory.java +++ b/javax/xml/xpath/XPathFactory.java @@ -117,7 +117,7 @@ public abstract class XPathFactory { try { - Class t = (loader != null) ? loader.loadClass(className) : + Class<?> t = (loader != null) ? loader.loadClass(className) : Class.forName(className); XPathFactory ret = (XPathFactory) t.newInstance(); if (ret.isObjectModelSupported(uri)) diff --git a/javax/xml/xpath/XPathFunction.java b/javax/xml/xpath/XPathFunction.java index c7ea73314..dbda11bfe 100644 --- a/javax/xml/xpath/XPathFunction.java +++ b/javax/xml/xpath/XPathFunction.java @@ -52,6 +52,7 @@ public interface XPathFunction * Evaluate the function with the specified arguments. * @param args the list of arguments */ + @SuppressWarnings("unchecked") Object evaluate(List args) throws XPathFunctionException; |