src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * 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.

@@ -113,10 +113,11 @@
 
     /**
      * Merge the current value's nodeset set by lookupKey() with _nodes.
      * @deprecated
      */
+    @Deprecated
     public void merge(KeyIndex other) {
         if (other == null) return;
 
         if (other._nodes != null) {
             if (_nodes == null) {

@@ -134,10 +135,11 @@
      * id() differ in the way the lookup value can be whitespace separated
      * list of tokens for the id() function, but a single string for the
      * key() function.
      * @deprecated
      */
+    @Deprecated
     public void lookupId(Object value) {
         // Clear _nodes array
         _nodes = null;
 
         final StringTokenizer values = new StringTokenizer((String) value,

@@ -203,10 +205,11 @@
      * prior to returning the node iterator.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public void lookupKey(Object value) {
         IntegerArray nodes = _index.get(value);
         _nodes = (nodes != null) ? (IntegerArray) nodes.clone() : null;
         _position = 0;
     }

@@ -215,10 +218,11 @@
      * <p>Callers should not call next() after it returns END.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public int next() {
         if (_nodes == null) return DTMAxisIterator.END;
 
         return (_position < _nodes.cardinality()) ?
             _dom.getNodeHandle(_nodes.at(_position++)) : DTMAxisIterator.END;

@@ -311,10 +315,11 @@
      * <p>Resets the iterator to the last start node.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public DTMAxisIterator reset() {
         _position = 0;
         return this;
     }
 

@@ -322,40 +327,44 @@
      * <p>Returns the number of elements in this iterator.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public int getLast() {
         return (_nodes == null) ? 0 : _nodes.cardinality();
     }
 
     /**
      * <p>Returns the position of the current node in the set.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public int getPosition() {
         return _position;
     }
 
     /**
      * <p>Remembers the current node for the next call to gotoMark().</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public void setMark() {
         _markedPosition = _position;
     }
 
     /**
      * <p>Restores the current node remembered by setMark().</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public void gotoMark() {
         _position = _markedPosition;
     }
 
     /**

@@ -363,10 +372,11 @@
      * i.e. subsequent call to next() should return END.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public DTMAxisIterator setStartNode(int start) {
         if (start == DTMAxisIterator.END) {
             _nodes = null;
         }
         else if (_nodes != null) {

@@ -380,30 +390,33 @@
      * i.e. subsequent call to next() should return END.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public int getStartNode() {
         return 0;
     }
 
     /**
      * <p>True if this iterator has a reversed axis.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public boolean isReverse() {
         return(false);
     }
 
     /**
      * <p>Returns a deep copy of this iterator.</p>
      * <p><em>Use of an instance of this class as a {@link DTMAxisIterator} is
      * <b>deprecated.</b></em></p>
      * @deprecated
      */
+    @Deprecated
     public DTMAxisIterator cloneIterator() {
         KeyIndex other = new KeyIndex(0);
         other._index = _index;
         other._rootToIndexMap = _rootToIndexMap;
         other._nodes = _nodes;