src/share/classes/sun/font/FontResolver.java

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2008, 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, 2014, 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
*** 31,40 ****
--- 31,41 ----
  package sun.font;
  
  import java.awt.Font;
  import java.awt.GraphicsEnvironment;
  import java.awt.font.TextAttribute;
+ import java.text.AttributedCharacterIterator;
  import java.util.ArrayList;
  import java.util.Map;
  import sun.text.CodePointIterator;
  
  /**
*** 220,230 ****
       * @param attributes a Map from which the size and style of the Font
       *        are determined.  The default size is 12 and the default style
       *        is Font.PLAIN
       * @see #getFontIndex
       */
!     public Font getFont(int index, Map attributes) {
          Font font = defaultFont;
  
          if (index >= 2) {
              font = allFonts[index-2];
          }
--- 221,232 ----
       * @param attributes a Map from which the size and style of the Font
       *        are determined.  The default size is 12 and the default style
       *        is Font.PLAIN
       * @see #getFontIndex
       */
!     public Font getFont(int index,
!                         Map<? extends AttributedCharacterIterator.Attribute, ?> attributes) {
          Font font = defaultFont;
  
          if (index >= 2) {
              font = allFonts[index-2];
          }