--- old/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java	2016-12-15 10:06:43.705756076 -0800
+++ new/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java	2016-12-15 10:06:43.577749678 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,19 @@
 
 package com.sun.xml.internal.stream.events;
 
+import java.util.Iterator;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.Location;
+import javax.xml.stream.events.Attribute;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.ProcessingInstruction;
 import javax.xml.stream.events.Namespace;
 import javax.xml.stream.events.EntityDeclaration;
+import javax.xml.stream.events.EntityReference;
+import javax.xml.stream.events.StartDocument;
+import javax.xml.stream.events.StartElement;
 
 
 /**
@@ -42,23 +51,27 @@
     public XMLEventFactoryImpl() {
     }
 
-    public javax.xml.stream.events.Attribute createAttribute(String localName, String value) {
+    @Override
+    public Attribute createAttribute(String localName, String value) {
         AttributeImpl attr =  new AttributeImpl(localName, value);
         if(location != null)attr.setLocation(location);
         return attr;
     }
 
-    public javax.xml.stream.events.Attribute createAttribute(javax.xml.namespace.QName name, String value) {
+    @Override
+    public Attribute createAttribute(QName name, String value) {
         return createAttribute(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart(), value);
     }
 
-    public javax.xml.stream.events.Attribute createAttribute(String prefix, String namespaceURI, String localName, String value) {
+    @Override
+    public Attribute createAttribute(String prefix, String namespaceURI, String localName, String value) {
         AttributeImpl attr =  new AttributeImpl(prefix, namespaceURI, localName, value, null);
         if(location != null)attr.setLocation(location);
         return attr;
     }
 
-    public javax.xml.stream.events.Characters createCData(String content) {
+    @Override
+    public Characters createCData(String content) {
         //stax doesn't have separate CDATA event. This is taken care by
         //CHRACTERS event setting the cdata flag to true.
         CharacterEvent charEvent =  new CharacterEvent(content, true);
@@ -66,126 +79,156 @@
         return charEvent;
     }
 
-    public javax.xml.stream.events.Characters createCharacters(String content) {
+    @Override
+    public Characters createCharacters(String content) {
         CharacterEvent charEvent =  new CharacterEvent(content);
         if(location != null)charEvent.setLocation(location);
         return charEvent;
     }
 
+    @Override
     public javax.xml.stream.events.Comment createComment(String text) {
         CommentEvent charEvent =  new CommentEvent(text);
         if(location != null)charEvent.setLocation(location);
         return charEvent;
     }
 
+    @Override
     public javax.xml.stream.events.DTD createDTD(String dtd) {
         DTDEvent dtdEvent = new DTDEvent(dtd);
         if(location != null)dtdEvent.setLocation(location);
         return dtdEvent;
     }
 
+    @Override
     public javax.xml.stream.events.EndDocument createEndDocument() {
         EndDocumentEvent event =new EndDocumentEvent();
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.EndElement createEndElement(javax.xml.namespace.QName name, java.util.Iterator namespaces) {
+    @Override
+    public javax.xml.stream.events.EndElement createEndElement(QName name,
+            Iterator<? extends Namespace> namespaces) {
         return createEndElement(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart());
     }
 
-    public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri, String localName) {
+    @Override
+    public javax.xml.stream.events.EndElement createEndElement(
+            String prefix, String namespaceUri, String localName) {
         EndElementEvent event =  new EndElementEvent(prefix, namespaceUri, localName);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri, String localName, java.util.Iterator namespaces) {
+    @Override
+    public javax.xml.stream.events.EndElement createEndElement(String prefix, String namespaceUri,
+            String localName, Iterator<? extends Namespace> namespaces) {
 
         EndElementEvent event =  new EndElementEvent(prefix, namespaceUri, localName);
         if(namespaces!=null){
             while(namespaces.hasNext())
-                event.addNamespace((Namespace)namespaces.next());
+                event.addNamespace(namespaces.next());
         }
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.EntityReference createEntityReference(String name, EntityDeclaration entityDeclaration) {
+    @Override
+    public EntityReference createEntityReference(String name, EntityDeclaration entityDeclaration) {
         EntityReferenceEvent event =  new EntityReferenceEvent(name, entityDeclaration);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.Characters createIgnorableSpace(String content) {
+    @Override
+    public Characters createIgnorableSpace(String content) {
         CharacterEvent event =  new CharacterEvent(content, false, true);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.Namespace createNamespace(String namespaceURI) {
+    @Override
+    public Namespace createNamespace(String namespaceURI) {
         NamespaceImpl event =  new NamespaceImpl(namespaceURI);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.Namespace createNamespace(String prefix, String namespaceURI) {
+    @Override
+    public Namespace createNamespace(String prefix, String namespaceURI) {
         NamespaceImpl event =  new NamespaceImpl(prefix, namespaceURI);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.ProcessingInstruction createProcessingInstruction(String target, String data) {
+    @Override
+    public ProcessingInstruction createProcessingInstruction(String target, String data) {
         ProcessingInstructionEvent event =  new ProcessingInstructionEvent(target, data);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.Characters createSpace(String content) {
+    @Override
+    public Characters createSpace(String content) {
         CharacterEvent event =  new CharacterEvent(content);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartDocument createStartDocument() {
+    @Override
+    public StartDocument createStartDocument() {
         StartDocumentEvent event = new StartDocumentEvent();
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartDocument createStartDocument(String encoding) {
+    @Override
+    public StartDocument createStartDocument(String encoding) {
         StartDocumentEvent event =  new StartDocumentEvent(encoding);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartDocument createStartDocument(String encoding, String version) {
+    @Override
+    public StartDocument createStartDocument(String encoding, String version) {
         StartDocumentEvent event =  new StartDocumentEvent(encoding, version);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartDocument createStartDocument(String encoding, String version, boolean standalone) {
+    @Override
+    public StartDocument createStartDocument(String encoding, String version, boolean standalone) {
         StartDocumentEvent event =  new StartDocumentEvent(encoding, version, standalone);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartElement createStartElement(javax.xml.namespace.QName name, java.util.Iterator attributes, java.util.Iterator namespaces) {
-        return createStartElement(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart(), attributes, namespaces);
+    @Override
+    public StartElement createStartElement(QName name, Iterator<? extends Attribute> attributes,
+            Iterator<? extends Namespace> namespaces) {
+        return createStartElement(name.getPrefix(), name.getNamespaceURI(),
+                name.getLocalPart(), attributes, namespaces);
     }
 
-    public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName) {
+    @Override
+    public StartElement createStartElement(String prefix, String namespaceUri, String localName) {
         StartElementEvent event =  new StartElementEvent(prefix, namespaceUri, localName);
         if(location != null)event.setLocation(location);
         return event;
     }
 
-    public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName, java.util.Iterator attributes, java.util.Iterator namespaces) {
+    @Override
+    public StartElement createStartElement(String prefix, String namespaceUri,
+            String localName, Iterator<? extends Attribute> attributes,
+            Iterator<? extends Namespace> namespaces) {
         return createStartElement(prefix, namespaceUri, localName, attributes, namespaces, null);
     }
 
-    public javax.xml.stream.events.StartElement createStartElement(String prefix, String namespaceUri, String localName, java.util.Iterator attributes, java.util.Iterator namespaces, javax.xml.namespace.NamespaceContext context) {
+    @Override
+    public StartElement createStartElement(String prefix, String namespaceUri,
+            String localName, Iterator<? extends Attribute> attributes,
+            Iterator<? extends Namespace> namespaces, NamespaceContext context) {
         StartElementEvent elem =  new StartElementEvent(prefix, namespaceUri, localName);
         elem.addAttributes(attributes);
         elem.addNamespaceAttributes(namespaces);
@@ -194,6 +237,7 @@
         return elem;
     }
 
+    @Override
     public void setLocation(javax.xml.stream.Location location) {
         this.location = location;
     }