# HG changeset patch # User darcy # Date 1389374687 28800 # Node ID c9185e010e0381d747dda372f4e93598154f13c9 # Parent 8e5afc67dca8717982ad7e3a344f625ee3ba4515 8031082: Fix non-missing doclint problems in client libraries Reviewed-by: serb diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/Graphics2D.java --- a/jdk/src/share/classes/java/awt/Graphics2D.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/Graphics2D.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -44,7 +44,7 @@ * control over geometry, coordinate transformations, color management, * and text layout. This is the fundamental class for rendering * 2-dimensional shapes, text and images on the Java(tm) platform. - *
+ * *
Graphics2D
object are specified
* in a device-independent coordinate system called User Space, which is
@@ -229,7 +229,7 @@
*
* Graphics2D
rendering attributes are:
- * Paint
* Component
.
* Font
@@ -351,7 +351,7 @@
* fill(new Rectangle(x, y, w, h));
*
* is called.
- * + * *
drawLine
,
* drawRect
, drawRoundRect
,
@@ -363,7 +363,7 @@
* draw(new Rectangle(x, y, w, h));
*
* is called.
- * + * *
draw3DRect
and fill3DRect
methods were
* implemented in terms of the drawLine
and
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/MediaTracker.java
--- a/jdk/src/share/classes/java/awt/MediaTracker.java Thu Dec 05 15:49:53 2013 -0500
+++ b/jdk/src/share/classes/java/awt/MediaTracker.java Fri Jan 10 09:24:47 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -65,7 +65,7 @@
*
*
* Here is an example of using MediaTracker
:
- *
+ * *
{@code * import java.applet.Applet; * import java.awt.Color; diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/font/TextAttribute.java --- a/jdk/src/share/classes/java/awt/font/TextAttribute.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/font/TextAttribute.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -65,7 +65,7 @@ *- the valid values if there are limitations *
- a description of the effect. * - *
+ * *
Values
**
* *- The values of attributes must always be immutable. @@ -95,7 +95,6 @@ *
Summary of attributes
- **
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/ComponentPeer.java --- a/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/ComponentPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -457,8 +457,6 @@ * @param caps the buffer capabilities * * @throws AWTException if flip buffering is not supported - * - * @see Component.FlipBufferStrategy#createBuffers */ void createBuffers(int numBuffers, BufferCapabilities caps) throws AWTException; @@ -467,8 +465,6 @@ * Returns the back buffer as image. * * @return the back buffer as image - * - * @see Component.FlipBufferStrategy#getBackBuffer */ Image getBackBuffer(); @@ -480,15 +476,11 @@ * @param x2 the area to be flipped, lower right X coordinate * @param y2 the area to be flipped, lower right Y coordinate * @param flipAction the flip action to perform - * - * @see Component.FlipBufferStrategy#flip */ void flip(int x1, int y1, int x2, int y2, BufferCapabilities.FlipContents flipAction); /** * Destroys all created buffers. - * - * @see Component.FlipBufferStrategy#destroyBuffers */ void destroyBuffers(); diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/DialogPeer.java --- a/jdk/src/share/classes/java/awt/peer/DialogPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/DialogPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -64,7 +64,6 @@ * @param windows the windows to block * * @see Dialog#modalShow() - * @see Dialog#blockWindows() */ void blockWindows(java.util.List
windows); } diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java --- a/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -26,6 +26,7 @@ package java.awt.peer; import java.awt.Component; +import java.awt.KeyboardFocusManager; import java.awt.Window; /** @@ -71,7 +72,7 @@ /** * Clears the current global focus owner. * - * @param activeWindow + * @param activeWindow the active window * * @see KeyboardFocusManager#clearGlobalFocusOwner() */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java --- a/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -29,8 +29,8 @@ import java.awt.Point; /** - * Peer interface for {@link MouseInfo}. This is used to get some additional - * information about the mouse. + * Peer interface for {@link java.awt.MouseInfo}. This is used to get + * some additional information about the mouse. * * The peer interfaces are intended only for use in porting * the AWT. They are not intended for use by application diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/PanelPeer.java --- a/jdk/src/share/classes/java/awt/peer/PanelPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/PanelPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -25,7 +25,7 @@ package java.awt.peer; /** - * The peer interface for {@link Panel}. This is a subinterface of + * The peer interface for {@link java.awt.Panel}. This is a subinterface of * ContainerPeer and does not declare any additional methods because a Panel * is just that, a concrete Container. * diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/TextAreaPeer.java --- a/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1998, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -28,7 +28,7 @@ import java.awt.TextArea; /** - * The peer interface for {@link TexTArea}. + * The peer interface for {@link TextArea}. * * The peer interfaces are intended only for use in porting * the AWT. They are not intended for use by application diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/peer/WindowPeer.java --- a/jdk/src/share/classes/java/awt/peer/WindowPeer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/peer/WindowPeer.java Fri Jan 10 09:24:47 2014 -0800 @@ -57,7 +57,7 @@ * Sets if the window should always stay * on top of all other windows or not. * - * @see Window#getAlwaysOnTop() + * @see Window#isAlwaysOnTop() * @see Window#setAlwaysOnTop(boolean) */ void updateAlwaysOnTopState(); diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/print/Paper.java --- a/jdk/src/share/classes/java/awt/print/Paper.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/print/Paper.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -36,7 +36,6 @@ * are compatible. For example, if the paper size is changed from * 11 x 17 to 8.5 x 11, the application might need to reduce the * imageable area so that whatever is printed fits on the page. - * * @see #setSize(double, double) * @see #setImageableArea(double, double, double, double) */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/awt/print/Printable.java --- a/jdk/src/share/classes/java/awt/print/Printable.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/awt/print/Printable.java Fri Jan 10 09:24:47 2014 -0800 @@ -94,7 +94,6 @@ *
Pageable
then the client may provide different PageFormats * for each page index. Calculations of page breaks must account for this. * - ** @see java.awt.print.Pageable * @see java.awt.print.PageFormat * @see java.awt.print.PrinterJob diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/java/beans/XMLEncoder.java --- a/jdk/src/share/classes/java/beans/XMLEncoder.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/java/beans/XMLEncoder.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -150,7 +150,6 @@ * Although all object graphs may be written using just these three * tags, the following definitions are included so that common * data structures can be expressed more concisely: - *
*
*
- * The default method name is "new". diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/accessibility/AccessibleContext.java --- a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -39,7 +39,7 @@ * obtaining more specific accessibility information about a component. * If the component supports them, these methods will return an object that * implements one or more of the following interfaces: - *
+ *
*
- {@link AccessibleAction} - the object can perform one or more actions. * This interface provides the standard mechanism for an assistive * technology to determine what those actions are and tell the object diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/imageio/ImageWriter.java --- a/jdk/src/share/classes/javax/imageio/ImageWriter.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/imageio/ImageWriter.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -53,8 +53,6 @@ * which uses them for format recognition and presentation of * available format readers and writers. * - *
- * * @see ImageReader * @see ImageWriteParam * @see javax.imageio.spi.IIORegistry diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java --- a/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -54,7 +54,7 @@ * listed in the following * table: * - *
+ *
*
Compression Types ** Type String Description Image Types diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java --- a/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -446,7 +446,7 @@ * BI_RGB Uncompressed RLE {@literal <= } 8-bits/sample UTFDataFormatException
is thrown. Otherwise, the * group is converted to the character: * - *
+ *
* @@ -460,7 +460,7 @@ ** (char)(((a& 0x1F) << 6) | (b & 0x3F)) *
UTFDataFormatException
is thrown. Otherwise, the * group is converted to the character: * - *
+ *
* diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java --- a/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -379,7 +379,7 @@ ** (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F)) *
\u0001
through\u007f
, it is * represented by one byte: * - *+ ** (byte)c ** @@ -388,7 +388,7 @@ *\u07ff
, then it is represented by two bytes, * to be written in the order shown: * - *
+ *
@@ -397,7 +397,7 @@ ** (byte)(0xc0 | (0x1f & (c >> 6))) * (byte)(0x80 | (0x3f & c)) *
\u0800
throughuffff
, then it is * represented by three bytes, to be written in the order shown: * - *
+ *
* (byte)(0xe0 | (0x0f & (c >> 12))) * (byte)(0x80 | (0x3f & (c >> 6))) * (byte)(0x80 | (0x3f & c)) diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/Doc.java --- a/jdk/src/share/classes/javax/print/Doc.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/Doc.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -44,12 +44,12 @@ * in which the print data is available. A doc flavor designates the print * data format (a MIME type) and the representation class of the object * from which the print data comes. - *
+ * *
- * Obtain the print data representation object, which is an instance of the * doc flavor's representation class. The Print Job can then obtain the actual * print data from the representation object. - *
+ * *
- * Obtain the printing attributes that specify additional characteristics of * the doc or that specify processing instructions to be applied to the doc. @@ -104,7 +104,6 @@ * a stream does not mean that it will, with the implications that Doc * implementors which rely on the service to close them should create such * streams only in response to a request from the service. - *
*
*/ public interface Doc { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/DocFlavor.java --- a/jdk/src/share/classes/javax/print/DocFlavor.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/DocFlavor.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -49,7 +49,7 @@ * See * character encodings for more information on the character encodings * supported on the Java platform. - *+ * *
- * Representation class name. This specifies the fully-qualified name of * the class of the object from which the actual print data comes, as returned @@ -64,7 +64,7 @@ * also lets the
DocPrintJob
obtain an instance of the doc flavor's * representation class, from which theDocPrintJob
then obtains * the actual print data. - *+ * *
*Client Formatted Print Data
* There are two broad categories of print data, client formatted print data @@ -96,22 +96,22 @@ *- * Character array (
char[]
) -- The print data consists of the * Unicode characters in the array. - *+ * *
- *
String
-- * The print data consists of the Unicode characters in the string. - *+ * *
- * Character stream ({@link java.io.Reader java.io.Reader}) * -- The print data consists of the Unicode characters read from the stream * up to the end-of-stream. - *
+ * *
- * Byte array (
byte[]
) -- The print data consists of the bytes in * the array. The bytes are encoded in the character set specified by the doc * flavor's MIME type. If the MIME type does not specify a character set, the * default character set is US-ASCII. - *+ * *
- * Byte stream ({@link java.io.InputStream java.io.InputStream}) -- * The print data consists of the bytes read from the stream up to the @@ -139,7 +139,7 @@ * To print such documents, let the client open an input stream on the URL * or file and use an input stream data flavor. * - *
+ * *
*Default and Platform Encodings
*@@ -179,11 +179,9 @@ * understood by this VM. * For common flavors, the pre-defined *HOST DocFlavors may be used. *
- *
* See * character encodings for more information on the character encodings * supported on the Java platform. - *
*
*Recommended DocFlavors
*@@ -196,7 +194,6 @@ * constructor can be used to create an arbitrary doc flavor. *
*
- Preformatted text - *
*
*
* MIME-Type Description @@ -222,9 +219,9 @@ * In general, preformatted text print data is provided either in a character * oriented representation class (character array, String, Reader) or in a * byte oriented representation class (byte array, InputStream, URL). - *+ * *
- Preformatted page description language (PDL) documents - *
+ * *
*
* MIME-Type Description @@ -245,9 +242,9 @@ ** In general, preformatted PDL print data is provided in a byte oriented * representation class (byte array, InputStream, URL). - *
+ * *
- Preformatted images - *
+ * *
*
* MIME-Type Description @@ -269,9 +266,9 @@ ** In general, preformatted image print data is provided in a byte oriented * representation class (byte array, InputStream, URL). - *
+ * *
- Preformatted autosense print data - *
+ * *
*
* MIME-Type Description @@ -287,7 +284,7 @@ * autosense print data is provided in a byte oriented representation class * (byte array, InputStream, URL). * - *+ * *
*Service Formatted Print Data
*@@ -315,7 +312,7 @@ * {@link java.awt.image.renderable.RenderableImage RenderableImage}. The * printer calls methods * in that interface to obtain the image to be printed. - *
+ * *
- * Printable object -- The client supplies an object that implements interface * {@link java.awt.print.Printable Printable}. @@ -323,7 +320,7 @@ * printed, one by one. * For each page, the printer supplies a graphics context, and whatever the * client draws in that graphics context gets printed. - *
+ * *
- * Pageable object -- The client supplies an object that implements interface * {@link java.awt.print.Pageable Pageable}. The printer calls @@ -331,9 +328,9 @@ * For each page, the printer supplies a graphics context, and whatever * the client draws in that graphics context gets printed. * - *
+ * *
- *+ * *
*Pre-defined Doc Flavors
* A Java Print Service instance is not required to support the @@ -354,7 +351,7 @@ *("text/plain; charset=us-ascii", "java.io.InputStream")
*
· *("text/plain; charset=utf-8", "java.io.InputStream")
- *+ * *
- * Renderable image objects. Specifically, the following doc flavor is * recommended to be supported: @@ -389,7 +386,7 @@ *
* The client must itself perform all plain text print data formatting not * addressed by the above requirements. - *
+ * *
Design Rationale
** Class DocFlavor in package javax.print.data is similar to class @@ -403,13 +400,13 @@ *
- * The JPS API is designed to be used in Java profiles which do not support * AWT. - *
+ * *
- * The implementation of class
java.awt.datatransfer.DataFlavor
* does not guarantee that equivalent data flavors will have the same * serialized representation. DocFlavor does, and can be used in services * which need this. - *+ * *
- * The implementation of class
java.awt.datatransfer.DataFlavor
* includes a human presentable name as part of the serialized representation. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/MultiDoc.java --- a/jdk/src/share/classes/javax/print/MultiDoc.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/MultiDoc.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -67,7 +67,7 @@ * data from the print data representation object. Get the next multidoc from * the current multidoc, and repeat until there are no more. (The code example * above uses the interleaved pattern.) - *+ * *
- * The all-at-once pattern: Get the doc from the current multidoc, and * save the doc in a list. Get the next multidoc from the current multidoc, and diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/MultiDocPrintJob.java --- a/jdk/src/share/classes/javax/print/MultiDocPrintJob.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/MultiDocPrintJob.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -32,7 +32,6 @@ * Obtained from a MultiDocPrintService, a MultiDocPrintJob can print a * specified collection of documents as a single print job with a set of * job attributes. - *
*/ public interface MultiDocPrintJob extends DocPrintJob { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/ServiceUI.java --- a/jdk/src/share/classes/javax/print/ServiceUI.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/ServiceUI.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -52,7 +52,6 @@ *for a user as well as allowing the user to select the print service to use *and specify choices such as paper size and number of copies. *
- *
* The dialogs are designed to work with pluggable print services though the * public APIs of those print services. *
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java --- a/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -45,7 +45,7 @@ *
* This class is implemented by a service and located by the * implementation using the - * + * * SPI JAR File specification. *
* Applications locate instances of this class by calling the diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/AttributeSet.java --- a/jdk/src/share/classes/javax/print/attribute/AttributeSet.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/AttributeSet.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -69,17 +69,17 @@ * A {@link DocAttributeSet DocAttributeSet}, containing {@link DocAttribute * DocAttribute}s, specifies the characteristics of an individual doc and the * print job settings to be applied to an individual doc. - *
+ * *
- * A {@link PrintRequestAttributeSet PrintRequestAttributeSet}, containing * {@link PrintRequestAttribute PrintRequestAttribute}s, specifies the * settings * to be applied to a whole print job and to all the docs in the print job. - *
+ * *
- * A {@link PrintJobAttributeSet PrintJobAttributeSet}, containing {@link * PrintJobAttribute PrintJobAttribute}s, reports the status of a print job. - *
+ * *
- * A {@link PrintServiceAttributeSet PrintServiceAttributeSet}, containing * {@link PrintServiceAttribute PrintServiceAttribute}s, reports the status of @@ -103,7 +103,6 @@ * HashPrintRequestAttributeSet}, {@link HashPrintJobAttributeSet * HashPrintJobAttributeSet}, and {@link HashPrintServiceAttributeSet * HashPrintServiceAttributeSet}. - *
* * @author Alan Kaminsky */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java --- a/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,6 +1,5 @@ - /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -42,7 +41,7 @@ * The table below shows the effects of specifying a Chromaticity attribute of * {@link #MONOCHROME MONOCHROME} or {@link #COLOR COLOR} * for a monochrome or color document. - *
+ * *
*
** *@@ -79,9 +78,7 @@ * - *
* IPP Compatibility: Chromaticity is not an IPP attribute at present. - *
* * @author Alan Kaminsky */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/Copies.java --- a/jdk/src/share/classes/javax/print/attribute/standard/Copies.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Copies.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -44,17 +44,17 @@ *
- * SINGLE_DOCUMENT -- The result will be n copies of a single output * document comprising all the input docs. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- The result will be n copies of a single * output document comprising all the input docs, and the first impression of * each input doc will always start on a new media sheet. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The result will be n copies of * the first input document, followed by n copies of the second input * document, . . . followed by n copies of the last input document. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The result will be the first input * document, the second input document, . . . the last input document, the group @@ -64,7 +64,6 @@ * IPP Compatibility: The integer value gives the IPP integer value. The * category name returned by
getName()
gives the IPP attribute * name. - ** * @author David Mendenhall * @author Alan Kamihensky diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java --- a/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -46,7 +46,6 @@ * returns the IPP string representation of the attribute value. * See RFC 2911 Section 15.1 for * a fuller description of the IPP fidelity attribute. - *
* */ public final class Fidelity extends EnumSyntax diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/Finishings.java --- a/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -178,21 +178,21 @@ *
- * SINGLE_DOCUMENT -- All the input docs will be bound together as one output * document with the specified binding. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be bound together as one * output document with the specified binding, and the first impression of each * input doc will always start on a new media sheet. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each input doc will be bound * separately with the specified binding. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input doc will be bound separately * with the specified binding. * - *
+ * *
- * If different docs have different bindings specified, then only two values of * {@link MultipleDocumentHandling MultipleDocumentHandling} make sense, and the @@ -202,7 +202,7 @@ *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each input doc will be bound * separately with its own specified binding. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input doc will be bound separately * with its own specified binding. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java --- a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java Fri Jan 10 09:24:47 2014 -0800 @@ -65,7 +65,7 @@ * The size of a doc is computed based on the print data representation class as * specified by the doc's {@link javax.print.DocFlavor DocFlavor}, as * shown in the table below. - *
+ * *
*
* Representation Class diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/JobState.java --- a/jdk/src/share/classes/javax/print/attribute/standard/JobState.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/JobState.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -76,12 +76,12 @@ *- * The job is using, or is attempting to use, one or more purely software * processes that are analyzing, creating, or interpreting a PDL, etc. - *
+ * *
- * The job is using, or is attempting to use, one or more hardware * devices that are interpreting a PDL, making marks on a medium, and/or * performing finishing, such as stapling, etc. - *
+ * *
- * The printer has made the job ready for printing, but the output * device is not yet printing it, either because the job hasn't reached the diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/MediaName.java --- a/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -40,7 +40,6 @@ *
* IPP Compatibility: MediaName is a representation class for * values of the IPP "media" attribute which names media. - *
* */ public class MediaName extends Media implements Attribute { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java --- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -288,7 +288,6 @@ /** * Class MediaSize.ISO includes {@link MediaSize MediaSize} values for ISO * media. - *
*/ public final static class ISO { /** diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java --- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -41,7 +41,6 @@ * values of the IPP "media" attribute which names media sizes. * The names of the media sizes correspond to those in the IPP 1.1 RFC * RFC 2911 - *
* */ public class MediaSizeName extends Media { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java --- a/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -42,8 +42,6 @@ *
* IPP Compatibility: MediaTray is a representation class for * values of the IPP "media" attribute which name paper trays. - *
- * */ public class MediaTray extends Media implements Attribute { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java --- a/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -51,7 +51,7 @@ * single output document to produce. The MultipleDocumentHandling values * SINGLE_DOCUMENT and SINGLE_DOCUMENT_NEW_SHEET specify two variations of * this possibility. - *
+ * *
- * The multiple input documents remain separate output documents. Finishing * operations ({@link Finishings Finishings}), @@ -83,7 +83,7 @@ * sheets resulting from processing the document data must be *
a(*),b(*),a(*),b(*),...
, and the printer object must force * each copy (a(*),b(*)
) to start on a new media sheet. - *+ * *
- * {@link #SEPARATE_DOCUMENTS_UNCOLLATED_COPIES * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES}. If a print job @@ -96,7 +96,7 @@ * If more than one copy is made, the ordering of the sets of media sheets * resulting from processing the document data must be *
a(*),a(*),...,b(*),b(*)...
. - *+ * *
- * {@link #SEPARATE_DOCUMENTS_COLLATED_COPIES * SEPARATE_DOCUMENTS_COLLATED_COPIES}. If a print job @@ -109,7 +109,7 @@ * If more than one copy is made, the ordering of the sets of media sheets * resulting from processing the document data must be *
a(*),b(*),a(*),b(*),...
. - *+ * *
- * {@link #SINGLE_DOCUMENT_NEW_SHEET * SINGLE_DOCUMENT_NEW_SHEET}. Same as SINGLE_DOCUMENT, @@ -132,12 +132,12 @@ *
- * With SINGLE_DOCUMENT, documents
a
andb
are * stapled together as a single document with no regard to new sheets. - *+ * *
- * With SINGLE_DOCUMENT_NEW_SHEET, documents
a
andb
* are stapled together as a single document, but documentb
* starts on a new sheet. - *+ * *
- * With SEPARATE_DOCUMENTS_UNCOLLATED_COPIES and * SEPARATE_DOCUMENTS_COLLATED_COPIES, documents
a
and diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java --- a/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -56,7 +56,7 @@ * SINGLE_DOCUMENT -- All the input docs will be combined together into one * output document. Each media impression will consist of nm * print-stream pages from the output document. - *+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together * into one output document. Each media impression will consist of n @@ -64,7 +64,7 @@ * each input doc will always start on a new media sheet; this means the last * impression of an input doc may have fewer than n print-stream pages * on it. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate. * Each media impression will consist of n print-stream pages from the @@ -72,7 +72,7 @@ * input doc will always start on a new media sheet; this means the last * impression of an input doc may have fewer than n print-stream pages on * it. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate. * Each media impression will consist of n print-stream pages from the @@ -91,7 +91,7 @@ * the first print-stream page of the next input doc goes at the start of the * next media impression, possibly leaving fewer than the full number of * print-stream pages on the previous media impression. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together * into one output document. Each media impression will consist of n @@ -99,7 +99,7 @@ * each input doc will always start on a new media sheet; this means the last * impression of an input doc may have fewer than n print-stream pages * on it. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate. * For input doc i, each media impression will consist of @@ -107,7 +107,7 @@ * docs are separate, the first impression of each input doc will always start * on a new media sheet; this means the last impression of an input doc may have * fewer than ni print-stream pages on it. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate. * For input doc i, each media impression will consist of @@ -120,7 +120,6 @@ * IPP Compatibility: The integer value gives the IPP integer value. * The category name returned by
getName()
gives the IPP * attribute name. - ** * @author Alan Kaminsky */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java --- a/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -68,17 +68,17 @@ * SINGLE_DOCUMENT -- All the input docs will be combined together into one * output document. The specified page ranges of that output document will be * printed. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together * into one output document, and the first impression of each input doc will * always start on a new media sheet. The specified page ranges of that output * document will be printed. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- For each separate input doc, the * specified page ranges will be printed. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- For each separate input doc, the * specified page ranges will be printed. @@ -87,7 +87,7 @@ *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- For each separate input doc, its own * specified page ranges will be printed.. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- For each separate input doc, its own * specified page ranges will be printed.. @@ -100,7 +100,6 @@ * javax.print.attribute.SetOfIntegerSyntax SetOfIntegerSyntax} for an * explanation of canonical array form. The category name returned by *
getName()
gives the IPP attribute name. - ** * @author David Mendenhall * @author Alan Kaminsky diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java --- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -45,7 +45,6 @@ * to find out more information about this specific printer rather than this * general kind of printer. *
- *
* IPP Compatibility: The string form returned by *
toString()
gives the IPP uri value. * The category name returned bygetName()
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java --- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -44,7 +44,7 @@ * an instance of class PrinterResolution indicating the exact resolution the * client wants. Only printers supporting that exact resolution will match the * search. - *+ * *
- * When a client needs to print a job using the client's desired resolution * exactly (no more, no less), the client specifies an instance of class @@ -60,7 +60,6 @@ * In some cases this may be more simply achieved by specifying a * PrintQuality attribute which often controls resolution. *
- *
* IPP Compatibility: The information needed to construct an IPP *
"printer-resolution"
attribute can be obtained by calling * methods on the PrinterResolution object. The category name returned by diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java --- a/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -77,7 +77,7 @@ * combined into one output document. Multiple copies of the output document * will be produced with pages in collated order, i.e. pages 1, 2, 3, . . ., * 1, 2, 3, . . . - *+ * *
- * SheetCollate = COLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SINGLE_DOCUMENT_NEW_SHEET -- All the input docs @@ -85,7 +85,7 @@ * input doc will always start on a new media sheet. Multiple copies of the * output document will be produced with pages in collated order, i.e. pages * 1, 2, 3, . . ., 1, 2, 3, . . . - *
+ * *
- * SheetCollate = COLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each @@ -94,7 +94,7 @@ * pages in collated order, but the documents themselves in uncollated order, * i.e. pages A1, A2, A3, . . ., A1, A2, A3, . . ., B1, B2, B3, . . ., B1, B2, * B3, . . . - *
+ * *
- * SheetCollate = COLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_COLLATED_COPIES -- Each input @@ -103,14 +103,14 @@ * in collated order, with the documents themselves also in collated order, i.e. * pages A1, A2, A3, . . ., B1, B2, B3, . . ., A1, A2, A3, . . ., B1, B2, B3, * . . . - *
+ * *
- * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SINGLE_DOCUMENT -- All the input docs will be * combined into one output document. Multiple copies of the output document * will be produced with pages in uncollated order, i.e. pages 1, 1, . . ., * 2, 2, . . ., 3, 3, . . . - *
+ * *
- * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SINGLE_DOCUMENT_NEW_SHEET -- All the input docs @@ -118,7 +118,7 @@ * input doc will always start on a new media sheet. Multiple copies of the * output document will be produced with pages in uncollated order, i.e. pages * 1, 1, . . ., 2, 2, . . ., 3, 3, . . . - *
+ * *
- * SheetCollate = UNCOLLATED, {@link MultipleDocumentHandling * MultipleDocumentHandling} = SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- Each @@ -128,7 +128,7 @@ * order, i.e. pages A1, A1, . . ., A2, A2, . . ., A3, A3, . . ., B1, B1, . . ., * B2, B2, . . ., B3, B3, . . . * - *
+ * *
- * If different docs have different sheet collations specified, then only one * value of {@link MultipleDocumentHandling MultipleDocumentHandling} is diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/print/attribute/standard/Sides.java --- a/jdk/src/share/classes/javax/print/attribute/standard/Sides.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/print/attribute/standard/Sides.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -51,21 +51,21 @@ * SINGLE_DOCUMENT -- All the input docs will be combined together into one * output document. Each media sheet will consist of n impressions from * the output document. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together * into one output document. Each media sheet will consist of n * impressions from the output document. However, the first impression of each * input doc will always start on a new media sheet; this means the last media * sheet of an input doc may have only one impression on it. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate. * Each media sheet will consist of n impressions from the input doc. * Since the input docs are separate, the first impression of each input doc * will always start on a new media sheet; this means the last media sheet of * an input doc may have only one impression on it. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate. * Each media sheet will consist of n impressions from the input doc. @@ -73,7 +73,7 @@ * will always start on a new media sheet; this means the last media sheet of * an input doc may have only one impression on it. * - *
+ * *
*
- * SINGLE_DOCUMENT -- All the input docs will be combined together into one @@ -83,14 +83,14 @@ * input doc has a different sides value from the previous input doc, the first * print-stream page of the next input doc goes at the start of the next media * sheet, possibly leaving only one impression on the previous media sheet. - *
+ * *
- * SINGLE_DOCUMENT_NEW_SHEET -- All the input docs will be combined together * into one output document. Each media sheet will consist of n * impressions from the output document. However, the first impression of each * input doc will always start on a new media sheet; this means the last * impression of an input doc may have only one impression on it. - *
+ * *
- * SEPARATE_DOCUMENTS_UNCOLLATED_COPIES -- The input docs will remain separate. * For input doc i, each media sheet will consist of ni @@ -98,7 +98,7 @@ * impression of each input doc will always start on a new media sheet; this * means the last media sheet of an input doc may have only one impression on * it. - *
+ * *
- * SEPARATE_DOCUMENTS_COLLATED_COPIES -- The input docs will remain separate. * For input doc i, each media sheet will consist of ni @@ -113,7 +113,6 @@ *
getName()
is the IPP attribute name. The enumeration's * integer value is the IPP enum value. ThetoString()
method * returns the IPP string representation of the attribute value. - ** * @author Alan Kaminsky */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java --- a/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -193,7 +193,6 @@ * @see #read(byte[], int, int) * @see #read(byte[]) * @see #available - *
*/ public int read() throws IOException { if( frameSize != 1 ) { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/sound/sampled/AudioPermission.java --- a/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -40,7 +40,7 @@ * The following table lists the possible
AudioPermission
target names. * For each name, the table provides a description of exactly what that permission * allows, as well as a discussion of the risks of granting code the permission. - *+ * * *
*
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/sound/sampled/ReverbType.java --- a/jdk/src/share/classes/javax/sound/sampled/ReverbType.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/sound/sampled/ReverbType.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -77,7 +77,7 @@ * * * Reverberation Types and Parameters - *
+ * *
* *
diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java --- a/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java Fri Jan 10 09:24:47 2014 -0800 @@ -115,7 +115,7 @@ /** * Returns the index-position of the specified object in the list. * - * @param anObject + * @param anObject the object to return the index of * @return an int representing the index position, where 0 is * the first position */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JComboBox.java --- a/jdk/src/share/classes/javax/swing/JComboBox.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JComboBox.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -675,7 +675,7 @@ * the model and its preferred size obtained, which can be * relatively expensive. * - * @param prototypeDisplayValue + * @param prototypeDisplayValue the prototype display value * @see #getPrototypeDisplayValue * @since 1.4 * @beaninfo diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JEditorPane.java --- a/jdk/src/share/classes/javax/swing/JEditorPane.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JEditorPane.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -160,9 +160,9 @@ * the character set specified in the ChangedCharSetException
* (which is anIOException
). * - *+ * *
- *
- Newlines + *
- Newlines *
- * For a discussion on how newlines are handled, see * DefaultEditorKit. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JLabel.java --- a/jdk/src/share/classes/javax/swing/JLabel.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JLabel.java Fri Jan 10 09:24:47 2014 -0800 @@ -855,7 +855,6 @@ *
RIGHT
, *LEADING
, or *TRAILING
(the default). - * @exception IllegalArgumentException * * @see SwingConstants * @beaninfo diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JLayeredPane.java --- a/jdk/src/share/classes/javax/swing/JLayeredPane.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JLayeredPane.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -58,20 +58,20 @@ * layers makes it easy to ensure that components overlap properly, * without having to worry about specifying numbers for specific depths: *- *
- DEFAULT_LAYER
+ *- DEFAULT_LAYER
*- The standard layer, where most components go. This the bottommost * layer. - *
- PALETTE_LAYER
+ *- PALETTE_LAYER
*- The palette layer sits over the default layer. Useful for floating * toolbars and palettes, so they can be positioned above other components. - *
- MODAL_LAYER
+ *- MODAL_LAYER
*- The layer used for modal dialogs. They will appear on top of any * toolbars, palettes, or standard components in the container. - *
- POPUP_LAYER
+ *- POPUP_LAYER
*- The popup layer displays above dialogs. That way, the popup windows * associated with combo boxes, tooltips, and other help text will appear * above the component, palette, or dialog that generated them. - *
- DRAG_LAYER
+ *- DRAG_LAYER
*- When dragging a component, reassigning it to the drag layer ensures * that it is positioned over every other component in the container. When * finished dragging, it can be reassigned to its normal layer. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JOptionPane.java --- a/jdk/src/share/classes/javax/swing/JOptionPane.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JOptionPane.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -131,7 +131,7 @@ * Parameters:
* The parameters to these methods follow consistent patterns: *- *+ *
*
- parentComponent
- * Defines the
Component
that is to be the parent of this * dialog box. @@ -149,7 +149,7 @@ *String
constant. * However, the type of this parameter is actuallyObject
. Its * interpretation depends on its type: - *+ *
*
- Object[]
- An array of objects is interpreted as a series of * messages (one per object) arranged in a vertical stack. * The interpretation is recursive -- each object in the @@ -187,7 +187,7 @@ *
String
s. But * the parameter type is an array ofObjects
. * A button is created for each object depending on its type: - *+ *
*
- Component
- The component is added to the button row directly. *
- Icon
- A
JButton
is created with this as its label. *- other
- The
Object
is converted to a string using its diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JTextArea.java --- a/jdk/src/share/classes/javax/swing/JTextArea.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JTextArea.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -95,7 +95,7 @@ * * *- *
- Newlines + *
- Newlines *
- * For a discussion on how newlines are handled, see * DefaultEditorKit. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/JTextPane.java --- a/jdk/src/share/classes/javax/swing/JTextPane.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/JTextPane.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -51,7 +51,7 @@ * be embedded in the flow of text. * *
- *
- Newlines + *
- Newlines *
- * For a discussion on how newlines are handled, see * DefaultEditorKit. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/plaf/TextUI.java --- a/jdk/src/share/classes/javax/swing/plaf/TextUI.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/plaf/TextUI.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -105,7 +105,7 @@ * @param biasRet an array to contain the bias for the returned position * @return the location within the model that best represents the next * location visual position - * @exception BadLocationException + * @exception BadLocationException for a bad location within a document model * @exception IllegalArgumentException for an invalid direction */ public abstract int getNextVisualPositionFrom(JTextComponent t, diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -1199,7 +1199,7 @@ * can be traversed to determine how the model is being * represented spatially. *
- * NOTE:The View hierarchy can + * NOTE:The View hierarchy can * be traversed from the root view, and other things * can be done as well. Things done in this way cannot * be protected like simple method calls through the TextUI. diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java --- a/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java Fri Jan 10 09:24:47 2014 -0800 @@ -356,12 +356,12 @@ * end points are equal. In such a case, the end y point is slightly * increased to avoid the overlap. * - * @param x1 - * @param y1 - * @param x2 - * @param y2 - * @param midpoints - * @param colors + * @param x1 x1 + * @param y1 y1 + * @param x2 x2 + * @param y2 y2 + * @param midpoints the midpoints + * @param colors the colors * @return a valid LinearGradientPaint. This method never returns null. * @throws NullPointerException * if {@code midpoints} array is null, @@ -387,11 +387,11 @@ * is non-positive. In such a case, the radius is just slightly * increased to avoid 0. * - * @param x - * @param y - * @param r - * @param midpoints - * @param colors + * @param x x-coordinate + * @param y y-coordinate + * @param r radius + * @param midpoints the midpoints + * @param colors the colors * @return a valid RadialGradientPaint. This method never returns null. * @throws NullPointerException * if {@code midpoints} array is null, diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java --- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -645,7 +645,7 @@ * passed to the NimbusStyle constructor. In either case, it looks for * "background".
* - * @param ctx + * @param ctx SynthContext identifying requester * @param key must not be null */ @Override public Object get(SynthContext ctx, Object key) { diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/CompositeView.java --- a/jdk/src/share/classes/javax/swing/text/CompositeView.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/CompositeView.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -713,7 +713,7 @@ * @param biasRet an array containing the bias that was checked * @return the location within the model that best represents the next * north or south location - * @exception BadLocationException + * @exception BadLocationException for a bad location within a document model * @exception IllegalArgumentException ifdirection
is invalid * @see #getNextVisualPositionFrom * @@ -745,7 +745,7 @@ * @param biasRet an array containing the bias that was checked * @return the location within the model that best represents the next * west or east location - * @exception BadLocationException + * @exception BadLocationException for a bad location within a document model * @exception IllegalArgumentException ifdirection
is invalid * @see #getNextVisualPositionFrom */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java --- a/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -43,7 +43,7 @@ * provides a minimal set of actions for a simple editor. * *- *
- Newlines + *
- Newlines *
- * There are two properties which deal with newlines. The * system property,
line.separator
, is defined to be diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/Document.java --- a/jdk/src/share/classes/javax/swing/text/Document.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/Document.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -33,7 +33,7 @@ * interface is to scale from very simple needs (a plain text textfield) * to complex needs (an HTML or XML document, for example). * - *Content + *
Content *
* At the simplest level, text can be * modeled as a linear sequence of characters. To support @@ -62,7 +62,7 @@ *
- {@link #getText(int, int)} *
- {@link #getText(int, int, javax.swing.text.Segment)} * - *
Structure + *
Structure *
* Text is rarely represented simply as featureless content. Rather, * text typically has some sort of structure associated with it. @@ -83,7 +83,7 @@ *
- {@link #getRootElements()} * * - *
Mutations + *
Mutations *
* All documents need to be able to add and remove simple text. * Typically, text is inserted and removed via gestures from @@ -98,7 +98,7 @@ *
- {@link #createPosition(int)} * * - *
Notification + *
Notification *
* Mutations to the
Document
must be communicated to * interested observers. The notification of change follows the event model @@ -152,7 +152,7 @@ *- removeUndoableEditListener(UndoableEditListener) * * - *
Properties + *
Properties *
* Document implementations will generally have some set of properties * associated with them at runtime. Two well known properties are the diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/GlyphView.java --- a/jdk/src/share/classes/javax/swing/text/GlyphView.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java Fri Jan 10 09:24:47 2014 -0800 @@ -1250,7 +1250,7 @@ * is returned as the zero-th element of this array * @return the location within the model that best represents the next * location visual position. - * @exception BadLocationException + * @exception BadLocationException for a bad location within a document model * @exception IllegalArgumentException for an invalid direction */ public int getNextVisualPositionFrom(GlyphView v, int pos, Position.Bias b, Shape a, diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/JTextComponent.java --- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -88,7 +88,7 @@ * a section in The Java Tutorial. * *
- *
- Caret Changes + *
- Caret Changes *
- * The caret is a pluggable object in swing text components. * Notification of changes to the caret position and the selection @@ -107,7 +107,7 @@ * Note: Non-editable text components also have a caret though * it may not be painted. * - *
- Commands + *
- Commands *
- * Text components provide a number of commands that can be used * to manipulate the component. This is essentially the way that @@ -118,7 +118,7 @@ * found with the {@link #getActions} method. These actions * can be bound to key events, fired from buttons, etc. * - *
- Text Input + *
- Text Input *
- * The text components support flexible and internationalized text input, using * keymaps and the input method framework, while maintaining compatibility with @@ -203,7 +203,7 @@ *
- caret movement forward and backward * * - *
- Model/View Split + *
- Model/View Split *
- * The text components have a model-view split. A text component pulls * together the objects used to represent the model, view, and controller. @@ -227,13 +227,13 @@ * {@link DocumentListener} * interface and registered interest with the model being observed. * - *
- Location Information + *
- Location Information *
- * The capability of determining the location of text in * the view is provided. There are two methods, {@link #modelToView} * and {@link #viewToModel} for determining this information. * - *
- Undo/Redo support + *
- Undo/Redo support *
- * Support for an edit history mechanism is provided to allow * undo/redo operations. The text component does not itself @@ -243,7 +243,7 @@ * The support is provided by the Document model, which allows * one to attach UndoableEditListener implementations. * - *
- Thread Safety + *
- Thread Safety *
- * The swing text components provide some support of thread * safe operations. Because of the high level of configurability @@ -254,13 +254,13 @@ * The methods that are safe to call asynchronously are marked * with comments. * - *
- Newlines + *
- Newlines *
- * For a discussion on how newlines are handled, see * DefaultEditorKit. * * - *
- Printing support + *
- Printing support *
- * Several {@link #print print} methods are provided for basic * document printing. If more advanced printing is needed, use the diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/NavigationFilter.java --- a/jdk/src/share/classes/javax/swing/text/NavigationFilter.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/NavigationFilter.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -100,7 +100,7 @@ * @param biasRet Used to return resulting Bias of next position * @return the location within the model that best represents the next * location visual position - * @exception BadLocationException + * @exception BadLocationException for a bad location within a document model * @exception IllegalArgumentException if
direction
* doesn't have one of the legal values above */ diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java --- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -183,7 +183,7 @@ *The following table shows the example document and the results * of various methods described above.
* - *+ *
*
* Example *@@ -994,16 +994,16 @@ * * insertAfterStart
Invoking
+ * style="color: red;">in red). * *setInnerHTML(elem, "<ul><li>")
* results in the following structure (new elements are in red).* <body> * | * <div> * \ - * <ul> + * <ul> * \ - * <li> + * <li> ** *Parameter
elem
must not be a leaf element, @@ -1075,14 +1075,14 @@ * *Invoking
+ * style="color: red;">in red). * *setOuterHTML(elem, "<ul><li>")
* results in the following structure (new elements are in red).* <body> * | - * <ul> + * <ul> * \ - * <li> + * <li> ** *If either
elem
orhtmlText
@@ -1145,16 +1145,16 @@ * *Invoking
+ * (new elements are in red). * *insertAfterStart(elem, * "<ul><li>")
results in the following structure - * (new elements are in red).* <body> * | * <div> * / | \ - * <ul> <p> <p> + * <ul> <p> <p> * / - * <li> + * <li> ** *Unlike the
insertBeforeStart
method, new @@ -1215,16 +1215,16 @@ * *Invoking
+ * style="color: red;">in red). * *insertBeforeEnd(elem, "<ul><li>")
* results in the following structure (new elements are in red).* <body> * | * <div> * / | \ - * <p> <p> <ul> + * <p> <p> <ul> * \ - * <li> + * <li> ** *Unlike the
insertAfterEnd
method, new elements @@ -1282,14 +1282,14 @@ * *Invoking
+ * (new elements are in red). * *insertBeforeStart(elem, * "<ul><li>")
results in the following structure - * (new elements are in red).* <body> * / \ - * <ul> <div> + * <ul> <div> * / / \ - * <li> <p> <p> + * <li> <p> <p> ** *Unlike the
insertAfterStart
method, new @@ -1340,14 +1340,14 @@ * *Invoking
+ * style="color: red;">in red). * *insertAfterEnd(elem, "<ul><li>")
* results in the following structure (new elements are in red).* <body> * / \ - * <div> <ul> + * <div> <ul> * / \ \ - * <p> <p> <li> + * <p> <p> <li> ** *Unlike the
insertBeforeEnd
method, new elements diff -r 8e5afc67dca8 -r c9185e010e03 jdk/src/share/classes/javax/swing/text/html/StyleSheet.java --- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Thu Dec 05 15:49:53 2013 -0500 +++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Fri Jan 10 09:24:47 2014 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -117,10 +117,10 @@ * support are pseudo selectors, such asA:link { color: red }
, * and theimportant
modifier. *- * Note: This implementation is currently + * @implNote This implementation is currently * incomplete. It can be replaced with alternative implementations * that are complete. Future versions of this class will provide - * better CSS support. + * better CSS support. * * @author Timothy Prinzing * @author Sunita Mani