jdk-sandbox: comparison src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java

equal deleted inserted replaced

-:d07d5f7cab35
+:e1a6c0168741
 /*
-* reserved comment block
+* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
-* DO NOT REMOVE OR ALTER!
+* @LastModified: Oct 2017
 */
 /*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 /**
 protected final static short READONLY     = 0x1<<0;
 protected final static short CHANGED      = 0x1<<1;
 protected final static short HASDEFAULTS  = 0x1<<2;
 /** Nodes. */
-protected List nodes;
+protected List<Node> nodes;
 protected NodeImpl ownerNode; // the node this map belongs to
 //
 // Constructors
 *
 * @return the node which currenly has the specified index, or null if index
 * is greater than or equal to getLength().
 */
 public Node item(int index) {
-return (nodes != null && index < nodes.size()) ?
+return (nodes != null && index < nodes.size()) ? (nodes.get(index)) : null;
-(Node)(nodes.get(index)) : null;
 }
 /**
 * Retrieve a node by name.
 *
 * null if no value has been assigned to that name.
 */
 public Node getNamedItem(String name) {
 int i = findNamePoint(name,0);
-return (i < 0) ? null : (Node)(nodes.get(i));
+return (i < 0) ? null : (nodes.get(i));
 } // getNamedItem(String):Node
 /**
 * Introduced in DOM Level 2. <p>
 *                      name did not identify any node in the map.
 */
 public Node getNamedItemNS(String namespaceURI, String localName) {
 int i = findNamePoint(namespaceURI, localName);
-return (i < 0) ? null : (Node)(nodes.get(i));
+return (i < 0) ? null : (nodes.get(i));
 } // getNamedItemNS(String,String):Node
 /**
 * Adds a node using its nodeName attribute.
 previous = (NodeImpl) nodes.get(i);
 nodes.set(i, arg);
 } else {
 i = -1 - i; // Insert point (may be end of list)
 if (null == nodes) {
-nodes = new ArrayList(5);
+nodes = new ArrayList<>(5);
 }
 nodes.add(i, arg);
 }
 return previous;
 previous = (NodeImpl) nodes.get(i);
 nodes.add(i, arg);
 } else {
 i = -1 - i; // Insert point (may be end of list)
 if (null == nodes) {
-nodes = new ArrayList(5);
+nodes = new ArrayList<>(5);
 }
 nodes.add(i, arg);
 }
 }
 return previous;
 newmap.cloneContent(this);
 return newmap;
 }
 protected void cloneContent(NamedNodeMapImpl srcmap) {
-List srcnodes = srcmap.nodes;
+List<Node> srcnodes = srcmap.nodes;
 if (srcnodes != null) {
 int size = srcnodes.size();
 if (size != 0) {
 if (nodes == null) {
-nodes = new ArrayList(size);
+nodes = new ArrayList<>(size);
 }
 else {
 nodes.clear();
 }
 for (int i = 0; i < size; ++i) {
 int first = start;
 int last  = nodes.size() - 1;
 while (first <= last) {
 i = (first + last) / 2;
-int test = name.compareTo(((Node)(nodes.get(i))).getNodeName());
+int test = name.compareTo(((nodes.get(i))).getNodeName());
 if (test == 0) {
 return i; // Name found
 }
 else if (test < 0) {
 last = i - 1;
 protected boolean precedes(Node a, Node b) {
 if (nodes != null) {
 final int size = nodes.size();
 for (int i = 0; i < size; ++i) {
-Node n = (Node)nodes.get(i);
+Node n = nodes.get(i);
 if (n==a) return true;
 if (n==b) return false;
 }
 }
 return false;
 nodes.add(i, arg);
 }
 else {
 i = -1 - i; // Insert point (may be end of list)
 if (null == nodes) {
-nodes = new ArrayList(5);
+nodes = new ArrayList<>(5);
 }
 nodes.add(i, arg);
 }
 }
 return i;
 * NON-DOM: copy content of this map into the specified ArrayList
 *
 * @param list   ArrayList to copy information into.
 * @return A copy of this node named map
 */
-protected ArrayList cloneMap(ArrayList list) {
+protected List<Node> cloneMap(List<Node> list) {
-if (list == null) {
-list = new ArrayList(5);
-}
-list.clear();
 if (nodes != null) {
-final int size = nodes.size();
+list = new ArrayList<>(nodes);
-for (int i = 0; i < size; ++i) {
-list.add(nodes.get(i));
-}
 }
 return list;
 }
 protected int getNamedItemIndex(String namespaceURI, String localName) {
 private void readObject(ObjectInputStream in)
 throws IOException, ClassNotFoundException {
 in.defaultReadObject();
 if (nodes != null) {
-nodes = new ArrayList(nodes);
+// nodes are written as a Vector for compatibility.
+nodes = new ArrayList<>(nodes);
 }
 }
 private void writeObject(ObjectOutputStream out) throws IOException {
-List oldNodes = this.nodes;
+List<Node> oldNodes = this.nodes;
 try {
 if (oldNodes != null) {
-this.nodes = new Vector(oldNodes);
+// convert to Vector for backward-compatibility
+this.nodes = new Vector<>(oldNodes);
 }
 out.defaultWriteObject();
 }
 // If the write fails for some reason ensure
 // that we restore the original object.

changeset 47359	e1a6c0168741
parent 47216	71c04702a3d5
child 48409	5ab69533994b