Shorten Closure template notation from Array.<*> to Array<*> in cvox.

chrome/browser/resources/chromeos/chromevox/common/description_util.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview A utility class for building NavDescriptions from the dom.
  */
 
 
 goog.provide('cvox.DescriptionUtil');
 
 goog.require('cvox.AriaUtil');
 goog.require('cvox.AuralStyleUtil');
 goog.require('cvox.BareObjectWalker');
 goog.require('cvox.CursorSelection');
 goog.require('cvox.DomUtil');
 goog.require('cvox.EarconUtil');
 goog.require('cvox.MathmlStore');
 goog.require('cvox.NavDescription');
 goog.require('cvox.SpeechRuleEngine');
 goog.require('cvox.TraverseMath');
 
 
 /**
  * Lists all Node tagName's who's description is derived from its subtree.
- * @type {Object.<string, boolean>}
+ * @type {Object<string, boolean>}
  */
 cvox.DescriptionUtil.COLLECTION_NODE_TYPE = {
   'H1': true,
   'H2': true,
   'H3': true,
   'H4': true,
   'H5': true,
   'H6': true
 };
 
 /**
  * Get a control's complete description in the same format as if you
  *     navigated to the node.
  * @param {Element} control A control.
- * @param {Array.<Node>=} opt_changedAncestors The changed ancestors that will
+ * @param {Array<Node>=} opt_changedAncestors The changed ancestors that will
  * be used to determine what needs to be spoken. If this is not provided, the
  * ancestors used to determine what needs to be spoken will just be the control
  * itself and its surrounding control if it has one.
  * @return {cvox.NavDescription} The description of the control.
  */
 cvox.DescriptionUtil.getControlDescription =
     function(control, opt_changedAncestors) {
   var ancestors = [control];
   if (opt_changedAncestors && (opt_changedAncestors.length > 0)) {
     ancestors = opt_changedAncestors;
@@ skipping 32 matching lines @@
 
   return description;
 };
 
 
 /**
  * Returns a description of a navigation from an array of changed
  * ancestor nodes. The ancestors are in order from the highest in the
  * tree to the lowest, i.e. ending with the current leaf node.
  *
- * @param {Array.<Node>} ancestorsArray An array of ancestor nodes.
+ * @param {Array<Node>} ancestorsArray An array of ancestor nodes.
  * @param {boolean} recursive Whether or not the element's subtree should
  *     be used; true by default.
  * @param {number} verbosity The verbosity setting.
  * @return {cvox.NavDescription} The description of the navigation action.
  */
 cvox.DescriptionUtil.getDescriptionFromAncestors = function(
     ancestorsArray, recursive, verbosity) {
   if (typeof(recursive) === 'undefined') {
     recursive = true;
   }
@@ skipping 70 matching lines @@
 /**
  * Returns a description of a navigation from an array of changed
  * ancestor nodes. The ancestors are in order from the highest in the
  * tree to the lowest, i.e. ending with the current leaf node.
  *
  * @param {Node} prevNode The previous node in navigation.
  * @param {Node} node The current node in navigation.
  * @param {boolean} recursive Whether or not the element's subtree should
  *     be used; true by default.
  * @param {number} verbosity The verbosity setting.
- * @return {!Array.<cvox.NavDescription>} The description of the navigation
+ * @return {!Array<cvox.NavDescription>} The description of the navigation
  * action.
  */
 cvox.DescriptionUtil.getDescriptionFromNavigation =
     function(prevNode, node, recursive, verbosity) {
   if (!prevNode || !node) {
     return [];
   }
 
   // Specialized math descriptions.
   if (cvox.DomUtil.isMath(node) &&
@@ skipping 29 matching lines @@
 
 /**
  * Returns an array of NavDescriptions that includes everything that would be
  * spoken by an object walker while traversing from prevSel to sel.
  * It also includes any necessary annotations and context about the set of
  * descriptions. This function is here because most (currently all) walkers
  * that iterate over non-leaf nodes need this sort of description.
  * This is an awkward design, and should be changed in the future.
  * @param {!cvox.CursorSelection} prevSel The previous selection.
  * @param {!cvox.CursorSelection} sel The selection.
- * @return {!Array.<!cvox.NavDescription>} The descriptions as described above.
+ * @return {!Array<!cvox.NavDescription>} The descriptions as described above.
  */
 cvox.DescriptionUtil.getCollectionDescription = function(prevSel, sel) {
   var descriptions = cvox.DescriptionUtil.getRawDescriptions_(prevSel, sel);
   cvox.DescriptionUtil.insertCollectionDescription_(descriptions);
   return descriptions;
 };
 
 
 /**
  * Used for getting collection descriptions.
  * @type {!cvox.BareObjectWalker}
  * @private
  */
 cvox.DescriptionUtil.subWalker_ = new cvox.BareObjectWalker();
 
 
 /**
  * Returns the descriptions that would be gotten by an object walker.
  * @param {!cvox.CursorSelection} prevSel The previous selection.
  * @param {!cvox.CursorSelection} sel The selection.
- * @return {!Array.<!cvox.NavDescription>} The descriptions.
+ * @return {!Array<!cvox.NavDescription>} The descriptions.
  * @private
  */
 cvox.DescriptionUtil.getRawDescriptions_ = function(prevSel, sel) {
   // Use a object walker in non-smart mode to traverse all of the
   // nodes inside the current smart node and return their annotations.
   var descriptions = [];
 
   // We want the descriptions to be in forward order whether or not the
   // selection is reversed.
   sel = sel.clone().setReversed(false);
@@ skipping 29 matching lines @@
   }
 
   return descriptions;
 };
 
 /**
  * Returns the full descriptions of the child nodes that would be gotten by an
  * object walker.
  * @param {?Element} prevnode The previous element if there is one.
  * @param {!Element} node The target element.
- * @return {!Array.<!cvox.NavDescription>} The descriptions.
+ * @return {!Array<!cvox.NavDescription>} The descriptions.
  */
 cvox.DescriptionUtil.getFullDescriptionsFromChildren =
     function(prevnode, node) {
   var descriptions = [];
   if (!node) {
     return descriptions;
   }
   var desc;
   if (cvox.DomUtil.isLeafNode(node)) {
     var ancestors;
@@ skipping 28 matching lines @@
     curSel = /** @type {!cvox.CursorSelection} */ (curSel);
     prevnode = node;
     node = curSel.start.node;
   }
   return descriptions;
 };
 
 
 /**
  * Modify the descriptions to say that it is a collection.
- * @param {Array.<cvox.NavDescription>} descriptions The descriptions.
+ * @param {Array<cvox.NavDescription>} descriptions The descriptions.
  * @private
  */
 cvox.DescriptionUtil.insertCollectionDescription_ = function(descriptions) {
   var annotations = cvox.DescriptionUtil.getAnnotations_(descriptions);
   // If all of the items have the same annotation, describe it as a
   // <annotation> collection with <n> items. Currently only enabled
   // for links, but support should be added for any other type that
   // makes sense.
   if (descriptions.length >= 3 &&
       descriptions[0].context.length == 0 &&
@@ skipping 14 matching lines @@
           'collection',
           [commonAnnotation,
            cvox.ChromeVox.msgs.getNumber(descriptions.length)])
     }));
   }
 };
 
 
 /**
  * Pulls the annotations from a description array.
- * @param {Array.<cvox.NavDescription>} descriptions The descriptions.
- * @return {Array.<string>} The annotations.
+ * @param {Array<cvox.NavDescription>} descriptions The descriptions.
+ * @return {Array<string>} The annotations.
  * @private
  */
 cvox.DescriptionUtil.getAnnotations_ = function(descriptions) {
   var annotations = [];
   for (var i = 0; i < descriptions.length; ++i) {
     var description = descriptions[i];
     if (annotations.indexOf(description.annotation) == -1) {
       // If we have an Internal link collection, call it Link collection.
       // NOTE(deboer): The message comparison is a symptom of a bad design.
       // I suspect this code belongs elsewhere but I don't know where, yet.
@@ skipping 23 matching lines @@
  * @param {string} annotation The annotation text.
  * @return {boolean} If this annotation should be a collection.
  * @private
  */
 cvox.DescriptionUtil.isAnnotationCollection_ = function(annotation) {
   return (annotation == cvox.ChromeVox.msgs.getMsg('tag_link'));
 };
 
 /**
  * Determines whether to describe the exit of an ancestor chain.
- * @param {Array.<Node>} ancestors The ancestors exited during navigation.
+ * @param {Array<Node>} ancestors The ancestors exited during navigation.
  * @return {boolean} The result.
  * @private
  */
 cvox.DescriptionUtil.shouldDescribeExit_ = function(ancestors) {
   return ancestors.some(function(node) {
     switch (node.tagName) {
       case 'TABLE':
       case 'MATH':
         return true;
     }
     return cvox.AriaUtil.isLandmark(node);
   });
 };
 
 
 // TODO(sorge): Bad naming...this thing returns *multiple* descriptions.
 /**
  * Generates a description for a math node.
  * @param {!Node} node The given node.
- * @return {!Array.<cvox.NavDescription>} A list of Navigation descriptions.
+ * @return {!Array<cvox.NavDescription>} A list of Navigation descriptions.
  */
 cvox.DescriptionUtil.getMathDescription = function(node) {
   // TODO (sorge) This function should evantually be removed. Descriptions
   //     should come directly from the speech rule engine, taking information on
   //     verbosity etc. into account.
   var speechEngine = cvox.SpeechRuleEngine.getInstance();
   var traverse = cvox.TraverseMath.getInstance();
   speechEngine.parameterize(cvox.MathmlStore.getInstance());
   traverse.initialize(node);
   var ret = speechEngine.evaluateNode(traverse.activeNode);
   if (ret == []) {
     return [new cvox.NavDescription({'text': 'empty math'})];
   }
   if (cvox.ChromeVox.verbosity == cvox.VERBOSITY_VERBOSE) {
     ret[ret.length - 1].annotation = 'math';
   }
   ret[0].pushEarcon(cvox.AbstractEarcons.SPECIAL_CONTENT);
   return ret;
 };