ParserDelegator.java (callBack, gnu): Now package-private.

* javax/swing/text/html/parser/ParserDelegator.java (callBack, gnu): Now package-private. * javax/swing/text/html/parser/DocumentParser.java (parser, callBack, gnu): Now package-private. * javax/swing/text/StringContent.java (content, setOffset, checkLocation): Now package-private. * javax/swing/text/JTextComponent.java (doc): Now package-private. * javax/swing/plaf/basic/BasicToolBarUI.java (owner, lastGoodOrientation, origParent, borders, cachedBounds, cachedOrientation, DragWindow): Now package-private. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (incrButton, decrButton, viewport, panel, currentScrollLocation, layoutManager, tabAreaRect, contentRect, createIncreaseButton, createDecreaseButton, findPointForIndex): Now package-private. * javax/swing/plaf/basic/BasicSplitPaneDivider.java (currentDividerLocation, moveDividerTo): Now package-private. * javax/swing/plaf/basic/BasicSliderUI.java (findClosestTick): Now package-private. * javax/swing/plaf/basic/BasicScrollBarUI.java (calculatePreferredSize, valueForYPosition, valueForXPosition): Now package-private. * javax/swing/plaf/basic/BasicPopupMenuUI.java (topWindowListener): Now package-private. * javax/swing/plaf/basic/BasicOptionPaneUI.java (iconSize, OK_STRING, YES_STRING, NO_STRING, CANCEL_STRING): Now constants. (messageAreaContainer, buttonContainer, resetSelectedValue): Now package-private. * javax/swing/plaf/basic/BasicListUI.java (damageLayout): Now package-private. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (title): Now package-private. * javax/swing/plaf/basic/BasicDesktopIconUI.java (button): Now package-private. * javax/swing/plaf/basic/BasicComboBoxUI.java (largestItemSize, borderInsets): Now package-private. (arrowButtonWidth): Likewise. Now a constant. * javax/swing/plaf/basic/BasicColorChooserUI.java (chooser, pane, makeTabs, updatePreviewPanel): Now package-private. * javax/swing/plaf/basic/BasicArrowButton.java (shadow, darkShadow, highlight): Now package-private. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java (addColorToQueue): Now package-private. * javax/swing/colorchooser/DefaultRGBChooserPanel.java (spinnerChange, sliderChange, updateChange, R, G, B, RSpinner, GSpinner, BSpinner): Now package-private. * javax/swing/colorchooser/DefaultHSBChooserPanel.java (gradientImage, trackImage, slider, hRadio, sRadio, bRadio, hSpinner, sSpinner, bSpinner, gradientPoint, internalChange, spinnerTrigger, locked, handlingMouse, updateImage, updateSlider, updateTrack): Now package-private. * javax/swing/TransferHandler.java (clipboard): Now package-private. * javax/swing/ToolTipManager.java (showTip, hideTip): Now package-private. * javax/swing/Timer.java (drainEvents, queueEvent): Now package-private. * javax/swing/RepaintManager.java (globalManager): Now package-private. * javax/swing/JFormattedTextField.java (editValid): Now package-private. * javax/swing/JColorChooser.java (makeModal): Now package-private. * java/awt/geom/GeneralPath.java (rule, types, xpoints, ypoints, index, path): Now package-private. * java/awt/geom/Area.java (solids, holes, cubicCubicIntersect, lineQuadIntersect, lineCubicIntersect, linesIntersect, pointEquals): Now package-private. * java/awt/geom/Arc2D.java (type): Now package-private. * java/awt/Window.java (windowFocusOwner): Now package-private. * java/awt/TextComponent.java (editable, selectionStart, selectionEnd, text, getIndexAtPoint, getCharacterBounds): Now package-private. * java/awt/MenuItem.java (actionCommand, enabled, label): Now package-private. * java/awt/MenuComponent.java (focusListener): Now package-private. * java/awt/Frame.java (state): Now package-private. * java/awt/Choice.java (pItems): Now package-private. * java/awt/Checkbox.java (state): Now package-private. * java/awt/Button.java (actionCommand, label): Now package-private. * gnu/javax/swing/text/html/parser/support/Parser.java (attributes, _handleEndTag_remaining, _handleStartTag): Now package-private. * gnu/java/beans/decoder/PersistenceParser.java (javaHandler): Now package-private. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (paint, stroke, fg, bg, clip, transform, font, comp): Now package-private. From-SVN: r98786
2005-04-26 18:57:40 +00:00
parent 2500ada2ff
commit 2705487a7e
41 changed files with 416 additions and 192 deletions
@@ -77,13 +77,15 @@ private static final long serialVersionUID = -8774683716313001058L;

 /**
  * @serial The action command name for this button.
+  * This is package-private to avoid an accessor method.
  */
