src/share/classes/com/sun/tools/javac/util/Pair.java

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 23,32 ****
--- 23,34 ----
   * questions.
   */
  
  package com.sun.tools.javac.util;
  
+ import java.util.Objects;
+ 
  /** A generic class for pairs.
   *
   *  <p><b>This is NOT part of any supported API.
   *  If you write code that depends on this, you do so at your own risk.
   *  This code and its internal interfaces are subject to change or
*** 44,62 ****
  
      public String toString() {
          return "Pair[" + fst + "," + snd + "]";
      }
  
-     private static boolean equals(Object x, Object y) {
-         return (x == null && y == null) || (x != null && x.equals(y));
-     }
- 
      public boolean equals(Object other) {
          return
              other instanceof Pair<?,?> &&
!             equals(fst, ((Pair<?,?>)other).fst) &&
!             equals(snd, ((Pair<?,?>)other).snd);
      }
  
      public int hashCode() {
          if (fst == null) return (snd == null) ? 0 : snd.hashCode() + 1;
          else if (snd == null) return fst.hashCode() + 2;
--- 46,60 ----
  
      public String toString() {
          return "Pair[" + fst + "," + snd + "]";
      }
  
      public boolean equals(Object other) {
          return
              other instanceof Pair<?,?> &&
!             Objects.equals(fst, ((Pair<?,?>)other).fst) &&
!             Objects.equals(snd, ((Pair<?,?>)other).snd);
      }
  
      public int hashCode() {
          if (fst == null) return (snd == null) ? 0 : snd.hashCode() + 1;
          else if (snd == null) return fst.hashCode() + 2;