diff --git a/src/java.desktop/share/classes/java/awt/BorderLayout.java b/src/java.desktop/share/classes/java/awt/BorderLayout.java index e2feddc475c..f053fff7562 100644 --- a/src/java.desktop/share/classes/java/awt/BorderLayout.java +++ b/src/java.desktop/share/classes/java/awt/BorderLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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 @@ -92,11 +92,10 @@ import java.util.Hashtable; * Here is an example of five buttons in an applet laid out using * the {@code BorderLayout} layout manager: *

- * Diagram of an applet demonstrating BorderLayout. - * Each section of the BorderLayout contains a Button corresponding to its position in the layout, one of: - * North, West, Center, East, or South. + * Diagram of an applet + * demonstrating BorderLayout. Each section of the BorderLayout contains a + * Button corresponding to its position in the layout, one of: North, West, + * Center, East, or South. *

* The code for this applet is as follows: * diff --git a/src/java.desktop/share/classes/java/awt/Button.java b/src/java.desktop/share/classes/java/awt/Button.java index 66cbc8cbbe9..415a0495909 100644 --- a/src/java.desktop/share/classes/java/awt/Button.java +++ b/src/java.desktop/share/classes/java/awt/Button.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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,8 +40,8 @@ import javax.accessibility.*; * depicts three views of a "{@code Quit}" button as it appears * under the Solaris operating system: *

- * The following context describes the graphic + * The following context describes the + * graphic *

* The first view shows the button as it appears normally. * The second view shows the button diff --git a/src/java.desktop/share/classes/java/awt/Checkbox.java b/src/java.desktop/share/classes/java/awt/Checkbox.java index bf7f9406158..c766bf4b458 100644 --- a/src/java.desktop/share/classes/java/awt/Checkbox.java +++ b/src/java.desktop/share/classes/java/awt/Checkbox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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,8 +52,8 @@ import javax.accessibility.*; * This image depicts the check boxes and grid layout * created by this code example: *

- * The following context describes the graphic. + * The following context describes the + * graphic. *

* The button labeled {@code one} is in the "on" state, and the * other two are in the "off" state. In this example, which uses the diff --git a/src/java.desktop/share/classes/java/awt/CheckboxGroup.java b/src/java.desktop/share/classes/java/awt/CheckboxGroup.java index 6503e8548b6..0fbeccb0fb7 100644 --- a/src/java.desktop/share/classes/java/awt/CheckboxGroup.java +++ b/src/java.desktop/share/classes/java/awt/CheckboxGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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,9 +46,9 @@ package java.awt; *

* This image depicts the check box group created by this example: *

- * Shows three checkboxes, arranged vertically, labeled one, two, and three. Checkbox one is in the on state. + * Shows three checkboxes, + * arranged vertically, labeled one, two, and three. Checkbox one is in the on + * state. * * @author Sami Shaio * @see java.awt.Checkbox diff --git a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java index f966a767459..24116f59f6d 100644 --- a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java +++ b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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,7 @@ import sun.awt.AWTAccessor; * Menu labeled Examples, containing items Basic, Simple, Check, and More * Examples. The Check item is a CheckBoxMenuItem instance, in the off state. + * style="margin: 7px 10px;"> *

* The item labeled {@code Check} shows a check box menu item * in its "off" state. diff --git a/src/java.desktop/share/classes/java/awt/Choice.java b/src/java.desktop/share/classes/java/awt/Choice.java index e12beb142c2..fd4b7d55b32 100644 --- a/src/java.desktop/share/classes/java/awt/Choice.java +++ b/src/java.desktop/share/classes/java/awt/Choice.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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,8 +51,8 @@ import javax.accessibility.*; * After this choice menu has been added to a panel, * it appears as follows in its normal state: *

- * The following text describes the graphic + * The following text describes the + * graphic *

* In the picture, {@code "Green"} is the current choice. * Pushing the mouse button down on the object causes a menu to diff --git a/src/java.desktop/share/classes/java/awt/FlowLayout.java b/src/java.desktop/share/classes/java/awt/FlowLayout.java index 7cdfe67619b..56b0b9f02d2 100644 --- a/src/java.desktop/share/classes/java/awt/FlowLayout.java +++ b/src/java.desktop/share/classes/java/awt/FlowLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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 @@ import java.io.IOException; *

* Graphic of Layout for Three Buttons + * style="margin: 7px 10px;"> *

* Here is the code for this applet: * diff --git a/src/java.desktop/share/classes/java/awt/Frame.java b/src/java.desktop/share/classes/java/awt/Frame.java index 2936ea7048d..ce384f095db 100644 --- a/src/java.desktop/share/classes/java/awt/Frame.java +++ b/src/java.desktop/share/classes/java/awt/Frame.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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 @@ -83,10 +83,10 @@ import sun.awt.SunToolkit; * of the primary screen in the virtual device, negative coordinates * are possible, as shown in the following figure. *

- * Diagram of virtual device encompassing three physical screens and one primary physical screen. The primary physical screen - * shows (0,0) coords while a different physical screen shows (-80,-100) coords. + * Diagram of virtual device + * encompassing three physical screens and one primary physical screen. The + * primary physical screen shows (0,0) coords while a different physical screen + * shows (-80,-100) coords. *