-private String actionCommand;
+String actionCommand;

 /**
  * @serial The label for this button.
+  * This is package-private to avoid an accessor method.
  */
-private String label;
+String label;

 // List of ActionListeners for this class.
 private transient ActionListener action_listeners;
@@ -89,8 +89,9 @@ private String label;

 /**
  * @serial The state of this checkbox.
+  * This is package-private to avoid an accessor method.
  */
-private boolean state;
+boolean state;

 // The list of listeners for this object.
 private transient ItemListener item_listeners;
@@ -74,8 +74,9 @@ private static final long serialVersionUID = -4075310674757313071L;

 /**
  * @serial A list of items for the choice box, which can be <code>null</code>.
+  * This is package-private to avoid an accessor method.
  */
-private Vector pItems = new Vector();
+Vector pItems = new Vector();

 /**
  * @serial The index of the selected item in the choice box.
@@ -186,8 +186,9 @@ private boolean resizable = true;
 /**
  * @serial The state of this frame.
  * // FIXME: What are the values here?
+  * This is package-private to avoid an accessor method.
  */
-private int state;
+int state;

 /**
  * @serial The title of the frame.
@@ -161,8 +161,9 @@ private static final long serialVersionUID = -4536902356223894379L;
   *
   * @see AccessibleAWTMenuComponent#addFocusListener(java.awt.event.FocusListener)
   * @serial ignored.
+   * This is package-private to avoid an accessor method.
   */
-  private transient FocusListener focusListener;
+  transient FocusListener focusListener;

 /*************************************************************************/

@@ -75,13 +75,15 @@ private static final long serialVersionUID = -21757335363267194L;

 /**
  * @serial The name of the action command generated by this item.
+  * This is package-private to avoid an accessor method.
  */
-private String actionCommand;
+String actionCommand;

 /**
  * @serial Indicates whether or not this menu item is enabled.
+  * This is package-private to avoid an accessor method.
  */
-private boolean enabled = true;
+boolean enabled = true;

 /**
  * @serial The mask of events that are enabled for this menu item.
@@ -90,8 +92,9 @@ long eventMask;

 /**
  * @serial This menu item's label
+  * This is package-private to avoid an accessor method.
  */
-private String label;
+String label;

 /**
  * @serial The shortcut for this menu item, if any
@@ -76,23 +76,27 @@ private static final long serialVersionUID = -2214773872412987419L;

 /**
  * @serial Indicates whether or not this component is editable.
+  * This is package-private to avoid an accessor method.
  */
-private boolean editable;
+boolean editable;

 /**
  * @serial The starting position of the selected text region.
+  * This is package-private to avoid an accessor method.
  */
-private int selectionStart;
+int selectionStart;

 /**
  * @serial The ending position of the selected text region.
+  * This is package-private to avoid an accessor method.
  */
-private int selectionEnd;
+int selectionEnd;

 /**
  * @serial The text in the component
+  * This is package-private to avoid an accessor method.
  */
-private String text;
+String text;

 /**
  * A list of listeners that will receive events from this object.
@@ -708,8 +712,9 @@ paramString()
  
  /*******************************/
  // Provide AccessibleAWTTextComponent access to several peer functions that
-  // aren't publicly exposed.
-  private synchronized int
+  // aren't publicly exposed.  This is package-private to avoid an accessor
+  // method.
+  synchronized int
  getIndexAtPoint(Point p)
  {
    TextComponentPeer tcp = (TextComponentPeer)getPeer();
@@ -718,7 +723,7 @@ paramString()
    return -1;
  }
  
