src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
changeset 47359 e1a6c0168741
parent 47216 71c04702a3d5
child 47712 bde0215f1f70
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java	Wed Oct 18 13:25:49 2017 -0700
@@ -1,6 +1,6 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,6 @@
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
-import java.util.Vector;
-
 import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
 import com.sun.org.apache.bcel.internal.generic.INVOKEINTERFACE;
 import com.sun.org.apache.bcel.internal.generic.INVOKESPECIAL;
@@ -35,6 +33,8 @@
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
 import com.sun.org.apache.xml.internal.dtm.Axis;
 import com.sun.org.apache.xml.internal.dtm.DTM;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Jacek Ambroziak
@@ -57,7 +57,7 @@
     public void setParser(Parser parser) {
         super.setParser(parser);
         // find all expressions in this Union
-        final Vector components = new Vector();
+        final List<Expression> components = new ArrayList<>();
         flatten(components);
         final int size = components.size();
         _components = (Expression[])components.toArray(new Expression[size]);
@@ -95,14 +95,14 @@
         return "union(" + _pathExpr + ", " + _rest + ')';
     }
 
-    private void flatten(Vector components) {
-        components.addElement(_pathExpr);
+    private void flatten(List<Expression> components) {
+        components.add(_pathExpr);
         if (_rest != null) {
             if (_rest instanceof UnionPathExpr) {
                 ((UnionPathExpr)_rest).flatten(components);
             }
             else {
-                components.addElement(_rest);
+                components.add(_rest);
             }
         }
     }