* In such an environment, when calling {@code setLocation}, * you must pass a virtual coordinate to this method. Similarly, diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java index 4bd33fea02b..d977e2555fb 100644 --- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java +++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2019, 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 @@ -116,64 +116,49 @@ import java.util.Arrays; *

{@link GridBagConstraints#anchor} *
Specifies where the component should be positioned in its display area. * There are three kinds of possible values: absolute, orientation-relative, - * and baseline-relative + * and baseline-relative. * Orientation relative values are interpreted relative to the container's * {@code ComponentOrientation} property while absolute values * are not. Baseline relative values are calculated relative to the * baseline. Valid values are: * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Absolute, relative and baseline values as described above

Absolute Values

Orientation Relative Values

Baseline Relative Values

- *
    - *
  • {@code GridBagConstraints.NORTH}
    • - *
  • {@code GridBagConstraints.SOUTH}
    • - *
  • {@code GridBagConstraints.WEST}
    • - *
  • {@code GridBagConstraints.EAST}
    • - *
  • {@code GridBagConstraints.NORTHWEST}
    • - *
  • {@code GridBagConstraints.NORTHEAST}
    • - *
  • {@code GridBagConstraints.SOUTHWEST}
    • - *
  • {@code GridBagConstraints.SOUTHEAST}
    • - *
  • {@code GridBagConstraints.CENTER} (the default)
    • + *
      + *
    • Absolute Values: + *
        + *
      • {@code GridBagConstraints.NORTH} + *
      • {@code GridBagConstraints.SOUTH} + *
      • {@code GridBagConstraints.WEST} + *
      • {@code GridBagConstraints.EAST} + *
      • {@code GridBagConstraints.NORTHWEST} + *
      • {@code GridBagConstraints.NORTHEAST} + *
      • {@code GridBagConstraints.SOUTHWEST} + *
      • {@code GridBagConstraints.SOUTHEAST} + *
      • {@code GridBagConstraints.CENTER} (the default) + *
      + *
    • Orientation Relative Values: + *
        + *
      • {@code GridBagConstraints.PAGE_START} + *
      • {@code GridBagConstraints.PAGE_END} + *
      • {@code GridBagConstraints.LINE_START} + *
      • {@code GridBagConstraints.LINE_END} + *
      • {@code GridBagConstraints.FIRST_LINE_START} + *
      • {@code GridBagConstraints.FIRST_LINE_END} + *
      • {@code GridBagConstraints.LAST_LINE_START} + *
      • {@code GridBagConstraints.LAST_LINE_END} + *
      + *
    • Baseline Relative Values: + *
        + *
      • {@code GridBagConstraints.BASELINE} + *
      • {@code GridBagConstraints.BASELINE_LEADING} + *
      • {@code GridBagConstraints.BASELINE_TRAILING} + *
      • {@code GridBagConstraints.ABOVE_BASELINE} + *
      • {@code GridBagConstraints.ABOVE_BASELINE_LEADING} + *
      • {@code GridBagConstraints.ABOVE_BASELINE_TRAILING} + *
      • {@code GridBagConstraints.BELOW_BASELINE} + *
      • {@code GridBagConstraints.BELOW_BASELINE_LEADING} + *
      • {@code GridBagConstraints.BELOW_BASELINE_TRAILING} + *
      *
    - *
- *
    - *
  • {@code GridBagConstraints.PAGE_START}
    • - *
  • {@code GridBagConstraints.PAGE_END}
    • - *
  • {@code GridBagConstraints.LINE_START}
    • - *
  • {@code GridBagConstraints.LINE_END}
    • - *
  • {@code GridBagConstraints.FIRST_LINE_START}
    • - *
  • {@code GridBagConstraints.FIRST_LINE_END}
    • - *
  • {@code GridBagConstraints.LAST_LINE_START}
    • - *
  • {@code GridBagConstraints.LAST_LINE_END}
    • - *
- * 		- *
    - *
  • {@code GridBagConstraints.BASELINE}
    • - *
  • {@code GridBagConstraints.BASELINE_LEADING}
    • - *
  • {@code GridBagConstraints.BASELINE_TRAILING}
    • - *
  • {@code GridBagConstraints.ABOVE_BASELINE}
    • - *
  • {@code GridBagConstraints.ABOVE_BASELINE_LEADING}
    • - *
  • {@code GridBagConstraints.ABOVE_BASELINE_TRAILING}
    • - *
  • {@code GridBagConstraints.BELOW_BASELINE}
    • - *
  • {@code GridBagConstraints.BELOW_BASELINE_LEADING}
    • - *
  • {@code GridBagConstraints.BELOW_BASELINE_TRAILING}
    • - *
- *
*
{@link GridBagConstraints#weightx}, * {@link GridBagConstraints#weighty} *
Used to determine how to distribute space, which is @@ -201,14 +186,10 @@ import java.util.Arrays; *

* The following figure shows a baseline layout and includes a * component that spans rows: - * - * - * - * - *
Baseline Layout
- * The following text describes this graphic (Figure 1). - *
+ *

+ * The following text describes this graphic (Figure 1). + *

* This layout consists of three components: *