diff options
Diffstat (limited to 'libjava/classpath/javax/xml')
17 files changed, 34 insertions, 16 deletions
diff --git a/libjava/classpath/javax/xml/datatype/DatatypeFactory.java b/libjava/classpath/javax/xml/datatype/DatatypeFactory.java index 06f465c353e..386d5b85286 100644 --- a/libjava/classpath/javax/xml/datatype/DatatypeFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/namespace/NamespaceContext.java b/libjava/classpath/javax/xml/namespace/NamespaceContext.java index 1bcb85006c1..b9722a47a53 100644 --- a/libjava/classpath/javax/xml/namespace/NamespaceContext.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/namespace/QName.java b/libjava/classpath/javax/xml/namespace/QName.java index 18dee79bbff..3c756237895 100644 --- a/libjava/classpath/javax/xml/namespace/QName.java +++ b/libjava/classpath/javax/xml/namespace/QName.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.xml.namespace; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; import javax.xml.XMLConstants; @@ -126,7 +128,7 @@ public class QName implements Serializable { if (qName == null) { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); if (namespaceURI.length() > 0) { buf.append('{'); diff --git a/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java b/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java index 9312e65e06d..a1350c54920 100644 --- a/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/parsers/SAXParserFactory.java b/libjava/classpath/javax/xml/parsers/SAXParserFactory.java index 549fe4b5409..9f8f7bafee9 100644 --- a/libjava/classpath/javax/xml/parsers/SAXParserFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/XMLEventFactory.java b/libjava/classpath/javax/xml/stream/XMLEventFactory.java index cb850baaec8..30e160793b9 100644 --- a/libjava/classpath/javax/xml/stream/XMLEventFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/XMLEventReader.java b/libjava/classpath/javax/xml/stream/XMLEventReader.java index 35ad5696eda..ee0354f94f3 100644 --- a/libjava/classpath/javax/xml/stream/XMLEventReader.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/XMLInputFactory.java b/libjava/classpath/javax/xml/stream/XMLInputFactory.java index f88451e54bf..437bf83b5ec 100644 --- a/libjava/classpath/javax/xml/stream/XMLInputFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/XMLOutputFactory.java b/libjava/classpath/javax/xml/stream/XMLOutputFactory.java index e4c9dd40d46..908f84f262a 100644 --- a/libjava/classpath/javax/xml/stream/XMLOutputFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/events/DTD.java b/libjava/classpath/javax/xml/stream/events/DTD.java index 6c7bcc4ced0..943572ef32f 100644 --- a/libjava/classpath/javax/xml/stream/events/DTD.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/events/EndElement.java b/libjava/classpath/javax/xml/stream/events/EndElement.java index 86a2e1617e4..3bde8f8ad9e 100644 --- a/libjava/classpath/javax/xml/stream/events/EndElement.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/stream/events/StartElement.java b/libjava/classpath/javax/xml/stream/events/StartElement.java index a35b3b4121f..0916368c92b 100644 --- a/libjava/classpath/javax/xml/stream/events/StartElement.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/transform/TransformerException.java b/libjava/classpath/javax/xml/transform/TransformerException.java index 3d97eda1bbb..7a0b5ad9888 100644 --- a/libjava/classpath/javax/xml/transform/TransformerException.java +++ b/libjava/classpath/javax/xml/transform/TransformerException.java @@ -34,8 +34,11 @@ or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package javax.xml.transform; +import gnu.java.lang.CPStringBuilder; + import java.io.PrintStream; import java.io.PrintWriter; @@ -179,7 +182,7 @@ public class TransformerException String systemId = locator.getSystemId(); int lineNumber = locator.getLineNumber(); int columnNumber = locator.getColumnNumber(); - StringBuffer buffer = new StringBuffer (); + CPStringBuilder buffer = new CPStringBuilder (); if (publicId != null) { buffer.append ("publicId="); diff --git a/libjava/classpath/javax/xml/transform/TransformerFactory.java b/libjava/classpath/javax/xml/transform/TransformerFactory.java index e3c895361a2..e3e6c0cbdc3 100644 --- a/libjava/classpath/javax/xml/transform/TransformerFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/validation/SchemaFactory.java b/libjava/classpath/javax/xml/validation/SchemaFactory.java index 0c24104445b..0b83b6f4d4d 100644 --- a/libjava/classpath/javax/xml/validation/SchemaFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/xpath/XPathFactory.java b/libjava/classpath/javax/xml/xpath/XPathFactory.java index e87475f13d4..76a88a10cec 100644 --- a/libjava/classpath/javax/xml/xpath/XPathFactory.java +++ b/libjava/classpath/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/libjava/classpath/javax/xml/xpath/XPathFunction.java b/libjava/classpath/javax/xml/xpath/XPathFunction.java index c7ea733141f..dbda11bfe6c 100644 --- a/libjava/classpath/javax/xml/xpath/XPathFunction.java +++ b/libjava/classpath/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; |