-  private synchronized Rectangle
+  synchronized Rectangle
  getCharacterBounds(int i)
  {
    TextComponentPeer tcp = (TextComponentPeer)getPeer();
@@ -90,7 +90,8 @@ public class Window extends Container implements Accessible

  private transient boolean shown;

-  private transient Component windowFocusOwner;
+  // This is package-private to avoid an accessor method.
+  transient Component windowFocusOwner;
  
  /*
   * The number used to generate the name returned by getName.
@@ -73,8 +73,9 @@ public abstract class Arc2D extends RectangularShape
   */
  public static final int PIE = 2;

-  /** The closure type of this arc. */
-  private int type;
+  /** The closure type of this arc.  This is package-private to avoid an
+   * accessor method.  */
+  int type;

  /**
   * Create a new arc, with the specified closure type.
@@ -89,13 +89,15 @@ public class Area implements Shape, Cloneable

  /**
   * Segment vectors containing solid areas and holes
+   * This is package-private to avoid an accessor method.
   */
-  private Vector solids;
+  Vector solids;

  /**
   * Segment vectors containing solid areas and holes
+   * This is package-private to avoid an accessor method.
   */
-  private Vector holes;
+  Vector holes;

  /**
   * Vector (temporary) storing curve-curve intersections
@@ -1315,9 +1317,10 @@ public class Area implements Shape, Cloneable
   * This is a reasonably accurate method, although the recursion depth
   * is typically around 20, the bounding-box tests allow for significant
   * pruning of the subdivision tree.
+   * 
+   * This is package-private to avoid an accessor method.
   */
-  private Intersection[] cubicCubicIntersect(CubicSegment curve1,
-                                             CubicSegment curve2)
+  Intersection[] cubicCubicIntersect(CubicSegment curve1, CubicSegment curve2)
  {
    Rectangle2D r1 = curve1.getBounds();
    Rectangle2D r2 = curve2.getBounds();
@@ -1349,8 +1352,9 @@ public class Area implements Shape, Cloneable
   * Or null if no intersections are found1
   * This is done through combining the line's equation with the
   * parametric form of the Bezier and solving the resulting quadratic.
+   * This is package-private to avoid an accessor method.
   */
-  private Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c)
+  Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c)
  {
    double[] y = new double[3];
    double[] x = new double[3];
@@ -1453,8 +1457,9 @@ public class Area implements Shape, Cloneable
   * Returns the intersections between a line and a cubic segment
   * This is done through combining the line's equation with the
   * parametric form of the Bezier and solving the resulting quadratic.
+   * This is package-private to avoid an accessor method. 
   */
-  private Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c)
+  Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c)
  {
    double[] y = new double[4];
    double[] x = new double[4];
@@ -1560,8 +1565,9 @@ public class Area implements Shape, Cloneable
  /**
   * Returns the intersection between two lines, or null if there is no
   * intersection.
+   * This is package-private to avoid an accessor method.
   */
-  private Intersection linesIntersect(LineSegment a, LineSegment b)
+  Intersection linesIntersect(LineSegment a, LineSegment b)
  {
    Point2D P1 = a.P1;
    Point2D P2 = a.P2;
@@ -1605,8 +1611,9 @@ public class Area implements Shape, Cloneable
  /**
   * Determines if two points are equal, within an error margin
   * 'snap distance'
+   * This is package-private to avoid an accessor method.
   */
-  private boolean pointEquals(Point2D a, Point2D b)
+  boolean pointEquals(Point2D a, Point2D b)
  {
    return (a.equals(b) || a.distance(b) < PE_EPSILON);
  }
@@ -88,15 +88,18 @@ public final class GeneralPath implements Shape, Cloneable
  /** A big number, but not so big it can't survive a few float operations */
  private static final double BIG_VALUE = java.lang.Double.MAX_VALUE / 10.0;

-  /** The winding rule. */
-  private int rule;
+  /** The winding rule.
+   * This is package-private to avoid an accessor method.
+   */
+  int rule;

  /**
   * The path type in points. Note that xpoints[index] and ypoints[index] maps
   * to types[index]; the control points of quad and cubic paths map as
   * well but are ignored.
+   * This is package-private to avoid an accessor method.
   */
-  private byte[] types;
+  byte[] types;

  /**
   * The list of all points seen. Since you can only append floats, it makes
@@ -104,15 +107,18 @@ public final class GeneralPath implements Shape, Cloneable
   * allow a general path of double precision points.
   * Note: Storing x and y coords seperately makes for a slower transforms,
   * But it speeds up and simplifies box-intersection checking a lot.
+   * These are package-private to avoid accessor methods.
   */
-  private float[] xpoints;
-  private float[] ypoints;
+  float[] xpoints;
+  float[] ypoints;

  /** The index of the most recent moveto point, or null. */
  private int subpath = -1;

-  /** The next available index into points. */
-  private int index;
+  /** The next available index into points.
+   * This is package-private to avoid an accessor method.
+   */
+  int index;

  /**
   * Constructs a GeneralPath with the default (NON_ZERO)
@@ -534,8 +540,9 @@ public final class GeneralPath implements Shape, Cloneable

    /**
     * The GeneralPath whose segments are being iterated.
+     * This is package-private to avoid an accessor method.
     */
-    private final GeneralPath path;
+    final GeneralPath path;

    /**
     * The affine transformation used to transform coordinates.