--- a/jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -31,27 +31,8 @@
 import java.awt.HeadlessException;
 import java.awt.image.BufferedImage;
 import java.awt.Font;
-import java.text.AttributedCharacterIterator;
-import java.awt.print.PrinterJob;
-import java.util.Map;
-import java.util.Hashtable;
 import java.util.Locale;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.io.IOException;
-import java.io.FilenameFilter;
-import java.io.File;
-import java.util.NoSuchElementException;
 import sun.awt.FontConfiguration;
-import java.util.TreeMap;
-import java.util.Set;
-import java.awt.font.TextAttribute;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.Properties;
 import java.awt.Point;
 import java.awt.Rectangle;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -27,7 +27,6 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.ComponentColorModel;
 import java.awt.image.ComponentSampleModel;
-import java.awt.image.DataBuffer;
 import java.awt.image.ColorModel;
 import java.awt.image.Raster;
 import java.awt.image.SampleModel;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -36,19 +36,14 @@
 package sun.java2d.cmm.lcms;
 
 import java.awt.color.ICC_Profile;
-import java.awt.color.ProfileDataException;
 import java.awt.color.CMMException;
 import java.awt.color.ColorSpace;
 import java.awt.image.BufferedImage;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.ComponentColorModel;
 import java.awt.image.SampleModel;
 import java.awt.image.DataBuffer;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.awt.image.ComponentSampleModel;
 import sun.java2d.cmm.*;
 import sun.java2d.cmm.lcms.*;
 import static sun.java2d.cmm.lcms.LCMSImageLayout.ImageLayoutException;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/CompositeType.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -25,7 +25,6 @@
 
 package sun.java2d.loops;
 
-import java.awt.image.BufferedImage;
 import java.awt.AlphaComposite;
 import java.util.HashMap;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListLCD.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -26,7 +26,6 @@
 package sun.java2d.loops;
 
 import sun.java2d.loops.GraphicsPrimitive;
-import sun.java2d.pipe.Region;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import sun.font.GlyphList;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawLine.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -30,9 +30,6 @@
 package sun.java2d.loops;
 
 import sun.java2d.loops.GraphicsPrimitive;
-import java.awt.Color;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/DrawRect.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -30,9 +30,6 @@
 package sun.java2d.loops;
 
 import sun.java2d.loops.GraphicsPrimitive;
-import java.awt.Color;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillRect.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -30,9 +30,6 @@
 package sun.java2d.loops;
 
 import sun.java2d.loops.GraphicsPrimitive;
-import java.awt.Color;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FillSpans.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -32,9 +32,6 @@
 
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.pipe.SpanIterator;
-import java.awt.Color;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/FontInfo.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -26,11 +26,9 @@
 package sun.java2d.loops;
 
 import java.awt.Font;
-import java.awt.geom.AffineTransform;
 
 import sun.font.Font2D;
 import sun.font.FontStrike;
-import sun.font.FontStrikeDesc;
 
 /*
  * A FontInfo object holds all calculated or derived data needed

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -33,8 +33,6 @@
 import java.awt.image.DataBuffer;
 import java.awt.image.ColorModel;
 import java.awt.geom.Path2D;
-import java.awt.geom.PathIterator;
-import java.awt.geom.AffineTransform;
 import sun.java2d.pipe.Region;
 import sun.java2d.pipe.SpanIterator;
 import sun.java2d.SunGraphics2D;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -25,13 +25,8 @@
 
 package sun.java2d.loops;
 
-import java.awt.Paint;
-import java.awt.PaintContext;
 import java.awt.Composite;
-import java.awt.Rectangle;
-import java.awt.image.ColorModel;
 import java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
 import sun.awt.image.BufImgSurfaceData;
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SunGraphics2D;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/ScaledBlit.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -26,7 +26,6 @@
 package sun.java2d.loops;
 
 import java.awt.Composite;
-import java.lang.ref.WeakReference;
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.SurfaceData;
 import sun.java2d.pipe.Region;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/SurfaceType.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -25,7 +25,6 @@
 
 package sun.java2d.loops;
 
-import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import sun.awt.image.PixelConverter;
 import java.util.HashMap;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformBlit.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -27,7 +27,6 @@
 
 import java.awt.Composite;
 import java.awt.geom.AffineTransform;
-import java.lang.ref.WeakReference;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.pipe.Region;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, 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
@@ -27,7 +27,6 @@
 
 import java.awt.Composite;
 import java.awt.geom.AffineTransform;
-import java.lang.ref.WeakReference;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.GraphicsPrimitive;
 import sun.java2d.pipe.Region;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/AATextRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -25,7 +25,6 @@
 
 package sun.java2d.pipe;
 
-import java.awt.font.GlyphVector;
 import sun.java2d.SunGraphics2D;
 import sun.font.GlyphList;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -25,7 +25,6 @@
 
 package sun.java2d.pipe;
 
-import java.awt.font.GlyphVector;
 import sun.awt.SunHints;
 import sun.java2d.SunGraphics2D;
 import sun.font.GlyphList;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -25,14 +25,10 @@
 
 package sun.java2d.pipe;
 
-import java.awt.Font;
-import java.awt.Rectangle;
-import java.awt.Shape;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.font.TextLayout;
 
-import sun.awt.SunHints;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import sun.font.GlyphList;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -25,22 +25,16 @@
 
 package sun.java2d.pipe;
 
-import java.awt.Font;
 import java.awt.Shape;
 import java.awt.BasicStroke;
-import java.awt.Polygon;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.PathIterator;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Arc2D;
-import java.awt.geom.IllegalPathStateException;
 import java.awt.geom.Path2D;
-import java.awt.font.GlyphVector;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
-import sun.java2d.loops.FontInfo;
-import sun.java2d.loops.DrawPolygons;
 import sun.java2d.loops.FillParallelogram;
 import sun.java2d.loops.DrawParallelogram;
 import sun.awt.SunHints;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -29,7 +29,6 @@
 import java.awt.font.GlyphVector;
 import java.awt.font.TextLayout;
 import sun.java2d.SunGraphics2D;
-import sun.font.GlyphList;
 import sun.awt.SunHints;
 
 import java.awt.Shape;

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -25,8 +25,6 @@
 
 package sun.java2d.pipe;
 
-import java.awt.geom.PathIterator;
-import java.awt.Rectangle;
 
 /**
  * This class clips a SpanIterator to a Region and outputs the

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -25,7 +25,6 @@
 
 package sun.java2d.pipe;
 
-import java.awt.Rectangle;
 
 /**
  * This class defines the API for iterating through the bands

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SolidTextRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -25,8 +25,6 @@
 
 package sun.java2d.pipe;
 
-import java.awt.font.GlyphVector;
-import sun.awt.SunHints;
 import sun.java2d.SunGraphics2D;
 import sun.font.GlyphList;
 

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -27,7 +27,6 @@
 
 import java.awt.Rectangle;
 import java.awt.Shape;
-import java.awt.geom.PathIterator;
 import sun.java2d.SunGraphics2D;
 
 /**

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -31,7 +31,6 @@
 
 import sun.java2d.SunGraphics2D;
 import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
 
 /**
  * This interface defines the set of calls that pipeline objects

--- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java	Thu May 19 16:32:38 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java	Thu May 19 16:34:36 2016 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -27,10 +27,7 @@
 
 import java.awt.Rectangle;
 import java.awt.Shape;
-import java.awt.Font;
-import java.awt.font.GlyphVector;
 import sun.java2d.SunGraphics2D;
-import sun.java2d.loops.FontInfo;
 import sun.font.GlyphList;
 
 /*