OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2005-04-26 18:57:40 +00:00 committed by Tom Tromey
parent 2500ada2ff
commit 2705487a7e
41 changed files with 416 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
libjava/ChangeLog
View File

@ -1,3 +1,95 @@
2005-04-26 Tom Tromey <tromey@redhat.com>
* 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.
2005-04-26 Tom Tromey <tromey@redhat.com> 2005-04-26 Tom Tromey <tromey@redhat.com>
* java/awt/Robot.java (waitForIdle): Call invokeAndWait in a * java/awt/Robot.java (waitForIdle): Call invokeAndWait in a

19
libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
View File

@ -110,19 +110,22 @@ public class GdkGraphics2D extends Graphics2D
private final int native_state = GtkGenericPeer.getUniqueInteger(); private final int native_state = GtkGenericPeer.getUniqueInteger();
private Paint paint; // These are package-private to avoid accessor methods.
private Stroke stroke; Paint paint;
private Color fg; Stroke stroke;
private Color bg; Color fg;
private Shape clip; Color bg;
private AffineTransform transform; Shape clip;
AffineTransform transform;
private GtkComponentPeer component; private GtkComponentPeer component;
private Font font; // This is package-private to avoid an accessor method.
Font font;
private RenderingHints hints; private RenderingHints hints;
private BufferedImage bimage; private BufferedImage bimage;
private boolean pixelConversionRequired; private boolean pixelConversionRequired;
private int[] pixelBuffer; private int[] pixelBuffer;
private Composite comp; // This is package-private to avoid an accessor method.
Composite comp;
private Stack stateStack; private Stack stateStack;
private native void initState(GtkComponentPeer component); private native void initState(GtkComponentPeer component);

5
libjava/gnu/java/beans/decoder/PersistenceParser.java
View File

@ -1,5 +1,5 @@
/* gnu.java.beans.PersistenceParser /* gnu.java.beans.PersistenceParser
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -83,8 +83,9 @@ public class PersistenceParser extends DefaultHandler implements Context
private ElementHandler currentHandler; private ElementHandler currentHandler;
/** The real root element that stores all objects created during parsing. /** The real root element that stores all objects created during parsing.
* Package-private to avoid an accessor method.
*/ */
private JavaHandler javaHandler; JavaHandler javaHandler;
/** Stores the decoded objects. */ /** Stores the decoded objects. */
private List objects = new LinkedList(); private List objects = new LinkedList();

11
libjava/gnu/javax/swing/text/html/parser/support/Parser.java
View File

