refactor

git-svn-id: https://svn.apache.org/repos/asf/xmlbeans/trunk@1935541 13f79535-47bb-0310-9956-ffa450edef68

Author: pjfanning

src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java

@@ -43,7 +43,7 @@ public class Sax2Dom
 
     private Node _root = null;
     private Document _document = null;
-    private Stack<Node> _nodeStk = new Stack<>();
+    private final Stack<Node> _nodeStk = new Stack<>();
     private Vector<String> _namespaceDecls = null;
 
     public Sax2Dom() throws ParserConfigurationException
@@ -155,7 +155,7 @@ public void startPrefixMapping(String prefix, String uri)
     {
         if (_namespaceDecls == null)
         {
-            _namespaceDecls = new Vector(2);
+            _namespaceDecls = new Vector<>(2);
         }
         _namespaceDecls.addElement(prefix);
         _namespaceDecls.addElement(uri);

src/main/java/org/apache/xmlbeans/impl/regex/Op.java

@@ -163,10 +163,10 @@ int getData() {
 
     // ================================================================
     static class UnionOp extends Op {
-        Vector branches;
+        Vector<Op> branches;
         UnionOp(int type, int size) {
             super(type);
-            this.branches = new Vector(size);
+            this.branches = new Vector<>(size);
         }
         void addElement(Op op) {
             this.branches.addElement(op);
@@ -175,7 +175,7 @@ int size() {
             return this.branches.size();
         }
         Op elementAt(int index) {
-            return (Op)this.branches.elementAt(index);
+            return this.branches.elementAt(index);
         }
     }