Merge branch 'fix-jsdoc' of https://github.com/teppeis/closure-library into teppeis-fix-jsdoc

Fix conflicts

Author: joeltine

closure/goog/array/array.js

@@ -1181,8 +1181,7 @@ goog.array.stableSort = function(arr, opt_compareFn) {
  *     and return a negative number, zero, or a positive number depending on
  *     whether the first argument is less than, equal to, or greater than the
  *     second.
- * @template T
- * @template K
+ * @template T,K
  */
 goog.array.sortByKey = function(arr, keyFn, opt_compareFn) {
   var keyCompareFn = opt_compareFn || goog.array.defaultCompare;

closure/goog/date/daterange.js

@@ -98,7 +98,7 @@ goog.date.DateRange.prototype.contains = function(date) {
 
 
 /**
- * @return {!goog.iter.Iterator} An iterator over the date range.
+ * @return {!goog.date.DateRange.Iterator} An iterator over the date range.
  */
 goog.date.DateRange.prototype.iterator = function() {
   return new goog.date.DateRange.Iterator(this);
@@ -397,7 +397,7 @@ goog.date.DateRange.cloneOrCreate_ = function(opt_today) {
  * @constructor
  * @struct
  * @suppress {checkStructDictInheritance}
- * @extends {goog.iter.Iterator}
+ * @extends {goog.iter.Iterator<goog.date.Date>}
  * @param {goog.date.DateRange} dateRange The date range to iterate.
  * @final
  */

closure/goog/db/objectstore.js

@@ -41,11 +41,11 @@ goog.require('goog.events');
  *
  * @param {!IDBObjectStore} store The backing IndexedDb object.
  * @constructor
+ * @final
  *
  * TODO(arthurhsu): revisit msg in exception and errors in this class. In newer
  *     Chrome (v22+) the error/request come with a DOM error string that is
  *     already very descriptive.
- * @final
  */
 goog.db.ObjectStore = function(store) {
   /**

closure/goog/events/eventtargettester.js

@@ -135,6 +135,7 @@ goog.events.eventTargetTester.KeyType = {
 
 /**
  * The type of unlisten function's return value.
+ * @enum {number}
  */
 goog.events.eventTargetTester.UnlistenReturnType = {
   /**

closure/goog/graphics/vmlgraphics.js

@@ -372,6 +372,7 @@ goog.graphics.VmlGraphics.prototype.setElementStroke = function(element,
  *
  * If a more general affine transform is needed than this provides
  * (e.g. skew and scale) then use setElementAffineTransform.
+ * @param {goog.graphics.Element} element The element wrapper.
  * @param {number} x The x coordinate of the translation transform.
  * @param {number} y The y coordinate of the translation transform.
  * @param {number} angle The angle of the rotation transform.

closure/goog/structs/linkedmap.js

@@ -93,7 +93,7 @@ goog.structs.LinkedMap = function(opt_maxCount, opt_cache,
 /**
  * Finds a node and updates it to be the most recently used.
  * @param {string} key The key of the node.
- * @return {goog.structs.LinkedMap.Node_} The node or null if not found.
+ * @return {goog.structs.LinkedMap.Node_<string,VALUE>} The node or null if not found.
  * @private
  */
 goog.structs.LinkedMap.prototype.findAndMoveToTop_ = function(key) {
@@ -211,7 +211,7 @@ goog.structs.LinkedMap.prototype.remove = function(key) {
 /**
  * Removes a node from the {@code LinkedMap}. It can be overridden to do
  * further cleanup such as disposing of the node value.
- * @param {!goog.structs.LinkedMap.Node_} node The node to remove.
+ * @param {!goog.structs.LinkedMap.Node_<string,VALUE>} node The node to remove.
  * @protected
  */
 goog.structs.LinkedMap.prototype.removeNode = function(node) {
@@ -414,7 +414,7 @@ goog.structs.LinkedMap.prototype.every = function(f, opt_obj) {
  * the head of the list, otherwise they are appended to the tail. If there is a
  * maximum size, the list will be truncated if necessary.
  *
- * @param {goog.structs.LinkedMap.Node_} node The item to insert.
+ * @param {goog.structs.LinkedMap.Node_<string,VALUE>} node The item to insert.
  * @private
  */
 goog.structs.LinkedMap.prototype.insert_ = function(node) {
@@ -459,7 +459,7 @@ goog.structs.LinkedMap.prototype.truncate_ = function(count) {
 /**
  * Removes the node from the LinkedMap if it is not the head, and returns
  * the node's value.
- * @param {!goog.structs.LinkedMap.Node_} node The item to remove.
+ * @param {!goog.structs.LinkedMap.Node_<string,VALUE>} node The item to remove.
  * @return {VALUE} The value of the popped node.
  * @private
  */
@@ -488,14 +488,14 @@ goog.structs.LinkedMap.Node_ = function(key, value) {
 
 /**
  * The next node in the list.
- * @type {!goog.structs.LinkedMap.Node_}
+ * @type {!goog.structs.LinkedMap.Node_<KEY,VALUE>}
  */
 goog.structs.LinkedMap.Node_.prototype.next;
 
 
 /**
  * The previous node in the list.
- * @type {!goog.structs.LinkedMap.Node_}
+ * @type {!goog.structs.LinkedMap.Node_<KEY,VALUE>}
  */
 goog.structs.LinkedMap.Node_.prototype.prev;