@ -157,8 +157,9 @@ public class Parser
/** /**
* The attributes of the current HTML element. * The attributes of the current HTML element.
* Package-private to avoid an accessor method.
*/ */
private htmlAttributeSet attributes = htmlAttributeSet attributes =
htmlAttributeSet.EMPTY_HTML_ATTRIBUTE_SET; htmlAttributeSet.EMPTY_HTML_ATTRIBUTE_SET;
/** /**
@ -1154,9 +1155,10 @@ public class Parser
/** /**
* Actions that are also required if the closing action was * Actions that are also required if the closing action was
* intiated by the tag validator. * initiated by the tag validator.
* Package-private to avoid an accessor method.
*/ */
private void _handleEndTag_remaining(TagElement tag) void _handleEndTag_remaining(TagElement tag)
{ {
HTML.Tag h = tag.getHTMLTag(); HTML.Tag h = tag.getHTMLTag();
@ -1183,9 +1185,10 @@ public class Parser
* A hooks for operations, preceeding call to handleStartTag(). * A hooks for operations, preceeding call to handleStartTag().
* The method is called when the HTML opening tag ((like &lt;table&gt;) * The method is called when the HTML opening tag ((like &lt;table&gt;)
* is found. * is found.
* Package-private to avoid an accessor method.
* @param The tag * @param The tag
*/ */
private void _handleStartTag(TagElement tag) void _handleStartTag(TagElement tag)
{ {
validator.openTag(tag, attributes); validator.openTag(tag, attributes);
startingTag(tag); startingTag(tag);

6
libjava/java/awt/Button.java
View File

@ -77,13 +77,15 @@ private static final long serialVersionUID = -8774683716313001058L;
/** /**
* @serial The action command name for this button. * @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. * @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. // List of ActionListeners for this class.
private transient ActionListener action_listeners; private transient ActionListener action_listeners;

3
libjava/java/awt/Checkbox.java
View File

@ -89,8 +89,9 @@ private String label;
/** /**
* @serial The state of this checkbox. * @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. // The list of listeners for this object.
private transient ItemListener item_listeners; private transient ItemListener item_listeners;

3
libjava/java/awt/Choice.java
View File

@ -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>. * @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. * @serial The index of the selected item in the choice box.

3
libjava/java/awt/Frame.java
View File

@ -186,8 +186,9 @@ private boolean resizable = true;
/** /**
* @serial The state of this frame. * @serial The state of this frame.
* // FIXME: What are the values here? * // 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. * @serial The title of the frame.

3
libjava/java/awt/MenuComponent.java
View File

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

9
libjava/java/awt/MenuItem.java
View File

@ -75,13 +75,15 @@ private static final long serialVersionUID = -21757335363267194L;
/** /**
* @serial The name of the action command generated by this item. * @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. * @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. * @serial The mask of events that are enabled for this menu item.
@ -90,8 +92,9 @@ long eventMask;
/** /**
* @serial This menu item's label * @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 * @serial The shortcut for this menu item, if any

19
libjava/java/awt/TextComponent.java
View File

@ -76,23 +76,27 @@ private static final long serialVersionUID = -2214773872412987419L;
/** /**
* @serial Indicates whether or not this component is editable. * @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. * @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. * @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 * @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. * A list of listeners that will receive events from this object.
@ -708,8 +712,9 @@ paramString()
/*******************************/ /*******************************/
// Provide AccessibleAWTTextComponent access to several peer functions that // Provide AccessibleAWTTextComponent access to several peer functions that
// aren't publicly exposed. // aren't publicly exposed. This is package-private to avoid an accessor
private synchronized int // method.
synchronized int
getIndexAtPoint(Point p) getIndexAtPoint(Point p)
{ {
TextComponentPeer tcp = (TextComponentPeer)getPeer(); TextComponentPeer tcp = (TextComponentPeer)getPeer();
@ -718,7 +723,7 @@ paramString()
return -1; return -1;
} }
private synchronized Rectangle synchronized Rectangle
getCharacterBounds(int i) getCharacterBounds(int i)
{ {
TextComponentPeer tcp = (TextComponentPeer)getPeer(); TextComponentPeer tcp = (TextComponentPeer)getPeer();

3
libjava/java/awt/Window.java
View File

@ -90,7 +90,8 @@ public class Window extends Container implements Accessible
private transient boolean shown; 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. * The number used to generate the name returned by getName.

5
libjava/java/awt/geom/Arc2D.java
View File

@ -73,8 +73,9 @@ public abstract class Arc2D extends RectangularShape
*/ */
public static final int PIE = 2; public static final int PIE = 2;
/** The closure type of this arc. */ /** The closure type of this arc. This is package-private to avoid an
private int type; * accessor method. */
int type;
/** /**
* Create a new arc, with the specified closure type. * Create a new arc, with the specified closure type.

23
libjava/java/awt/geom/Area.java
View File

@ -89,13 +89,15 @@ public class Area implements Shape, Cloneable
/** /**
* Segment vectors containing solid areas and holes * 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 * 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 * 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 * This is a reasonably accurate method, although the recursion depth
* is typically around 20, the bounding-box tests allow for significant * is typically around 20, the bounding-box tests allow for significant
* pruning of the subdivision tree. * pruning of the subdivision tree.
*
* This is package-private to avoid an accessor method.
*/ */
private Intersection[] cubicCubicIntersect(CubicSegment curve1, Intersection[] cubicCubicIntersect(CubicSegment curve1, CubicSegment curve2)
CubicSegment curve2)
{ {
Rectangle2D r1 = curve1.getBounds(); Rectangle2D r1 = curve1.getBounds();
Rectangle2D r2 = curve2.getBounds(); Rectangle2D r2 = curve2.getBounds();
@ -1349,8 +1352,9 @@ public class Area implements Shape, Cloneable
* Or null if no intersections are found1 * Or null if no intersections are found1
* This is done through combining the line's equation with the * This is done through combining the line's equation with the
* parametric form of the Bezier and solving the resulting quadratic. * 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[] y = new double[3];
double[] x = 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 * Returns the intersections between a line and a cubic segment
* This is done through combining the line's equation with the * This is done through combining the line's equation with the
* parametric form of the Bezier and solving the resulting quadratic. * 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[] y = new double[4];
double[] x = 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 * Returns the intersection between two lines, or null if there is no
* intersection. * 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 P1 = a.P1;
Point2D P2 = a.P2; Point2D P2 = a.P2;
@ -1605,8 +1611,9 @@ public class Area implements Shape, Cloneable
/** /**
* Determines if two points are equal, within an error margin * Determines if two points are equal, within an error margin
* 'snap distance' * '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); return (a.equals(b) || a.distance(b) < PE_EPSILON);
} }

23
libjava/java/awt/geom/GeneralPath.java
View File

@ -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 */ /** 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; private static final double BIG_VALUE = java.lang.Double.MAX_VALUE / 10.0;
/** The winding rule. */ /** The winding rule.
private int 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 * 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 * to types[index]; the control points of quad and cubic paths map as
* well but are ignored. * 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 * 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. * allow a general path of double precision points.
* Note: Storing x and y coords seperately makes for a slower transforms, * Note: Storing x and y coords seperately makes for a slower transforms,
* But it speeds up and simplifies box-intersection checking a lot. * But it speeds up and simplifies box-intersection checking a lot.
* These are package-private to avoid accessor methods.
*/ */
private float[] xpoints; float[] xpoints;
private float[] ypoints; float[] ypoints;
/** The index of the most recent moveto point, or null. */ /** The index of the most recent moveto point, or null. */
private int subpath = -1; private int subpath = -1;
/** The next available index into points. */ /** The next available index into points.
private int index; * This is package-private to avoid an accessor method.
*/
int index;
/** /**
* Constructs a GeneralPath with the default (NON_ZERO) * 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. * 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. * The affine transformation used to transform coordinates.

4
libjava/javax/swing/JColorChooser.java
View File

@ -229,11 +229,11 @@ public class JColorChooser extends JComponent implements Accessible
/** /**
* This is a helper method to make the given JDialog block until it is * This is a helper method to make the given JDialog block until it is
* hidden. * hidden. This is package-private to avoid an accessor method.
* *
* @param dialog The JDialog to block. * @param dialog The JDialog to block.
*/ */
private static void makeModal(JDialog dialog) static void makeModal(JDialog dialog)
{ {
try try
{ {

3
libjava/javax/swing/JFormattedTextField.java
View File

@ -155,7 +155,8 @@ public class JFormattedTextField extends JTextField
private Object value; private Object value;
private int focusLostBehavior = COMMIT_OR_REVERT; private int focusLostBehavior = COMMIT_OR_REVERT;
private AbstractFormatterFactory formatterFactory; private AbstractFormatterFactory formatterFactory;
private boolean editValid = true; // Package-private to avoid an accessor method.
boolean editValid = true;
public JFormattedTextField () public JFormattedTextField ()
{ {

5
libjava/javax/swing/RepaintManager.java
View File

@ -176,12 +176,13 @@ public class RepaintManager
/** /**
* The global, shared RepaintManager instance. This is reused for all * The global, shared RepaintManager instance. This is reused for all
* components in all windows. * components in all windows. This is package-private to avoid an accessor
* method.
* *
* @see #currentManager * @see #currentManager
* @see #setCurrentManager * @see #setCurrentManager
*/ */
private static RepaintManager globalManager; static RepaintManager globalManager;
/** /**
* Create a new RepaintManager object. * Create a new RepaintManager object.

4
libjava/javax/swing/Timer.java
View File

@ -82,6 +82,7 @@ public class Timer implements Serializable
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* Package-private to avoid an accessor method.
*/ */
private void queueEvent() private void queueEvent()
{ {
@ -95,8 +96,9 @@ public class Timer implements Serializable
/** /**
* DOCUMENT ME! * DOCUMENT ME!
* This is package-private to avoid an accessor method.
*/ */
private void drainEvents() void drainEvents()
{ {
synchronized (queueLock) synchronized (queueLock)
{ {

7
libjava/javax/swing/ToolTipManager.java
View File

@ -466,9 +466,9 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
/** /**
* This method displays the ToolTip. It can figure out the method needed to * This method displays the ToolTip. It can figure out the method needed to
* show it as well (whether to display it in heavyweight/lightweight panel * show it as well (whether to display it in heavyweight/lightweight panel
* or a window.) * or a window.) This is package-private to avoid an accessor method.
*/ */
private void showTip() void showTip()
{ {
if (! enabled || currentComponent == null) if (! enabled || currentComponent == null)
return; return;
@ -535,8 +535,9 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
/** /**
* This method hides the ToolTip. * This method hides the ToolTip.
* This is package-private to avoid an accessor method.
*/ */
private void hideTip() void hideTip()
{ {
if (currentTip == null || ! currentTip.isVisible() || ! enabled) if (currentTip == null || ! currentTip.isVisible() || ! enabled)
return; return;

3
libjava/javax/swing/TransferHandler.java
View File

@ -119,8 +119,9 @@ public class TransferHandler implements Serializable
/** /**
* Clipboard if system clipboard may not be used. * Clipboard if system clipboard may not be used.
* Package-private to avoid an accessor method.
*/ */
private static Clipboard clipboard; static Clipboard clipboard;
private int sourceActions; private int sourceActions;
private Icon visualRepresentation; private Icon visualRepresentation;

79
libjava/javax/swing/colorchooser/DefaultHSBChooserPanel.java
View File

@ -1,5 +1,5 @@
/* DefaultHSBChooserPanel.java -- /* DefaultHSBChooserPanel.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -70,38 +70,47 @@ import javax.swing.event.ChangeListener;
*/ */
class DefaultHSBChooserPanel extends AbstractColorChooserPanel class DefaultHSBChooserPanel extends AbstractColorChooserPanel
{ {
/** The gradient image displayed. */ /** The gradient image displayed.
private transient Image gradientImage; * This is package-private to avoid an accessor method. */
transient Image gradientImage;
/** The Panel that holds the gradient image. */ /** The Panel that holds the gradient image. */
private transient JPanel gradientPanel; private transient JPanel gradientPanel;
/** The track gradient image. */ /** The track gradient image.
private transient Image trackImage; * This is package-private to avoid an accessor method. */
transient Image trackImage;
/** The panel that holds the track. */ /** The panel that holds the track. */
private transient JPanel trackPanel; private transient JPanel trackPanel;
/** The slider for the locked HSB value. */ /** The slider for the locked HSB value.
private transient JSlider slider; * This is package-private to avoid an accessor method. */
transient JSlider slider;
/** The RadioButton that controls the Hue. */ /** The RadioButton that controls the Hue.
private transient JRadioButton hRadio; * This is package-private to avoid an accessor method. */
transient JRadioButton hRadio;
/** The RadioButton that controls the Saturation. */ /** The RadioButton that controls the Saturation.
private transient JRadioButton sRadio; * This is package-private to avoid an accessor method. */
transient JRadioButton sRadio;
/** The RadioButton that controls the Brightness. */ /** The RadioButton that controls the Brightness.
private transient JRadioButton bRadio; * This is package-private to avoid an accessor method. */
transient JRadioButton bRadio;
/** The JSpinner that controls the Hue. */ /** The JSpinner that controls the Hue.
private transient JSpinner hSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner hSpinner;
/** The JSpinner that controls the Saturation. */ /** The JSpinner that controls the Saturation.
private transient JSpinner sSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner sSpinner;
/** The JSpinner that controls the Brightness. */ /** The JSpinner that controls the Brightness.
private transient JSpinner bSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner bSpinner;
/** The default width of the gradient image. */ /** The default width of the gradient image. */
private static final int imgWidth = 200; private static final int imgWidth = 200;
@ -132,20 +141,26 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
/** The JLabel that displays the value of Blue. */ /** The JLabel that displays the value of Blue. */
private transient JLabel bFull; private transient JLabel bFull;
/** The point that is displayed in the gradient image. */ /** The point that is displayed in the gradient image.
private transient Point gradientPoint = new Point(); * Package-private to avoid an accessor method.
*/
transient Point gradientPoint = new Point();
/** /**
* This indicates that the change to the slider or point is triggered * This indicates that the change to the slider or point is triggered
* internally. * internally.
* This is package-private to avoid an accessor method.
*/ */
private transient boolean internalChange = false; transient boolean internalChange = false;
/** This indicates that the change to the spinner is triggered internally. */ /** This indicates that the change to the spinner is triggered
private transient boolean spinnerTrigger = false; * internally.
* This is package-private to avoid an accessor method. */
transient boolean spinnerTrigger = false;
/** This int identifies which spinner is currently locked. */ /** This int identifies which spinner is currently locked.
private transient int locked = -1; * This is package-private to avoid an accessor method. */
transient int locked = -1;
/** This value indicates that the Hue spinner is locked. */ /** This value indicates that the Hue spinner is locked. */
static final int HLOCKED = 0; static final int HLOCKED = 0;
@ -159,8 +174,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
/** /**
* This method indicates that the mouse event is in the process of being * This method indicates that the mouse event is in the process of being
* handled. * handled.
* This is package-private to avoid an accessor method.
*/ */
private transient boolean handlingMouse; transient boolean handlingMouse;
/** /**
* This helper class handles mouse events on the gradient image. * This helper class handles mouse events on the gradient image.
@ -716,8 +732,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
/** /**
* This method calls the appropriate method to update the gradient image * This method calls the appropriate method to update the gradient image
* depending on which HSB value is constant. * depending on which HSB value is constant.
* This is package-private to avoid an accessor method.
*/ */
private void updateImage() void updateImage()
{ {
switch (locked) switch (locked)
{ {
@ -750,8 +767,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
/** /**
* This method updates the slider in response to making a different HSB * This method updates the slider in response to making a different HSB
* property the constant. * property the constant.
* This is package-private to avoid an accessor method.
*/ */
private void updateSlider() void updateSlider()
{ {
if (slider == null) if (slider == null)
return; return;
@ -779,8 +797,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
/** /**
* This method updates the track gradient image depending on which HSB * This method updates the track gradient image depending on which HSB
* property is constant. * property is constant.
* This is package-private to avoid an accessor method.
*/ */
private void updateTrack() void updateTrack()
{ {
switch (locked) switch (locked)
{ {

43
libjava/javax/swing/colorchooser/DefaultRGBChooserPanel.java
View File

@ -109,17 +109,20 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
} }
} }
/** Whether the color change was initiated by the spinners. */ /** Whether the color change was initiated by the spinners.
private transient boolean spinnerChange = false; * This is package-private to avoid an accessor method. */
transient boolean spinnerChange = false;
/** Whether the color change was initiated by the sliders. */ /** Whether the color change was initiated by the sliders.
private transient boolean sliderChange = false; * This is package-private to avoid an accessor method. */
transient boolean sliderChange = false;
/** /**
* Whether the change was forced by the chooser (meaning the color has * Whether the change was forced by the chooser (meaning the color has
* already been changed). * already been changed).
* This is package-private to avoid an accessor method.
*/ */
private transient boolean updateChange = false; transient boolean updateChange = false;
/** The ChangeListener for the sliders. */ /** The ChangeListener for the sliders. */
private transient ChangeListener colorChanger; private transient ChangeListener colorChanger;
@ -127,14 +130,17 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
/** The ChangeListener for the spinners. */ /** The ChangeListener for the spinners. */
private transient ChangeListener spinnerHandler; private transient ChangeListener spinnerHandler;
/** The slider that handles the red values. */ /** The slider that handles the red values.
private transient JSlider R; * This is package-private to avoid an accessor method. */
transient JSlider R;
/** The slider that handles the green values. */ /** The slider that handles the green values.
private transient JSlider G; * This is package-private to avoid an accessor method. */
transient JSlider G;
/** The slider that handles the blue values. */ /** The slider that handles the blue values.
private transient JSlider B; * This is package-private to avoid an accessor method. */
transient JSlider B;
/** The label for the red slider. */ /** The label for the red slider. */
private transient JLabel RLabel; private transient JLabel RLabel;
@ -145,14 +151,17 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
/** The label for the blue slider. */ /** The label for the blue slider. */
private transient JLabel BLabel; private transient JLabel BLabel;
/** The spinner that handles the red values. */ /** The spinner that handles the red values.
private transient JSpinner RSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner RSpinner;
/** The spinner that handles the green values. */ /** The spinner that handles the green values.
private transient JSpinner GSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner GSpinner;
/** The spinner that handles the blue values. */ /** The spinner that handles the blue values.
private transient JSpinner BSpinner; * This is package-private to avoid an accessor method. */
transient JSpinner BSpinner;
/** /**
* Creates a new DefaultRGBChooserPanel object. * Creates a new DefaultRGBChooserPanel object.

3
libjava/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
View File

@ -501,10 +501,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
/** /**
* This method adds the given color to the beginning of the swatch panel. * This method adds the given color to the beginning of the swatch panel.
* Package-private to avoid an accessor method.
* *
* @param c The color to add. * @param c The color to add.
*/ */
private void addColorToQueue(Color c) void addColorToQueue(Color c)
{ {
if (--start == -1) if (--start == -1)
start = numRows * numCols - 1; start = numRows * numCols - 1;

15
libjava/javax/swing/plaf/basic/BasicArrowButton.java
View File

@ -1,5 +1,5 @@
/* BasicArrowButton.java -- /* BasicArrowButton.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -80,17 +80,22 @@ public class BasicArrowButton extends JButton implements SwingConstants
/** /**
* The color the arrow is painted in if disabled and the bottom and right * The color the arrow is painted in if disabled and the bottom and right
* edges of the button. * edges of the button.
* This is package-private to avoid an accessor method.
*/ */
private transient Color shadow = Color.GRAY; transient Color shadow = Color.GRAY;
/** /**
* The color the arrow is painted in if enabled and the bottom and right * The color the arrow is painted in if enabled and the bottom and right
* edges of the button. * edges of the button.
* This is package-private to avoid an accessor method.
*/ */
private transient Color darkShadow = Color.DARK_GRAY; transient Color darkShadow = Color.DARK_GRAY;
/** The top and left edges of the button. */ /**
private transient Color highlight = Color.WHITE; * The top and left edges of the button.
* This is package-private to avoid an accessor method.
*/
transient Color highlight = Color.WHITE;
/** The border around the ArrowButton. */ /** The border around the ArrowButton. */
private transient Border buttonBorder = new Border() private transient Border buttonBorder = new Border()

17
libjava/javax/swing/plaf/basic/BasicColorChooserUI.java
View File

@ -1,5 +1,5 @@
/* BasicColorChooserUI.java -- /* BasicColorChooserUI.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -141,11 +141,14 @@ public class BasicColorChooserUI extends ColorChooserUI
/** The PropertyChangeListener for the JColorChooser. */ /** The PropertyChangeListener for the JColorChooser. */
protected PropertyChangeListener propertyChangeListener; protected PropertyChangeListener propertyChangeListener;
/** The JColorChooser. */ /**
private JColorChooser chooser; * The JColorChooser.
* This is package-private to avoid an accessor method.
*/
JColorChooser chooser;
/** The JTabbedPane that is used. */ /** The JTabbedPane that is used. */
private JTabbedPane pane; JTabbedPane pane;
/** The Container that holds the preview panel. */ /** The Container that holds the preview panel. */
private Container prevContainer; private Container prevContainer;
@ -219,10 +222,11 @@ public class BasicColorChooserUI extends ColorChooserUI
/** /**
* This method adds tabs to the JTabbedPane for the chooserPanels defined in * This method adds tabs to the JTabbedPane for the chooserPanels defined in
* the JColorChooser. * the JColorChooser.
* This is package-private to avoid an accessor method.
* *
* @param panels The Panels that need tabs to be made for them. * @param panels The Panels that need tabs to be made for them.
*/ */
private void makeTabs(AbstractColorChooserPanel[] panels) void makeTabs(AbstractColorChooserPanel[] panels)
{ {
pane.removeAll(); pane.removeAll();
for (int i = 0; i < panels.length; i++) for (int i = 0; i < panels.length; i++)
@ -255,10 +259,11 @@ public class BasicColorChooserUI extends ColorChooserUI
/** /**
* This is a helper method that swaps the existing preview panel with the * This is a helper method that swaps the existing preview panel with the
* given panel. * given panel.
* This is package-private to avoid an accessor method.
* *
* @param preview The new preview panel. * @param preview The new preview panel.
*/ */
private void updatePreviewPanel(JComponent preview) void updatePreviewPanel(JComponent preview)
{ {
if (prevContainer == null) if (prevContainer == null)
{ {

15
libjava/javax/swing/plaf/basic/BasicComboBoxUI.java
View File

@ -160,17 +160,22 @@ public class BasicComboBoxUI extends ComboBoxUI
private Color highlight; private Color highlight;
private Color lightHighlight; private Color lightHighlight;
/* Size of the largest item in the comboBox */ /* Size of the largest item in the comboBox
private Dimension largestItemSize; * This is package-private to avoid an accessor method.
*/
Dimension largestItemSize;
// It seems that JComboBox doesn't have a border set explicitely. So we just // It seems that JComboBox doesn't have a border set explicitely. So we just
// paint the border everytime combo box is displayed. // paint the border everytime combo box is displayed.
/* border insets for this JComboBox*/ /* border insets for this JComboBox
private static final Insets borderInsets = new Insets(2, 2, 2, 2); * This is package-private to avoid an accessor method. */
static final Insets borderInsets = new Insets(2, 2, 2, 2);
// Width of the arrow button // Width of the arrow button
private static int arrowButtonWidth = 15; // This is package-private to avoid an accessor method.
// FIXME: has wrong name for a constant.
static final int arrowButtonWidth = 15;
// FIXME: This fields aren't used anywhere at this moment. // FIXME: This fields aren't used anywhere at this moment.
protected Dimension cachedMinimumSize; protected Dimension cachedMinimumSize;

7
libjava/javax/swing/plaf/basic/BasicDesktopIconUI.java
View File

@ -1,5 +1,5 @@
/* BasicDesktopIconUI.java -- /* BasicDesktopIconUI.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -302,8 +302,9 @@ public class BasicDesktopIconUI extends DesktopIconUI
/** The MouseListener responsible for reacting to MouseEvents on the JDesktopIcon. */ /** The MouseListener responsible for reacting to MouseEvents on the JDesktopIcon. */
private transient MouseInputListener mouseHandler; private transient MouseInputListener mouseHandler;
/** The Button in the JDesktopIcon responsible for deiconifying it. */ /** The Button in the JDesktopIcon responsible for deiconifying it.
private transient BoundButton button; * This is package-private to avoid an accessor method. */
transient BoundButton button;
/** The PropertyChangeListener listening to the JDesktopIcon. */ /** The PropertyChangeListener listening to the JDesktopIcon. */
private transient PropertyChangeListener propertyHandler; private transient PropertyChangeListener propertyHandler;

5
libjava/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
View File

@ -1,5 +1,5 @@
/* BasicInternalFrameTitlePane.java -- /* BasicInternalFrameTitlePane.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -644,8 +644,9 @@ public class BasicInternalFrameTitlePane extends JComponent
/** /**
* The label used to display the title. This label is not added to the * The label used to display the title. This label is not added to the
* TitlePane. * TitlePane.
* This is package-private to avoid an accessor method.
*/ */
private transient JLabel title; transient JLabel title;
/** /**
* Creates a new BasicInternalFrameTitlePane object that is used in the * Creates a new BasicInternalFrameTitlePane object that is used in the

5
libjava/javax/swing/plaf/basic/BasicListUI.java
View File

@ -1,5 +1,5 @@
/* BasicListUI.java -- /* BasicListUI.java --
Copyright (C) 2002, 2004 Free Software Foundation, Inc. Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -491,10 +491,11 @@ public class BasicListUI extends ListUI
/** /**
* Marks the current layout as damaged and requests revalidation from the * Marks the current layout as damaged and requests revalidation from the
* JList. * JList.
* This is package-private to avoid an accessor method.
* *
* @see #updateLayoutStateNeeded * @see #updateLayoutStateNeeded
*/ */
private void damageLayout() void damageLayout()
{ {
updateLayoutStateNeeded = 1; updateLayoutStateNeeded = 1;
list.revalidate(); list.revalidate();

30
libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java
View File

@ -1,5 +1,5 @@
/* BasicOptionPaneUI.java -- /* BasicOptionPaneUI.java --
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -439,7 +439,8 @@ public class BasicOptionPaneUI extends OptionPaneUI
protected JOptionPane optionPane; protected JOptionPane optionPane;
/** The size of the icons. */ /** The size of the icons. */
private static int iconSize = 36; // FIXME: wrong name for a constant.
private static final int iconSize = 36;
/** The foreground color for the message area. */ /** The foreground color for the message area. */
private transient Color messageForeground; private transient Color messageForeground;
@ -451,22 +452,28 @@ public class BasicOptionPaneUI extends OptionPaneUI
private transient Border buttonBorder; private transient Border buttonBorder;
/** The string used to describe OK buttons. */ /** The string used to describe OK buttons. */
private static String OK_STRING = "OK"; // FIXME: wrong name for a constant.
private static final String OK_STRING = "OK";
/** The string used to describe Yes buttons. */ /** The string used to describe Yes buttons. */
private static String YES_STRING = "Yes"; // FIXME: wrong name for a constant.
private static final String YES_STRING = "Yes";
/** The string used to describe No buttons. */ /** The string used to describe No buttons. */
private static String NO_STRING = "No"; // FIXME: wrong name for a constant.
private static final String NO_STRING = "No";
/** The string used to describe Cancel buttons. */ /** The string used to describe Cancel buttons. */
private static String CANCEL_STRING = "Cancel"; // FIXME: wrong name for a constant.
private static final String CANCEL_STRING = "Cancel";
/** The container for the message area. */ /** The container for the message area.
private transient Container messageAreaContainer; * This is package-private to avoid an accessor method. */
transient Container messageAreaContainer;
/** The container for the buttons. */ /** The container for the buttons.
private transient Container buttonContainer; * This is package-private to avoid an accessor method. */
transient Container buttonContainer;
/** /**
* A helper class that implements Icon. This is used temporarily until * A helper class that implements Icon. This is used temporarily until
@ -1227,8 +1234,9 @@ public class BasicOptionPaneUI extends OptionPaneUI
/** /**
* This method resets the value in the inputComponent to the * This method resets the value in the inputComponent to the
* initialSelectionValue property. * initialSelectionValue property.
* This is package-private to avoid an accessor method.
*/ */
private void resetSelectedValue() void resetSelectedValue()
{ {
if (inputComponent != null) if (inputComponent != null)
{ {

7
libjava/javax/swing/plaf/basic/BasicPopupMenuUI.java
View File

@ -1,5 +1,5 @@
/* BasicPopupMenuUI.java /* BasicPopupMenuUI.java
Copyright (C) 2002, 2004 Free Software Foundation, Inc. Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -73,8 +73,9 @@ public class BasicPopupMenuUI extends PopupMenuUI
/* PopupMenuListener listens to popup menu events fired by JPopupMenu*/ /* PopupMenuListener listens to popup menu events fired by JPopupMenu*/
private transient PopupMenuListener popupMenuListener; private transient PopupMenuListener popupMenuListener;
/* ComponentListener listening to popupMenu's invoker. */ /* ComponentListener listening to popupMenu's invoker.
private TopWindowListener topWindowListener; * This is package-private to avoid an accessor method. */
TopWindowListener topWindowListener;
/** /**
* Creates a new BasicPopupMenuUI object. * Creates a new BasicPopupMenuUI object.

9
libjava/javax/swing/plaf/basic/BasicScrollBarUI.java
View File

@ -645,8 +645,9 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
/** /**
* This method calculates the preferred size since calling * This method calculates the preferred size since calling
* getPreferredSize() returns a cached value. * getPreferredSize() returns a cached value.
* This is package-private to avoid an accessor method.
*/ */
private void calculatePreferredSize() void calculatePreferredSize()
{ {
// System.err.println(this + ".calculatePreferredSize()"); // System.err.println(this + ".calculatePreferredSize()");
int height; int height;
@ -1248,12 +1249,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
* This method returns the value in the scrollbar's range given the y * This method returns the value in the scrollbar's range given the y
* coordinate. If the value is out of range, it will return the closest * coordinate. If the value is out of range, it will return the closest
* legal value. * legal value.
* This is package-private to avoid an accessor method.
* *
* @param yPos The y coordinate to calculate a value for. * @param yPos The y coordinate to calculate a value for.
* *
* @return The value for the y coordinate. * @return The value for the y coordinate.
*/ */
private int valueForYPosition(int yPos) int valueForYPosition(int yPos)
{ {
int min = scrollbar.getMinimum(); int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum(); int max = scrollbar.getMaximum();
@ -1280,12 +1282,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
* This method returns the value in the scrollbar's range given the x * This method returns the value in the scrollbar's range given the x
* coordinate. If the value is out of range, it will return the closest * coordinate. If the value is out of range, it will return the closest
* legal value. * legal value.
* This is package-private to avoid an accessor method.
* *
* @param xPos The x coordinate to calculate a value for. * @param xPos The x coordinate to calculate a value for.
* *
* @return The value for the x coordinate. * @return The value for the x coordinate.
*/ */
private int valueForXPosition(int xPos) int valueForXPosition(int xPos)
{ {
int min = scrollbar.getMinimum(); int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum(); int max = scrollbar.getMaximum();

3
libjava/javax/swing/plaf/basic/BasicSliderUI.java
View File

@ -2158,12 +2158,13 @@ public class BasicSliderUI extends SliderUI
/** /**
* This method finds the closest value that has a tick associated with it. * This method finds the closest value that has a tick associated with it.
* This is package-private to avoid an accessor method.
* *
* @param value The value to search from. * @param value The value to search from.
* *
* @return The closest value that has a tick associated with it. * @return The closest value that has a tick associated with it.
*/ */
private int findClosestTick(int value) int findClosestTick(int value)
{ {
int min = slider.getMinimum(); int min = slider.getMinimum();
int max = slider.getMaximum(); int max = slider.getMaximum();

8
libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java
View File

@ -1,5 +1,5 @@
/* BasicSplitPaneDivider.java -- /* BasicSplitPaneDivider.java --
Copyright (C) 2003, 2004 Free Software Foundation, Inc. Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath. This file is part of GNU Classpath.
@ -157,8 +157,9 @@ public class BasicSplitPaneDivider extends Container
/** /**
* Keeps track of where the divider should be placed when using one touch * Keeps track of where the divider should be placed when using one touch
* expand buttons. * expand buttons.
* This is package-private to avoid an accessor method.
*/ */
private transient int currentDividerLocation = 1; transient int currentDividerLocation = 1;
/** DOCUMENT ME! */ /** DOCUMENT ME! */
private transient Border tmpBorder = new Border() private transient Border tmpBorder = new Border()
@ -493,10 +494,11 @@ public class BasicSplitPaneDivider extends Container
* using one touch expand buttons. Location 0 is the left (or top) most * using one touch expand buttons. Location 0 is the left (or top) most
* location. Location 1 is the middle. Location 2 is the right (or bottom) * location. Location 1 is the middle. Location 2 is the right (or bottom)
* most location. * most location.
* This is package-private to avoid an accessor method.
* *
* @param locationIndex The location to move to. * @param locationIndex The location to move to.
*/ */
private void moveDividerTo(int locationIndex) void moveDividerTo(int locationIndex)
{ {
Insets insets = splitPane.getInsets(); Insets insets = splitPane.getInsets();
switch (locationIndex) switch (locationIndex)

49
libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
View File

@ -1181,20 +1181,25 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
} }
} }
/** The button that increments the current scroll location. */ /** The button that increments the current scroll location.
private transient ScrollingButton incrButton; * This is package-private to avoid an accessor method. */
transient ScrollingButton incrButton;
/** The button that decrements the current scroll location. */ /** The button that decrements the current scroll location.
private transient ScrollingButton decrButton; * This is package-private to avoid an accessor method. */
transient ScrollingButton decrButton;
/** The viewport used to display the tabs. */ /** The viewport used to display the tabs.
private transient ScrollingViewport viewport; * This is package-private to avoid an accessor method. */
transient ScrollingViewport viewport;
/** The panel inside the viewport that paints the tabs. */ /** The panel inside the viewport that paints the tabs.
private transient ScrollingPanel panel; * This is package-private to avoid an accessor method. */
transient ScrollingPanel panel;
/** The starting visible tab in the run in SCROLL_TAB_MODE. */ /** The starting visible tab in the run in SCROLL_TAB_MODE.
private transient int currentScrollLocation; * This is package-private to avoid an accessor method. */
transient int currentScrollLocation;
/** A reusable rectangle. */ /** A reusable rectangle. */
protected Rectangle calcRect; protected Rectangle calcRect;
@ -1305,14 +1310,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/** The tab pane that this UI paints. */ /** The tab pane that this UI paints. */
protected JTabbedPane tabPane; protected JTabbedPane tabPane;
/** The current layout manager for the tabPane. */ /** The current layout manager for the tabPane.
private transient LayoutManager layoutManager; * This is package-private to avoid an accessor method. */
transient LayoutManager layoutManager;
/** The rectangle that describes the tab area's position and size. */ /** The rectangle that describes the tab area's position and size.
private transient Rectangle tabAreaRect; * This is package-private to avoid an accessor method. */
transient Rectangle tabAreaRect;
/** The rectangle that describes the content area's position and size. */ /** The rectangle that describes the content area's position and
private transient Rectangle contentRect; * size. This is package-private to avoid an accessor method. */
transient Rectangle contentRect;
/** /**
* Creates a new BasicTabbedPaneUI object. * Creates a new BasicTabbedPaneUI object.
@ -1325,10 +1333,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/** /**
* This method creates a ScrollingButton that points in the appropriate * This method creates a ScrollingButton that points in the appropriate
* direction for an increasing button. * direction for an increasing button.
* This is package-private to avoid an accessor method.
* *
* @return The increase ScrollingButton. * @return The increase ScrollingButton.
*/ */
private ScrollingButton createIncreaseButton() ScrollingButton createIncreaseButton()
{ {
if (incrButton == null) if (incrButton == null)
incrButton = new ScrollingButton(SwingConstants.NORTH); incrButton = new ScrollingButton(SwingConstants.NORTH);
@ -1343,10 +1352,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/** /**
* This method creates a ScrollingButton that points in the appropriate * This method creates a ScrollingButton that points in the appropriate
* direction for a decreasing button. * direction for a decreasing button.
* This is package-private to avoid an accessor method.
* *
* @return The decrease ScrollingButton. * @return The decrease ScrollingButton.
*/ */
private ScrollingButton createDecreaseButton() ScrollingButton createDecreaseButton()
{ {
if (decrButton == null) if (decrButton == null)
decrButton = new ScrollingButton(SwingConstants.SOUTH); decrButton = new ScrollingButton(SwingConstants.SOUTH);
@ -1361,12 +1371,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
/** /**
* This method finds the point to set the view position at given the index * This method finds the point to set the view position at given the index
* of a tab. The tab will be the first visible tab in the run. * of a tab. The tab will be the first visible tab in the run.
* This is package-private to avoid an accessor method.
* *
* @param index The index of the first visible tab. * @param index The index of the first visible tab.
* *
* @return The position of the first visible tab. * @return The position of the first visible tab.
*/ */
private Point findPointForIndex(int index) Point findPointForIndex(int index)
{ {
int tabPlacement = tabPane.getTabPlacement(); int tabPlacement = tabPane.getTabPlacement();
int selectedIndex = tabPane.getSelectedIndex(); int selectedIndex = tabPane.getSelectedIndex();

33
libjava/javax/swing/plaf/basic/BasicToolBarUI.java
View File

@ -82,8 +82,9 @@ import javax.swing.plaf.UIResource;
*/ */
public class BasicToolBarUI extends ToolBarUI implements SwingConstants public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{ {
/** Static owner of all DragWindows. */ /** Static owner of all DragWindows.
private static JFrame owner = new JFrame(); * This is package-private to avoid an accessor method. */
static JFrame owner = new JFrame();
/** The border used when the JToolBar is in nonrollover mode. */ /** The border used when the JToolBar is in nonrollover mode. */
private static Border nonRolloverBorder; private static Border nonRolloverBorder;
@ -94,8 +95,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
/** The last known BorderLayout constraint before floating. */ /** The last known BorderLayout constraint before floating. */
protected String constraintBeforeFloating; protected String constraintBeforeFloating;
/** The last known orientation of the JToolBar before floating. */ /** The last known orientation of the JToolBar before floating.
private int lastGoodOrientation; * This is package-private to avoid an accessor method. */
int lastGoodOrientation;
/** The color of the border when it is dockable. */ /** The color of the border when it is dockable. */
protected Color dockingBorderColor; protected Color dockingBorderColor;
@ -136,20 +138,24 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
*/ */
private transient Window floatFrame; private transient Window floatFrame;
/** The original parent of the JToolBar. */ /** The original parent of the JToolBar.
private transient Container origParent; * This is package-private to avoid an accessor method. */
transient Container origParent;
/** A hashtable of components and their original borders. */ /** A hashtable of components and their original borders.
private transient Hashtable borders; * This is package-private to avoid an accessor method. */
transient Hashtable borders;
/** A window listener for the floatable frame. */ /** A window listener for the floatable frame. */
private transient WindowListener windowListener; private transient WindowListener windowListener;
/** A set of cached bounds of the JToolBar. */ /** A set of cached bounds of the JToolBar.
private transient Dimension cachedBounds; * This is package-private to avoid an accessor method. */
transient Dimension cachedBounds;
/** The cached orientation of the JToolBar. */ /** The cached orientation of the JToolBar.
private transient int cachedOrientation; * This is package-private to avoid an accessor method. */
transient int cachedOrientation;
/** /**
* This method creates a new <code>BasicToolBarUI</code> object for the given JToolBar. * This method creates a new <code>BasicToolBarUI</code> object for the given JToolBar.
@ -1086,8 +1092,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
/** /**
* Creates a new DragWindow object. * Creates a new DragWindow object.
* This is package-private to avoid an accessor method.
*/ */
private DragWindow() DragWindow()
{ {
super(owner); super(owner);
} }

3
libjava/javax/swing/text/JTextComponent.java
View File

@ -883,7 +883,8 @@ public abstract class JTextComponent extends JComponent
return getUI().getEditorKit(this).getActions(); return getUI().getEditorKit(this).getActions();
} }
private Document doc; // This is package-private to avoid an accessor method.
Document doc;
private Caret caret; private Caret caret;
private Highlighter highlighter; private Highlighter highlighter;
private Color caretColor; private Color caretColor;

9
libjava/javax/swing/text/StringContent.java
View File

@ -56,7 +56,8 @@ import javax.swing.undo.UndoableEdit;
*/ */
public final class StringContent implements AbstractDocument.Content, Serializable public final class StringContent implements AbstractDocument.Content, Serializable
{ {
private char[] content; // This is package-private to avoid an accessor method.
char[] content;
private int count; private int count;
@ -156,7 +157,8 @@ public final class StringContent implements AbstractDocument.Content, Serializab
this.offset = offset; this.offset = offset;
} }
private void setOffset(int offset) // This is package-private to avoid an accessor method.
void setOffset(int offset)
{ {
this.offset = this.offset >= 0 ? offset : -1; this.offset = this.offset >= 0 ? offset : -1;
} }
@ -290,7 +292,8 @@ public final class StringContent implements AbstractDocument.Content, Serializab
} }
} }
private void checkLocation(int where, int len) throws BadLocationException // This is package-private to avoid an accessor method.
void checkLocation(int where, int len) throws BadLocationException
{ {
if (where < 0) if (where < 0)
throw new BadLocationException("Invalid location", 1); throw new BadLocationException("Invalid location", 1);

9
libjava/javax/swing/text/html/parser/DocumentParser.java
View File

@ -144,19 +144,22 @@ public class DocumentParser
/** /**
* This field is used to access the identically named * This field is used to access the identically named
* methods of the outer class. * methods of the outer class.
* This is package-private to avoid an accessor method.
*/ */
private DocumentParser parser = this; DocumentParser parser = this;
/** /**
* The callback. * The callback.
* This is package-private to avoid an accessor method.
*/ */
private HTMLEditorKit.ParserCallback callBack; HTMLEditorKit.ParserCallback callBack;
/** /**
* The reference to the working class of HTML parser that is * The reference to the working class of HTML parser that is
* actually used to parse the document. * actually used to parse the document.
* This is package-private to avoid an accessor method.
*/ */
private gnuParser gnu; gnuParser gnu;
/** /**
* Creates a new parser that uses the given DTD to access data on the * Creates a new parser that uses the given DTD to access data on the

6
libjava/javax/swing/text/html/parser/ParserDelegator.java
View File

@ -126,14 +126,16 @@ public class ParserDelegator
/** /**
* The callback. * The callback.
* This is package-private to avoid an accessor method.
*/ */
private HTMLEditorKit.ParserCallback callBack; HTMLEditorKit.ParserCallback callBack;
/** /**
* The reference to the working class of HTML parser that is * The reference to the working class of HTML parser that is
* actually used to parse the document. * actually used to parse the document.
* This is package-private to avoid an accessor method.
*/ */
private gnuParser gnu; gnuParser gnu;
/** /**
* Parses the HTML document, calling methods of the provided * Parses the HTML document, calling methods of the provided