/* ===========================================================
 * JFreeChart : a free chart library for the Java(tm) platform
 * ===========================================================
 *
 * (C) Copyright 2000-2016, by Object Refinery Limited and Contributors.
 *
 * Project Info:  http://www.jfree.org/jfreechart/index.html
 *
 * This library is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation; either version 2.1 of the License, or
 * (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
 * License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 * USA.
 *
 * [Oracle and Java are registered trademarks of Oracle and/or its affiliates. 
 * Other names may be trademarks of their respective owners.]
 *
 * -----------------------
 * KeyedValuesItemKey.java
 * -----------------------
 * (C) Copyright 2014, by Object Refinery Limited.
 *
 * Original Author:  David Gilbert (for Object Refinery Limited);
 * Contributor(s):   -;
 *
 * Changes:
 * --------
 * 18-Aug-2014 : Version 1, based on code from Orson Charts (DG);
 * 19-Jan-2019 : Added missing hashCode (TH);
 *
 */

package org.jfree.data;

import java.io.Serializable;
import java.util.Objects;
import org.jfree.chart.util.Args;

public class KeyedValuesItemKey implements ItemKey, Serializable {
    
    /** The key for the item. */
    Comparable<? extends Object> key;
    
    /**
     * Creates a new instance.
     * 
     * @param key  the key ({@code null} not permitted).
     */
    public KeyedValuesItemKey(Comparable<? extends Object> key) {
        Args.nullNotPermitted(key, "key");
        this.key = key;
    }
    
    /**
     * Returns the key.
     * 
     * @return The key (never {@code null}). 
     */
    public Comparable<?> getKey() {
        return this.key;
    }
    
    /**
     * Tests this instance for equality with an arbitrary object.
     * 
     * @param obj  the object ({@code null} not permitted).
     * 
     * @return A boolean.
     */
    @Override
    public boolean equals(Object obj) {
        if (obj == this) {
            return true;
        }
        if (!(obj instanceof KeyedValuesItemKey)) {
            return false;
        }
        KeyedValuesItemKey that = (KeyedValuesItemKey) obj;
        if (!this.key.equals(that.key)) {
            return false;
        }
        return true;
    }

    @Override
    public int hashCode(){
        int hash = 7;
        hash = 23 * hash + Objects.hashCode(this.key);
        return hash;
    }
    
    @Override
    public String toJSONString() {
        StringBuilder sb = new StringBuilder();
        sb.append("{\"key\": \"").append(this.key.toString()).append("\"}");
        return sb.toString();
    }

    @Override
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append("KeyedValuesItemKey[");
        sb.append(this.key.toString());
        sb.append("]");
        return sb.toString();
    }
}

@@ -213,10 +213,10 @@
 0-20
-16
+20
 , by
@@ -1443,148 +1443,23 @@
 :   
--;%0A *%0A * Changes:%0A * --------%0A * 18-Aug-2014 : Version 1, based on code from Orson Charts (DG);%0A * 19-Jan-2019 : Added missing hashCode (TH)
+Tracy Hiltbrand
 ;%0A *
@@ -1579,16 +1579,116 @@
 .Args;%0A%0A
+/**%0A * A reference to an item in a %7Blink KeyedValues%7D instance.%0A * %0A * @param %3CK%3E The key type.%0A */%0A
 public c
@@ -1710,16 +1710,41 @@
 sItemKey
+%3CK extends Comparable%3CK%3E%3E
  impleme
@@ -1756,16 +1756,25 @@
 temKey, 
+%0A        
 Serializ
@@ -1826,36 +1826,9 @@
     
-Comparable%3C? extends Object%3E
+K
  key
@@ -1980,36 +1980,9 @@
 Key(
-Comparable%3C? extends Object%3E
+K
  key
@@ -2172,21 +2172,9 @@
 lic 
-Comparable%3C?%3E
+K
  get

Add generics.