[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] Patch: RFC: removing accessor methods
|
From: |
Tom Tromey |
|
Subject: |
[cp-patches] Patch: RFC: removing accessor methods |
|
Date: |
19 Sep 2004 17:37:37 -0600 |
This jumbo patch fixes almost all the instances of private member
access requiring trampoline methods that were found by gcjx.
Some background: an inner class is permitted to access a private
member of its outer class. However, the runtime will reject accesses
to private members, so the compiler is required to generate a
trampoline method for the access. These methods can easily be avoided
by changing these members to be package-private. This is more
efficient, and in my opinion does not negatively affect
maintainability.
Seeing as this patch is fairly large, I thought I'd give people some
time to look it over before I check it in. I'll apply it to libgcj at
the same time (I suppose separating parts out for the GUI branch).
In addition to this I propose we adopt this as part of our coding
style. I can prepare a patch against the documentation for this.
Even after this patch there is one remaining instance of this problem:
/home/tromey/gnu/classpath/classpath//java/net/URLClassLoader.java:817:11:
warning: method `java.security.SecureClassLoader.defineClass (java.lang.String,
byte[], int, int, java.security.CodeSource)' requires forwarding call
/home/tromey/gnu/classpath/classpath//java/security/SecureClassLoader.java:80:36:
warning: method is defined here
Fixing this would require adding an explicit helper method to
URLClassLoader -- but in this case we might as well let the compiler
do it for us. (This particular warning comes from referencing a
protected member that is inherited by the outer class; so it is not
quite the same as referencing a private member.)
Any comments? Concerns? Objections?
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* javax/swing/SwingUtilities.java (OwnerFrame): New
package-private constructor.
* javax/swing/border/TitledBorder.java (Measurements): New
package-private constructor.
* javax/swing/colorchooser/DefaultHSBChooserPanel.java (locked):
Now package-private.
(updateSlider): Likewise.
(slider): Likewise.
(gradientImage): Likewise.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(ScrollingPanelUI): New package-private constructor.
(ScrollingViewport): Likewise.
(ScrollingPanel): Likewise.
(TabbedPaneScrollLayout): Likewise.
(DefaultToolBarLayout): Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java
(InternalFrameBorder): New package-private constructor.
* javax/swing/plaf/basic/BasicIconFactory.java (DummyIcon): New
package-private constructor.
* javax/swing/plaf/basic/BasicProgressBarUI.java
(PropertyChangeHandler): New package-private constructor.
(Animator): Likewise.
* javax/swing/plaf/basic/BasicSpinnerUI.java
(DefaultLayoutManager): New package-private constructor.
* javax/swing/JList.java (ListListener): New package-private
constructor.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
(BufferedImageBuilder): New package-private constructor.
* javax/swing/Timer.java (queueEvent): Now package-private.
(drainEvents): Likewise.
(Waker): New package-private constructor.
* javax/swing/colorchooser/DefaultRGBChooserPanel.java
(internalChange): Now package-private.
(R, G, B): Likewise.
(RSpinner, GSpinner, BSpinner): Likewise.
* javax/swing/colorchooser/DefaultHSBChooserPanel.java
(internalChange): Now package-private.
(hSpinner): Likewise.
(sSpinner): Likewise.
(bSpinner): Likewise.
(spinnerTrigger): Likewise.
(handlingMouse): Likewise.
(updateImage): Likewise.
(updateTrack): Likewise.
(gradientPoint): Likewise.
(hRadio): Likewise.
(sRadio): Likewise.
(trackImage): Likewise.
* javax/swing/colorchooser/DefaultSwatchChooserPanel.java
(addColorToQueue): Now package-private.
* javax/swing/JColorChooser.java (makeModal): Now
package-private.
* javax/swing/text/StyleConstants.java (StyleConstants): Now
package-private.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java (incrButton): Now
package-private.
(currentScrollLocation): Likewise.
(decrButton): Likewise.
(layoutManager): Likewise.
(createIncreaseButton): Likewise.
(createDecreaseButton): Likewise.
(contentRect): Likewise.
(tabAreaRect): Likewise.
(findPointForIndex): Likewise.
(panel): Likewise.
(viewport): Likewise.
* javax/swing/plaf/basic/BasicDesktopIconUI.java (button): Now
package-private.
(DesktopIconBorder): New package-private constructor.
* javax/swing/plaf/basic/BasicOptionPaneUI.java (OK_STRING): Now
final.
(YES_STRING, NO_STRING, CANCEL_STRING): Likewise.
(messageAreaContainer): Now package-private.
(resetSelectedValue): Likewise.
(buttonContainer): Likewise.
(iconSize): Likewise.
(messageIcon): New package-private constructor.
* javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
(title): Now package-private.
* javax/swing/plaf/basic/BasicArrowButton.java (darkShadow): Now
package-private.
(shadow): Likewise.
(highlight): Likewise.
* javax/swing/plaf/basic/BasicScrollBarUI.java (POSITIVE_SCROLL):
Now final.
(DECREASE_HIGHLIGHT, INCREASE_HIGHLIGHT, NO_HIGHLIGHT,
NEGATIVE_SCROLL): Likewise.
(calculatePreferredSize) Now package-private.
(valueForXPosition): Likewise.
(valueForYPosition): Likewise.
* javax/swing/plaf/basic/BasicComboBoxUI.java (largestItemSize):
Likewise.
(arrowButtonWidth): Likewise.
(borderInsets): Likewise.
(MouseHandler) New package-private constructor.
* javax/swing/plaf/basic/BasicColorChooserUI.java (pane): Now
package-private.
(chooser): Likewise.
(makeTabs): Likewise.
(updatePreviewPanel): Likewise.
(PreviewListener): New package-private constructor.
(TabPaneListener): Likewise.
* javax/swing/plaf/basic/BasicSplitPaneDivider.java
(currentDividerLocation): Now package-private.
(moveDividerTo): Likewise.
* javax/swing/plaf/basic/BasicToolBarUI.java (origParent): Now
package-private.
(lastGoodOrientation): Likewise.
(borders): Likewise.
(cachedBounds): Likewise.
(cachedOrientation): Likewise.
(DragWindow): Likewise.
(ToolBarBorder): Likewise.
(owner): Now package-private.
* javax/swing/plaf/basic/BasicSliderUI.java (findClosestTick): Now
package-private.
* javax/swing/plaf/basic/BasicPopupMenuUI.java
(TopWindowListener): Now package-private.
(PopupMenuHandler): New package-private constructor.
(MouseInputHandler): Likewise.
(TopWindowListener): Likewise.
* javax/swing/JScrollBar.java (fireStateChanged): Now
package-private.
* javax/swing/ToolTipManager.java (showTip): Now package-private.
(hideTip): Likewise.
* javax/swing/RepaintManager.java (globalManager): Now
package-private.
* javax/naming/directory/BasicAttributes.java (attributes): Now
package-private.
* javax/imageio/spi/ServiceRegistry.java (categories): Now
package-private.
* java/awt/Window.java (windowFocusOwner): Now package-private.
* java/awt/geom/GeneralPath.java (rule): Now package-private.
(index): Likewise.
(types): Likewise.
(xpoints): Likewise.
(ypoints): Likewise.
* java/awt/geom/Arc2D.java (type): Now package-private.
* java/awt/geom/Area.java (solids): Now package-private.
(holes): Likewise.
(cubicCubicIntersect): Likewise.
(linesIntersect): Likewise.
(lineQuadIntersect): Likewise.
(lineCubicIntersect): Likewise.
(pointEquals): Likewise.
* java/awt/AWTKeyStroke.java (vktable): Now package-private.
* java/awt/MenuComponent.java (focusListener): Now
package-private.
* java/io/ObjectOutputStream.java (currentObjectStreamClass): Now
package-private.
(setBlockDataMode): Likewise.
* java/io/DeleteFileHelper.java (DeleteFileHelper): Now
package-private.
* java/nio/charset/CoderResult.java (CoderResult): Now
package-private.
(Cache): Likewise.
(get): Likewise.
* java/rmi/server/RMIClassLoader.java (MyClassLoader): Now
package-private.
* java/util/TimeZone.java (timezones): Now package-private.
* java/security/Permissions.java (perms): Now package-private.
* java/security/UnresolvedPermission.java (permissions): Now
package-private.
* java/net/URLClassLoader.java (URLClassLoader): Now
package-private.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java (paint, stroke, fg, bg,
clip, transform, font, comp, stateSave, drawPixels, stateRestore):
Now package-private.
* gnu/java/nio/charset/ISO_8859_1.java (Decoder): Now
package-private.
(Encoder): Likewise.
* gnu/java/nio/charset/UTF_8.java (Decoder): Now package-private.
(Encoder): Likewise.
* gnu/java/nio/charset/US_ASCII.java (Decoder): Now
package-private.
(Encoder): Likewise.
* gnu/java/rmi/server/UnicastConnectionManager.java (clients): Now
package-private.
(connections): Likewise.
(scavenger): Likewise.
* gnu/java/rmi/server/ConnectionRunnerPool.java (freelist): Now
package-private.
* gnu/java/rmi/server/UnicastRemoteCall.java (vec): Now
package-private.
(ptr): Likewise.
* gnu/java/security/PolicyFile.java (debug): Now package-private.
* gnu/classpath/ServiceFactory.java (log): Now package-private.
* vm/reference/java/lang/VMProcess.java (VMProcess): Constructor
now package-private.
Index: gnu/classpath/ServiceFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/ServiceFactory.java,v
retrieving revision 1.2
diff -u -r1.2 ServiceFactory.java
--- gnu/classpath/ServiceFactory.java 23 Apr 2004 21:13:20 -0000 1.2
+++ gnu/classpath/ServiceFactory.java 19 Sep 2004 23:36:01 -0000
@@ -542,7 +542,7 @@
* <code>null</code> if the log message is not associated with a
* Throwable.
*/
- private static void log(Level level, String msg, Object param, Throwable t)
+ static void log(Level level, String msg, Object param, Throwable t)
{
LogRecord rec;
Index: gnu/java/awt/peer/gtk/GdkGraphics2D.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,v
retrieving revision 1.16
diff -u -r1.16 GdkGraphics2D.java
--- gnu/java/awt/peer/gtk/GdkGraphics2D.java 5 Sep 2004 15:02:51 -0000 1.16
+++ gnu/java/awt/peer/gtk/GdkGraphics2D.java 19 Sep 2004 23:36:02 -0000
@@ -74,18 +74,18 @@
native static void initStaticState ();
private final int native_state = GtkGenericPeer.getUniqueInteger();
- private Paint paint;
- private Stroke stroke;
- private Color fg;
- private Color bg;
- private Shape clip;
- private AffineTransform transform;
+ Paint paint;
+ Stroke stroke;
+ Color fg;
+ Color bg;
+ Shape clip;
+ AffineTransform transform;
private GtkComponentPeer component;
- private Font font;
+ Font font;
private RenderingHints hints;
private BufferedImage bimage;
- private Composite comp;
+ Composite comp;
private Stack stateStack;
@@ -214,7 +214,7 @@
private native void gdkDrawDrawable (GdkGraphics2D other, int x, int y);
// drawing utility methods
- private native void drawPixels (int pixels[], int w, int h, int stride,
double i2u[]);
+ native void drawPixels (int pixels[], int w, int h, int stride, double
i2u[]);
private native void setTexturePixels (int pixels[], int w, int h, int
stride);
private native void setGradient (double x1, double y1,
double x2, double y2,
@@ -296,13 +296,13 @@
}
}
- private void stateSave ()
+ void stateSave ()
{
stateStack.push (new DrawState (this));
cairoSave ();
}
- private void stateRestore ()
+ void stateRestore ()
{
((DrawState)(stateStack.pop ())).restore (this);
cairoRestore ();
Index: gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,v
retrieving revision 1.6
diff -u -r1.6 GdkPixbufDecoder.java
--- gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 22 Jul 2004 19:45:38 -0000 1.6
+++ gnu/java/awt/peer/gtk/GdkPixbufDecoder.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* GdkPixbufDecoder.java -- Image data decoding object
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -155,6 +155,10 @@
BufferedImage bufferedImage;
ColorModel defaultModel;
+ BufferedImageBuilder()
+ {
+ }
+
public BufferedImage getBufferedImage()
{
return bufferedImage;
Index: gnu/java/nio/charset/ISO_8859_1.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/ISO_8859_1.java,v
retrieving revision 1.2
diff -u -r1.2 ISO_8859_1.java
--- gnu/java/nio/charset/ISO_8859_1.java 8 Nov 2002 14:05:22 -0000 1.2
+++ gnu/java/nio/charset/ISO_8859_1.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* ISO_8859_1.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -73,7 +73,7 @@
private static final class Decoder extends CharsetDecoder
{
- private Decoder (Charset cs)
+ Decoder (Charset cs)
{
super (cs, 1.0f, 1.0f);
}
@@ -100,7 +100,7 @@
private static final class Encoder extends CharsetEncoder
{
- private Encoder (Charset cs)
+ Encoder (Charset cs)
{
super (cs, 1.0f, 1.0f);
}
Index: gnu/java/nio/charset/US_ASCII.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/US_ASCII.java,v
retrieving revision 1.2
diff -u -r1.2 US_ASCII.java
--- gnu/java/nio/charset/US_ASCII.java 8 Nov 2002 14:05:22 -0000 1.2
+++ gnu/java/nio/charset/US_ASCII.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* US_ASCII.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -73,7 +73,7 @@
private static final class Decoder extends CharsetDecoder
{
- private Decoder (Charset cs)
+ Decoder (Charset cs)
{
super (cs, 1.0f, 1.0f);
}
@@ -105,7 +105,7 @@
private static final class Encoder extends CharsetEncoder
{
- private Encoder (Charset cs)
+ Encoder (Charset cs)
{
super (cs, 1.0f, 1.0f);
}
Index: gnu/java/nio/charset/UTF_8.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/UTF_8.java,v
retrieving revision 1.2
diff -u -r1.2 UTF_8.java
--- gnu/java/nio/charset/UTF_8.java 8 Nov 2002 14:05:22 -0000 1.2
+++ gnu/java/nio/charset/UTF_8.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* UTF_8.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -84,7 +84,7 @@
private static final class Decoder extends CharsetDecoder
{
- private Decoder (Charset cs)
+ Decoder (Charset cs)
{
super (cs, 1.0f, 1.0f);
}
@@ -171,7 +171,7 @@
private static final class Encoder extends CharsetEncoder
{
- private Encoder (Charset cs)
+ Encoder (Charset cs)
{
// According to
//
http://www-106.ibm.com/developerworks/unicode/library/utfencodingforms/index.html
Index: gnu/java/rmi/server/ConnectionRunnerPool.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java,v
retrieving revision 1.2
diff -u -r1.2 ConnectionRunnerPool.java
--- gnu/java/rmi/server/ConnectionRunnerPool.java 31 Oct 2002 18:35:21 -0000 1.2
+++ gnu/java/rmi/server/ConnectionRunnerPool.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* gnu.java.rmi.server.ConnectionRunnerPool
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -95,7 +95,7 @@
private static int size = 5;
private static int max_size = 10;
- private static ArrayList freelist;
+ static ArrayList freelist;
private static ThreadGroup group = new ThreadGroup("pool");
Index: gnu/java/rmi/server/UnicastConnectionManager.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/rmi/server/UnicastConnectionManager.java,v
retrieving revision 1.6
diff -u -r1.6 UnicastConnectionManager.java
--- gnu/java/rmi/server/UnicastConnectionManager.java 21 Mar 2004 10:10:14
-0000 1.6
+++ gnu/java/rmi/server/UnicastConnectionManager.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/*
- Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+ Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation,
Inc.
This file is part of GNU Classpath.
@@ -67,8 +67,8 @@
private static String localhost;
// use different maps for server/client type UnicastConnectionManager
private static Hashtable servers = new Hashtable();
-private static Hashtable clients = new Hashtable();
-private ArrayList connections; //client connection pool
+static Hashtable clients = new Hashtable();
+ArrayList connections; //client connection pool
// make serverThread volatile for poll
private volatile Thread serverThread;
@@ -76,7 +76,7 @@
String serverName;
int serverPort;
-static private Thread scavenger;
+static Thread scavenger;
// If client and server are in the same VM, serverobj represents server
Object serverobj;
Index: gnu/java/rmi/server/UnicastRemoteCall.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/rmi/server/UnicastRemoteCall.java,v
retrieving revision 1.9
diff -u -r1.9 UnicastRemoteCall.java
--- gnu/java/rmi/server/UnicastRemoteCall.java 21 Mar 2004 10:10:14 -0000 1.9
+++ gnu/java/rmi/server/UnicastRemoteCall.java 19 Sep 2004 23:36:02 -0000
@@ -1,5 +1,5 @@
/* UnicastRemoteCall.java
- Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+ Copyright (c) 1996, 1997, 1998, 1999, 2002, 2004 Free Software Foundation,
Inc.
This file is part of GNU Classpath.
@@ -63,8 +63,9 @@
private Object object;
private int opnum;
private long hash;
- private Vector vec;
- private int ptr;
+ // These are package-private due to inner class access.
+ Vector vec;
+ int ptr;
private ObjID objid;
private ObjectOutput oout;
Index: gnu/java/security/PolicyFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/PolicyFile.java,v
retrieving revision 1.1
diff -u -r1.1 PolicyFile.java
--- gnu/java/security/PolicyFile.java 3 Jun 2004 09:16:57 -0000 1.1
+++ gnu/java/security/PolicyFile.java 19 Sep 2004 23:36:02 -0000
@@ -143,7 +143,7 @@
// -------------------------------------------------------------------------
private static final boolean DEBUG = true;
- private static void debug(String msg)
+ static void debug(String msg)
{
System.err.print(">> PolicyFile: ");
System.err.println(msg);
Index: java/awt/AWTKeyStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/AWTKeyStroke.java,v
retrieving revision 1.5
diff -u -r1.5 AWTKeyStroke.java
--- java/awt/AWTKeyStroke.java 31 Jul 2004 16:39:15 -0000 1.5
+++ java/awt/AWTKeyStroke.java 19 Sep 2004 23:36:03 -0000
@@ -1,5 +1,5 @@
/* AWTKeyStroke.java -- an immutable key stroke
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -112,7 +112,7 @@
*
* @see #getAWTKeyStroke(String)
*/
- private static final HashMap vktable = new HashMap();
+ static final HashMap vktable = new HashMap();
static
{
// Using reflection saves the hassle of keeping this in sync with KeyEvent,
Index: java/awt/MenuComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuComponent.java,v
retrieving revision 1.16
diff -u -r1.16 MenuComponent.java
--- java/awt/MenuComponent.java 11 Sep 2004 12:22:02 -0000 1.16
+++ java/awt/MenuComponent.java 19 Sep 2004 23:36:03 -0000
@@ -1,5 +1,5 @@
/* MenuComponent.java -- Superclass of all AWT menu components
- Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -161,7 +161,7 @@
* @see
AccessibleAWTMenuComponent#addFocusListener(java.awt.event.FocusListener)
* @serial ignored.
*/
- private transient FocusListener focusListener;
+ transient FocusListener focusListener;
/*************************************************************************/
Index: java/awt/Window.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v
retrieving revision 1.35
diff -u -r1.35 Window.java
--- java/awt/Window.java 22 Jul 2004 19:45:38 -0000 1.35
+++ java/awt/Window.java 19 Sep 2004 23:36:03 -0000
@@ -1,5 +1,5 @@
/* Window.java --
- Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation
+ Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -87,7 +87,7 @@
private transient boolean shown;
- private transient Component windowFocusOwner;
+ transient Component windowFocusOwner;
/**
* This (package access) constructor is used by subclasses that want
Index: java/awt/geom/Arc2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/Arc2D.java,v
retrieving revision 1.8
diff -u -r1.8 Arc2D.java
--- java/awt/geom/Arc2D.java 7 Sep 2004 16:01:50 -0000 1.8
+++ java/awt/geom/Arc2D.java 19 Sep 2004 23:36:04 -0000
@@ -74,7 +74,7 @@
public static final int PIE = 2;
/** The closure type of this arc. */
- private int type;
+ int type;
/**
* Create a new arc, with the specified closure type.
Index: java/awt/geom/Area.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/Area.java,v
retrieving revision 1.4
diff -u -r1.4 Area.java
--- java/awt/geom/Area.java 8 Sep 2004 20:10:52 -0000 1.4
+++ java/awt/geom/Area.java 19 Sep 2004 23:36:04 -0000
@@ -90,12 +90,12 @@
/**
* Segment vectors containing solid areas and holes
*/
- private Vector solids;
+ Vector solids;
/**
* Segment vectors containing solid areas and holes
*/
- private Vector holes;
+ Vector holes;
/**
* Vector (temporary) storing curve-curve intersections
@@ -1316,8 +1316,8 @@
* is typically around 20, the bounding-box tests allow for significant
* pruning of the subdivision tree.
*/
- private Intersection[] cubicCubicIntersect(CubicSegment curve1,
- CubicSegment curve2)
+ Intersection[] cubicCubicIntersect(CubicSegment curve1,
+ CubicSegment curve2)
{
Rectangle2D r1 = curve1.getBounds();
Rectangle2D r2 = curve2.getBounds();
@@ -1350,7 +1350,7 @@
* This is done through combining the line's equation with the
* parametric form of the Bezier and solving the resulting quadratic.
*/
- private Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c)
+ Intersection[] lineQuadIntersect(LineSegment l, QuadSegment c)
{
double[] y = new double[3];
double[] x = new double[3];
@@ -1454,7 +1454,7 @@
* This is done through combining the line's equation with the
* parametric form of the Bezier and solving the resulting quadratic.
*/
- private Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c)
+ Intersection[] lineCubicIntersect(LineSegment l, CubicSegment c)
{
double[] y = new double[4];
double[] x = new double[4];
@@ -1561,7 +1561,7 @@
* Returns the intersection between two lines, or null if there is no
* intersection.
*/
- private Intersection linesIntersect(LineSegment a, LineSegment b)
+ Intersection linesIntersect(LineSegment a, LineSegment b)
{
Point2D P1 = a.P1;
Point2D P2 = a.P2;
@@ -1606,7 +1606,7 @@
* Determines if two points are equal, within an error margin
* 'snap distance'
*/
- private boolean pointEquals(Point2D a, Point2D b)
+ boolean pointEquals(Point2D a, Point2D b)
{
return (a.equals(b) || a.distance(b) < PE_EPSILON);
}
Index: java/awt/geom/GeneralPath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/GeneralPath.java,v
retrieving revision 1.8
diff -u -r1.8 GeneralPath.java
--- java/awt/geom/GeneralPath.java 7 Sep 2004 16:01:50 -0000 1.8
+++ java/awt/geom/GeneralPath.java 19 Sep 2004 23:36:04 -0000
@@ -88,14 +88,14 @@
private static final double BIG_VALUE = java.lang.Double.MAX_VALUE / 10.0;
/** The winding rule. */
- private int rule;
+ 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.
*/
- private byte[] types;
+ byte[] types;
/**
* The list of all points seen. Since you can only append floats, it makes
@@ -104,14 +104,14 @@
* Note: Storing x and y coords seperately makes for a slower transforms,
* But it speeds up and simplifies box-intersection checking a lot.
*/
- 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;
+ int index;
/**
* Constructs a GeneralPath with the default (NON_ZERO)
Index: java/io/DeleteFileHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/DeleteFileHelper.java,v
retrieving revision 1.3
diff -u -r1.3 DeleteFileHelper.java
--- java/io/DeleteFileHelper.java 4 Sep 2004 18:13:44 -0000 1.3
+++ java/io/DeleteFileHelper.java 19 Sep 2004 23:36:05 -0000
@@ -97,7 +97,7 @@
}
}
- private DeleteFileHelper()
+ DeleteFileHelper()
{
}
Index: java/io/ObjectOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v
retrieving revision 1.46
diff -u -r1.46 ObjectOutputStream.java
--- java/io/ObjectOutputStream.java 23 Jul 2004 22:29:01 -0000 1.46
+++ java/io/ObjectOutputStream.java 19 Sep 2004 23:36:05 -0000
@@ -1,5 +1,5 @@
/* ObjectOutputStream.java -- Class used to write serialized objects
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
Foundation, Inc.
This file is part of GNU Classpath.
@@ -1237,7 +1237,7 @@
// Toggles writing primitive data to block-data buffer.
- private boolean setBlockDataMode(boolean on) throws IOException
+ boolean setBlockDataMode(boolean on) throws IOException
{
if (on == writeDataAsBlocks)
return on;
@@ -1561,7 +1561,7 @@
private byte[] blockData;
private int blockDataCount;
private Object currentObject;
- private ObjectStreamClass currentObjectStreamClass;
+ ObjectStreamClass currentObjectStreamClass;
private PutField currentPutField;
private boolean fieldsAlreadyWritten;
private boolean replacementEnabled;
Index: java/lang/Throwable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v
retrieving revision 1.24
diff -u -r1.24 Throwable.java
--- java/lang/Throwable.java 20 May 2004 14:35:17 -0000 1.24
+++ java/lang/Throwable.java 19 Sep 2004 23:36:06 -0000
@@ -401,8 +401,9 @@
*/
private static class StaticData
{
-
- private final static String nl;
+ // This is not `private' since we don't want to have to generate
+ // an accessor method.
+ final static String nl;
static
{
Index: java/net/URLClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLClassLoader.java,v
retrieving revision 1.21
diff -u -r1.21 URLClassLoader.java
--- java/net/URLClassLoader.java 23 Apr 2004 21:13:20 -0000 1.21
+++ java/net/URLClassLoader.java 19 Sep 2004 23:36:06 -0000
@@ -1,5 +1,5 @@
/* URLClassLoader.java -- ClassLoader that loads classes from one or more URLs
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation,
Inc.
This file is part of GNU Classpath.
@@ -586,8 +586,7 @@
*
* @param securityContext the security context of the unprivileged code.
*/
- private URLClassLoader(ClassLoader parent,
- AccessControlContext securityContext)
+ URLClassLoader(ClassLoader parent, AccessControlContext securityContext)
{
super(parent);
this.factory = null;
Index: java/nio/charset/CoderResult.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/charset/CoderResult.java,v
retrieving revision 1.5
diff -u -r1.5 CoderResult.java
--- java/nio/charset/CoderResult.java 18 Nov 2002 21:34:15 -0000 1.5
+++ java/nio/charset/CoderResult.java 19 Sep 2004 23:36:06 -0000
@@ -1,5 +1,5 @@
/* CoderResult.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -82,7 +82,7 @@
private final int type;
private final int length;
- private CoderResult (int type, int length)
+ CoderResult (int type, int length)
{
this.type = type;
this.length = length;
@@ -157,19 +157,12 @@
{
private final HashMap cache;
- private Cache ()
+ Cache ()
{
- // If we didn't synchronize on this, then cache would be initialized
- // without holding a lock. Undefined behavior would occur if the
- // first thread to call get(int) was not the same as the one that
- // called the constructor.
- synchronized (this)
- {
- cache = new HashMap ();
- }
+ cache = new HashMap ();
}
- private synchronized CoderResult get (int length)
+ synchronized CoderResult get (int length)
{
if (length <= 0)
throw new IllegalArgumentException ("Non-positive length");
Index: java/rmi/server/RMIClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/RMIClassLoader.java,v
retrieving revision 1.10
diff -u -r1.10 RMIClassLoader.java
--- java/rmi/server/RMIClassLoader.java 15 Nov 2003 22:42:00 -0000 1.10
+++ java/rmi/server/RMIClassLoader.java 19 Sep 2004 23:36:06 -0000
@@ -1,5 +1,5 @@
/* RMIClassLoader.java
- Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003
+ Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,7 +57,7 @@
{
static private class MyClassLoader extends URLClassLoader
{
- private MyClassLoader (URL[] urls, ClassLoader parent, String annotation)
+ MyClassLoader (URL[] urls, ClassLoader parent, String annotation)
{
super (urls, parent);
this.annotation = annotation;
Index: java/security/Permissions.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Permissions.java,v
retrieving revision 1.7
diff -u -r1.7 Permissions.java
--- java/security/Permissions.java 29 Mar 2002 08:30:51 -0000 1.7
+++ java/security/Permissions.java 19 Sep 2004 23:36:06 -0000
@@ -1,5 +1,5 @@
/* Permissions.java -- a collection of permission collections
- Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -76,7 +76,7 @@
*
* @serial maps Class to PermissionCollection
*/
- private final Hashtable perms = new Hashtable();
+ final Hashtable perms = new Hashtable();
/**
* This method initializes a new instance of <code>Permissions</code>.
Index: java/security/UnresolvedPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/UnresolvedPermission.java,v
retrieving revision 1.7
diff -u -r1.7 UnresolvedPermission.java
--- java/security/UnresolvedPermission.java 23 Apr 2004 20:34:11 -0000 1.7
+++ java/security/UnresolvedPermission.java 19 Sep 2004 23:36:06 -0000
@@ -1,5 +1,5 @@
/* UnresolvedPermission.java -- Placeholder for unresolved permissions
- Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -221,7 +221,7 @@
* @serial map of typename to a Vector of permissions (you'd think Sun
* would document this better!)
*/
- private final Hashtable permissions = new Hashtable();
+ final Hashtable permissions = new Hashtable();
/**
* Add a permission.
Index: java/util/TimeZone.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/TimeZone.java,v
retrieving revision 1.26
diff -u -r1.26 TimeZone.java
--- java/util/TimeZone.java 7 Sep 2004 07:39:19 -0000 1.26
+++ java/util/TimeZone.java 19 Sep 2004 23:36:07 -0000
@@ -134,7 +134,7 @@
/* initialize this static field lazily to overhead if
* it is not needed:
*/
- private static synchronized HashMap timezones()
+ static synchronized HashMap timezones()
{
if (timezones0 == null)
{
Index: javax/imageio/spi/ServiceRegistry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/spi/ServiceRegistry.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceRegistry.java
--- javax/imageio/spi/ServiceRegistry.java 24 Mar 2004 07:41:40 -0000 1.1
+++ javax/imageio/spi/ServiceRegistry.java 19 Sep 2004 23:36:07 -0000
@@ -63,7 +63,7 @@
*
* @see #providers
*/
- private final Class[] categories;
+ final Class[] categories;
/**
Index: javax/naming/directory/BasicAttributes.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/naming/directory/BasicAttributes.java,v
retrieving revision 1.2
diff -u -r1.2 BasicAttributes.java
--- javax/naming/directory/BasicAttributes.java 27 Jun 2003 21:03:53 -0000 1.2
+++ javax/naming/directory/BasicAttributes.java 19 Sep 2004 23:36:07 -0000
@@ -1,5 +1,5 @@
/* BasicAttributes.java --
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -184,7 +184,7 @@
// This is set by the serialization spec.
private boolean ignoreCase;
- private transient Vector attributes;
+ transient Vector attributes;
// Used when enumerating.
private class BasicAttributesEnumeration implements NamingEnumeration
Index: javax/swing/JColorChooser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JColorChooser.java,v
retrieving revision 1.4
diff -u -r1.4 JColorChooser.java
--- javax/swing/JColorChooser.java 4 Sep 2004 20:31:20 -0000 1.4
+++ javax/swing/JColorChooser.java 19 Sep 2004 23:36:07 -0000
@@ -234,7 +234,7 @@
*
* @param dialog The JDialog to block.
*/
- private static void makeModal(JDialog dialog)
+ static void makeModal(JDialog dialog)
{
try
{
Index: javax/swing/JList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JList.java,v
retrieving revision 1.17
diff -u -r1.17 JList.java
--- javax/swing/JList.java 5 Sep 2004 11:31:06 -0000 1.17
+++ javax/swing/JList.java 19 Sep 2004 23:36:08 -0000
@@ -1,5 +1,5 @@
/* JList.java --
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -276,6 +276,10 @@
private class ListListener
implements ListSelectionListener, ListDataListener
{
+ ListListener()
+ {
+ }
+
// ListDataListener events
public void contentsChanged(ListDataEvent event)
{
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollBar.java,v
retrieving revision 1.8
diff -u -r1.8 JScrollBar.java
--- javax/swing/JScrollBar.java 26 Jun 2004 16:07:01 -0000 1.8
+++ javax/swing/JScrollBar.java 19 Sep 2004 23:36:08 -0000
@@ -578,7 +578,7 @@
* propagate the ChangeEvent to its listeners with a new ChangeEvent that
* identifies the scroll bar as the source.
*/
- private void fireStateChanged()
+ void fireStateChanged()
{
Object[] changeListeners = listenerList.getListenerList();
if (changeEvent == null)
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToolBar.java,v
retrieving revision 1.7
diff -u -r1.7 JToolBar.java
--- javax/swing/JToolBar.java 30 Jul 2004 20:21:19 -0000 1.7
+++ javax/swing/JToolBar.java 19 Sep 2004 23:36:08 -0000
@@ -107,6 +107,10 @@
*/
private class DefaultToolBarLayout implements LayoutManager
{
+ DefaultToolBarLayout()
+ {
+ }
+
/**
* This method is called when a new component is added to the container.
*
Index: javax/swing/RepaintManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/RepaintManager.java,v
retrieving revision 1.7
diff -u -r1.7 RepaintManager.java
--- javax/swing/RepaintManager.java 8 Aug 2004 13:01:35 -0000 1.7
+++ javax/swing/RepaintManager.java 19 Sep 2004 23:36:08 -0000
@@ -1,5 +1,5 @@
/* RepaintManager.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -181,7 +181,7 @@
* @see #currentManager
* @see #setCurrentManager
*/
- private static RepaintManager globalManager;
+ static RepaintManager globalManager;
/**
* Create a new RepaintManager object.
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/SwingUtilities.java,v
retrieving revision 1.16
diff -u -r1.16 SwingUtilities.java
--- javax/swing/SwingUtilities.java 4 Sep 2004 17:14:01 -0000 1.16
+++ javax/swing/SwingUtilities.java 19 Sep 2004 23:36:08 -0000
@@ -905,6 +905,10 @@
*/
private static class OwnerFrame extends Frame
{
+ OwnerFrame()
+ {
+ }
+
public void setVisible(boolean b)
{
// Do nothing here.
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/Timer.java,v
retrieving revision 1.12
diff -u -r1.12 Timer.java
--- javax/swing/Timer.java 4 Sep 2004 21:14:06 -0000 1.12
+++ javax/swing/Timer.java 19 Sep 2004 23:36:08 -0000
@@ -74,7 +74,7 @@
/**
* DOCUMENT ME!
*/
- private void queueEvent()
+ void queueEvent()
{
synchronized (queueLock)
{
@@ -94,7 +94,7 @@
/**
* DOCUMENT ME!
*/
- private void drainEvents()
+ void drainEvents()
{
synchronized (queueLock)
{
@@ -140,6 +140,10 @@
*/
private class Waker extends Thread
{
+ Waker()
+ {
+ }
+
/**
* DOCUMENT ME!
*/
Index: javax/swing/ToolTipManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ToolTipManager.java,v
retrieving revision 1.6
diff -u -r1.6 ToolTipManager.java
--- javax/swing/ToolTipManager.java 4 Sep 2004 20:31:20 -0000 1.6
+++ javax/swing/ToolTipManager.java 19 Sep 2004 23:36:08 -0000
@@ -471,7 +471,7 @@
* show it as well (whether to display it in heavyweight/lightweight panel
* or a window.)
*/
- private void showTip()
+ void showTip()
{
if (! enabled)
return;
@@ -539,7 +539,7 @@
/**
* This method hides the ToolTip.
*/
- private void hideTip()
+ void hideTip()
{
if (currentTip == null || ! currentTip.isVisible() || ! enabled)
return;
Index: javax/swing/border/TitledBorder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/border/TitledBorder.java,v
retrieving revision 1.7
diff -u -r1.7 TitledBorder.java
--- javax/swing/border/TitledBorder.java 8 Jul 2004 19:26:25 -0000 1.7
+++ javax/swing/border/TitledBorder.java 19 Sep 2004 23:36:09 -0000
@@ -1114,6 +1114,10 @@
Insets edgeSpacing;
+ Measurements()
+ {
+ }
+
/**
* Determines the insets of the nested component when it has a
* TitledBorder as its border. Used by address@hidden
Index: javax/swing/colorchooser/DefaultHSBChooserPanel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java,v
retrieving revision 1.1
diff -u -r1.1 DefaultHSBChooserPanel.java
--- javax/swing/colorchooser/DefaultHSBChooserPanel.java 4 Sep 2004 20:58:22
-0000 1.1
+++ javax/swing/colorchooser/DefaultHSBChooserPanel.java 19 Sep 2004 23:36:09
-0000
@@ -73,37 +73,37 @@
class DefaultHSBChooserPanel extends AbstractColorChooserPanel
{
/** The gradient image displayed. */
- private transient Image gradientImage;
+ transient Image gradientImage;
/** The Panel that holds the gradient image. */
private transient JPanel gradientPanel;
/** The track gradient image. */
- private transient Image trackImage;
+ transient Image trackImage;
/** The panel that holds the track. */
private transient JPanel trackPanel;
/** The slider for the locked HSB value. */
- private transient JSlider slider;
+ transient JSlider slider;
/** The RadioButton that controls the Hue. */
- private transient JRadioButton hRadio;
+ transient JRadioButton hRadio;
/** The RadioButton that controls the Saturation. */
- private transient JRadioButton sRadio;
+ transient JRadioButton sRadio;
/** The RadioButton that controls the Brightness. */
private transient JRadioButton bRadio;
/** The JSpinner that controls the Hue. */
- private transient JSpinner hSpinner;
+ transient JSpinner hSpinner;
/** The JSpinner that controls the Saturation. */
- private transient JSpinner sSpinner;
+ transient JSpinner sSpinner;
/** The JSpinner that controls the Brightness. */
- private transient JSpinner bSpinner;
+ transient JSpinner bSpinner;
/** The default width of the gradient image. */
private static final int imgWidth = 200;
@@ -135,19 +135,19 @@
private transient JLabel bFull;
/** The point that is displayed in the gradient image. */
- private transient Point gradientPoint = new Point();
+ transient Point gradientPoint = new Point();
/**
* This indicates that the change to the slider or point is triggered
* internally.
*/
- private transient boolean internalChange = false;
+ transient boolean internalChange = false;
/** This indicates that the change to the spinner is triggered internally. */
- private transient boolean spinnerTrigger = false;
+ transient boolean spinnerTrigger = false;
/** This int identifies which spinner is currently locked. */
- private transient int locked = -1;
+ transient int locked = -1;
/** This value indicates that the Hue spinner is locked. */
static final int HLOCKED = 0;
@@ -162,7 +162,7 @@
* This method indicates that the mouse event is in the process of being
* handled.
*/
- private transient boolean handlingMouse;
+ transient boolean handlingMouse;
/**
* This helper class handles mouse events on the gradient image.
@@ -717,7 +717,7 @@
* This method calls the appropriate method to update the gradient image
* depending on which HSB value is constant.
*/
- private void updateImage()
+ void updateImage()
{
switch (locked)
{
@@ -751,7 +751,7 @@
* This method updates the slider in response to making a different HSB
* property the constant.
*/
- private void updateSlider()
+ void updateSlider()
{
if (slider == null)
return;
@@ -780,7 +780,7 @@
* This method updates the track gradient image depending on which HSB
* property is constant.
*/
- private void updateTrack()
+ void updateTrack()
{
switch (locked)
{
Index: javax/swing/colorchooser/DefaultRGBChooserPanel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java,v
retrieving revision 1.1
diff -u -r1.1 DefaultRGBChooserPanel.java
--- javax/swing/colorchooser/DefaultRGBChooserPanel.java 4 Sep 2004 20:58:22
-0000 1.1
+++ javax/swing/colorchooser/DefaultRGBChooserPanel.java 19 Sep 2004 23:36:09
-0000
@@ -109,7 +109,7 @@
* Whether the color change was initiated from the slider or spinner rather
* than externally.
*/
- private transient boolean internalChange = false;
+ transient boolean internalChange = false;
/** The ChangeListener for the sliders. */
private transient ChangeListener colorChanger;
@@ -118,13 +118,13 @@
private transient ChangeListener spinnerHandler;
/** The slider that handles the red values. */
- private transient JSlider R;
+ transient JSlider R;
/** The slider that handles the green values. */
- private transient JSlider G;
+ transient JSlider G;
/** The slider that handles the blue values. */
- private transient JSlider B;
+ transient JSlider B;
/** The label for the red slider. */
private transient JLabel RLabel;
@@ -136,13 +136,13 @@
private transient JLabel BLabel;
/** The spinner that handles the red values. */
- private transient JSpinner RSpinner;
+ transient JSpinner RSpinner;
/** The spinner that handles the green values. */
- private transient JSpinner GSpinner;
+ transient JSpinner GSpinner;
/** The spinner that handles the blue values. */
- private transient JSpinner BSpinner;
+ transient JSpinner BSpinner;
/**
* Creates a new DefaultRGBChooserPanel object.
Index: javax/swing/colorchooser/DefaultSwatchChooserPanel.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java,v
retrieving revision 1.1
diff -u -r1.1 DefaultSwatchChooserPanel.java
--- javax/swing/colorchooser/DefaultSwatchChooserPanel.java 4 Sep 2004 20:58:22
-0000 1.1
+++ javax/swing/colorchooser/DefaultSwatchChooserPanel.java 19 Sep 2004
23:36:09 -0000
@@ -503,7 +503,7 @@
*
* @param c The color to add.
*/
- private void addColorToQueue(Color c)
+ void addColorToQueue(Color c)
{
if (--start == -1)
start = numRows * numCols - 1;
Index: javax/swing/plaf/basic/BasicArrowButton.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicArrowButton.java,v
retrieving revision 1.6
diff -u -r1.6 BasicArrowButton.java
--- javax/swing/plaf/basic/BasicArrowButton.java 5 Sep 2004 11:31:06 -0000 1.6
+++ javax/swing/plaf/basic/BasicArrowButton.java 19 Sep 2004 23:36:09 -0000
@@ -163,14 +163,14 @@
/** The color the arrow is painted in if disabled and the bottom and
* right edges of the button. */
- 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 edges of the button. */
- private transient Color darkShadow = Color.BLACK;
+ transient Color darkShadow = Color.BLACK;
/** The top and left edges of the button. */
- private transient Color highlight = Color.BLACK;
+ transient Color highlight = Color.BLACK;
/** The border around the ArrowButton. */
private transient Border tmpBorder = new Border()
Index: javax/swing/plaf/basic/BasicColorChooserUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicColorChooserUI.java
--- javax/swing/plaf/basic/BasicColorChooserUI.java 4 Sep 2004 20:58:22 -0000
1.1
+++ javax/swing/plaf/basic/BasicColorChooserUI.java 19 Sep 2004 23:36:09 -0000
@@ -96,6 +96,10 @@
*/
private class PreviewListener implements ChangeListener
{
+ PreviewListener()
+ {
+ }
+
/**
* This method is called whenever the JColorChooser's color changes.
*
@@ -120,6 +124,10 @@
*/
private class TabPaneListener implements ChangeListener
{
+ TabPaneListener()
+ {
+ }
+
/**
* This method is called whenever a different tab is selected in the
* JTabbedPane.
@@ -146,10 +154,10 @@
protected PropertyChangeListener propertyChangeListener;
/** The JColorChooser. */
- private JColorChooser chooser;
+ JColorChooser chooser;
/** The JTabbedPane that is used. */
- private JTabbedPane pane;
+ JTabbedPane pane;
/** The Container that holds the preview panel. */
private Container prevContainer;
@@ -226,7 +234,7 @@
*
* @param panels The Panels that need tabs to be made for them.
*/
- private void makeTabs(AbstractColorChooserPanel[] panels)
+ void makeTabs(AbstractColorChooserPanel[] panels)
{
pane.removeAll();
for (int i = 0; i < panels.length; i++)
@@ -262,7 +270,7 @@
*
* @param preview The new preview panel.
*/
- private void updatePreviewPanel(JComponent preview)
+ void updatePreviewPanel(JComponent preview)
{
if (prevContainer == null)
{
Index: javax/swing/plaf/basic/BasicComboBoxUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicComboBoxUI.java
--- javax/swing/plaf/basic/BasicComboBoxUI.java 5 Sep 2004 11:31:06 -0000 1.1
+++ javax/swing/plaf/basic/BasicComboBoxUI.java 19 Sep 2004 23:36:09 -0000
@@ -166,16 +166,16 @@
private Color lightHighlight;
/* Size of the largest item in the comboBox */
- private Dimension largestItemSize;
+ Dimension largestItemSize;
// It seems that JComboBox doesn't have a border set explicitely. So we just
// paint the border everytime combo box is displayed.
/* border insets for this JComboBox*/
- private static final Insets borderInsets = new Insets(2, 2, 2, 2);
+ static final Insets borderInsets = new Insets(2, 2, 2, 2);
// Width of the arrow button
- private static int arrowButtonWidth = 15;
+ static int arrowButtonWidth = 15;
// FIXME: This fields aren't used anywhere at this moment.
protected Dimension cachedMinimumSize;
@@ -1181,6 +1181,10 @@
*/
private class MouseHandler extends MouseAdapter
{
+ MouseHandler()
+ {
+ }
+
/**
* This method is invoked when mouse is pressed over the combo box. It
* repaints the combo box accordinglly
Index: javax/swing/plaf/basic/BasicDesktopIconUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicDesktopIconUI.java
--- javax/swing/plaf/basic/BasicDesktopIconUI.java 26 Jun 2004 16:07:02 -0000
1.1
+++ javax/swing/plaf/basic/BasicDesktopIconUI.java 19 Sep 2004 23:36:10 -0000
@@ -170,6 +170,10 @@
/** The bottom inset value. */
int bottom = top;
+ DesktopIconBorder()
+ {
+ }
+
/**
* This method returns the insets of the border.
*
@@ -303,7 +307,7 @@
private transient MouseInputListener mouseHandler;
/** The Button in the JDesktopIcon responsible for deiconifying it. */
- private transient BoundButton button;
+ transient BoundButton button;
/** The PropertyChangeListener listening to the JDesktopIcon. */
private transient PropertyChangeListener propertyHandler;
Index: javax/swing/plaf/basic/BasicIconFactory.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicIconFactory.java,v
retrieving revision 1.6
diff -u -r1.6 BasicIconFactory.java
--- javax/swing/plaf/basic/BasicIconFactory.java 31 May 2004 21:12:05 -0000 1.6
+++ javax/swing/plaf/basic/BasicIconFactory.java 19 Sep 2004 23:36:10 -0000
@@ -1,5 +1,5 @@
/* BasicIconFactory.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -57,6 +57,10 @@
static private class DummyIcon
implements Icon
{
+ DummyIcon()
+ {
+ }
+
public int getIconHeight() { return 10; }
public int getIconWidth() { return 10; }
public void paintIcon(Component c, Graphics g, int x, int y)
Index: javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java,v
retrieving revision 1.1
diff -u -r1.1 BasicInternalFrameTitlePane.java
--- javax/swing/plaf/basic/BasicInternalFrameTitlePane.java 26 Jun 2004
16:07:02 -0000 1.1
+++ javax/swing/plaf/basic/BasicInternalFrameTitlePane.java 19 Sep 2004
23:36:10 -0000
@@ -636,7 +636,7 @@
* The label used to display the title. This label is not added to the
* TitlePane.
*/
- private transient JLabel title;
+ transient JLabel title;
/**
* Creates a new BasicInternalFrameTitlePane object that is used in the
Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java 31 Jul 2004 22:56:54 -0000
1.4
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java 19 Sep 2004 23:36:10 -0000
@@ -942,6 +942,10 @@
/** The size of the corners. */
private static final int offset = 10;
+ InternalFrameBorder()
+ {
+ }
+
/**
* This method returns whether the border is opaque.
*
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.10
diff -u -r1.10 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java 31 Jul 2004 22:56:54 -0000
1.10
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java 19 Sep 2004 23:36:10 -0000
@@ -442,7 +442,7 @@
protected JOptionPane optionPane;
/** The size of the icons. */
- private static int iconSize = 36;
+ static int iconSize = 36;
/** The foreground color for the message area. */
private transient Color messageForeground;
@@ -454,22 +454,22 @@
private transient Border buttonBorder;
/** The string used to describe OK buttons. */
- private static String OK_STRING = "OK";
+ private static final String OK_STRING = "OK";
/** The string used to describe Yes buttons. */
- private static String YES_STRING = "Yes";
+ private static final String YES_STRING = "Yes";
/** The string used to describe No buttons. */
- private static String NO_STRING = "No";
+ private static final String NO_STRING = "No";
/** The string used to describe Cancel buttons. */
- private static String CANCEL_STRING = "Cancel";
+ private static final String CANCEL_STRING = "Cancel";
/** The container for the message area. */
- private transient Container messageAreaContainer;
+ transient Container messageAreaContainer;
/** The container for the buttons. */
- private transient Container buttonContainer;
+ transient Container buttonContainer;
/**
* A helper class that implements Icon. This is used temporarily until
@@ -477,6 +477,10 @@
*/
private static class messageIcon implements Icon
{
+ messageIcon()
+ {
+ }
+
/**
* This method returns the width of the icon.
*
@@ -1242,7 +1246,7 @@
* This method resets the value in the inputComponent to the
* initialSelectionValue property.
*/
- private void resetSelectedValue()
+ void resetSelectedValue()
{
if (inputComponent != null)
{
Index: javax/swing/plaf/basic/BasicPopupMenuUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java,v
retrieving revision 1.5
diff -u -r1.5 BasicPopupMenuUI.java
--- javax/swing/plaf/basic/BasicPopupMenuUI.java 5 Sep 2004 11:31:06 -0000 1.5
+++ javax/swing/plaf/basic/BasicPopupMenuUI.java 19 Sep 2004 23:36:10 -0000
@@ -107,7 +107,7 @@
private transient PopupMenuListener popupMenuListener;
/* ComponentListener listening to popupMenu's invoker. */
- private TopWindowListener topWindowListener;
+ TopWindowListener topWindowListener;
/**
* Creates a new BasicPopupMenuUI object.
@@ -283,6 +283,10 @@
*/
private class PopupMenuHandler implements PopupMenuListener
{
+ PopupMenuHandler()
+ {
+ }
+
/**
* This method is invoked when JPopupMenu is cancelled.
*
@@ -351,6 +355,10 @@
*/
private class TopWindowListener implements ComponentListener
{
+ TopWindowListener()
+ {
+ }
+
/**
* This method is invoked when top-level window is resized. This method
* closes current menu hierarchy.
@@ -402,6 +410,10 @@
private class MouseInputHandler implements MouseInputListener
{
+ MouseInputHandler()
+ {
+ }
+
public void mouseClicked(MouseEvent e)
{
}
Index: javax/swing/plaf/basic/BasicProgressBarUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,v
retrieving revision 1.5
diff -u -r1.5 BasicProgressBarUI.java
--- javax/swing/plaf/basic/BasicProgressBarUI.java 8 Jul 2004 19:26:27 -0000 1.5
+++ javax/swing/plaf/basic/BasicProgressBarUI.java 19 Sep 2004 23:36:11 -0000
@@ -92,6 +92,10 @@
*/
private class PropertyChangeHandler implements PropertyChangeListener
{
+ PropertyChangeHandler()
+ {
+ }
+
/**
* Called every time the properties of the
* progressBar change.
@@ -119,6 +123,10 @@
*/
private class Animator implements ActionListener
{
+ Animator()
+ {
+ }
+
/**
* Called every time the animationTimer reaches
* its interval.
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.7
diff -u -r1.7 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java 31 Jul 2004 22:56:54 -0000 1.7
+++ javax/swing/plaf/basic/BasicScrollBarUI.java 19 Sep 2004 23:36:11 -0000
@@ -441,19 +441,19 @@
protected Rectangle thumbRect;
/** Indicates that the decrease highlight should be painted. */
- protected static int DECREASE_HIGHLIGHT = 1;
+ protected static final int DECREASE_HIGHLIGHT = 1;
/** Indicates that the increase highlight should be painted. */
- protected static int INCREASE_HIGHLIGHT = 2;
+ protected static final int INCREASE_HIGHLIGHT = 2;
/** Indicates that no highlight should be painted. */
- protected static int NO_HIGHLIGHT = 0;
+ protected static final int NO_HIGHLIGHT = 0;
/** Indicates that the scrolling direction is positive. */
- private static int POSITIVE_SCROLL = 1;
+ private static final int POSITIVE_SCROLL = 1;
/** Indicates that the scrolling direction is negative. */
- private static int NEGATIVE_SCROLL = -1;
+ private static final int NEGATIVE_SCROLL = -1;
/** The cached preferred size for the scrollbar. */
private transient Dimension preferredSize;
@@ -746,7 +746,7 @@
* This method calculates the preferred size since
* calling getPreferredSize() returns a cached value.
*/
- private void calculatePreferredSize()
+ void calculatePreferredSize()
{
// System.err.println(this + ".calculatePreferredSize()");
@@ -1348,7 +1348,7 @@
*
* @return The value for the y coordinate.
*/
- private int valueForYPosition(int yPos)
+ int valueForYPosition(int yPos)
{
int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum();
@@ -1380,7 +1380,7 @@
*
* @return The value for the x coordinate.
*/
- private int valueForXPosition(int xPos)
+ int valueForXPosition(int xPos)
{
int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum();
Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.7
diff -u -r1.7 BasicSliderUI.java
--- javax/swing/plaf/basic/BasicSliderUI.java 4 Sep 2004 20:31:20 -0000 1.7
+++ javax/swing/plaf/basic/BasicSliderUI.java 19 Sep 2004 23:36:11 -0000
@@ -2162,7 +2162,7 @@
*
* @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 max = slider.getMaximum();
Index: javax/swing/plaf/basic/BasicSpinnerUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,v
retrieving revision 1.2
diff -u -r1.2 BasicSpinnerUI.java
--- javax/swing/plaf/basic/BasicSpinnerUI.java 4 Sep 2004 20:31:20 -0000 1.2
+++ javax/swing/plaf/basic/BasicSpinnerUI.java 19 Sep 2004 23:36:12 -0000
@@ -1,5 +1,5 @@
/* SpinnerUI.java --
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -362,6 +362,10 @@
*/
private class DefaultLayoutManager implements LayoutManager
{
+ DefaultLayoutManager()
+ {
+ }
+
/**
* DOCUMENT ME!
*
Index: javax/swing/plaf/basic/BasicSplitPaneDivider.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java,v
retrieving revision 1.4
diff -u -r1.4 BasicSplitPaneDivider.java
--- javax/swing/plaf/basic/BasicSplitPaneDivider.java 31 Jul 2004 22:56:54
-0000 1.4
+++ javax/swing/plaf/basic/BasicSplitPaneDivider.java 19 Sep 2004 23:36:12 -0000
@@ -155,7 +155,7 @@
/** Keeps track of where the divider should be placed when using one touch
expand
* buttons. */
- private transient int currentDividerLocation = 1;
+ transient int currentDividerLocation = 1;
private transient Border tmpBorder = new Border()
{
@@ -492,7 +492,7 @@
*
* @param locationIndex The location to move to.
*/
- private void moveDividerTo(int locationIndex)
+ void moveDividerTo(int locationIndex)
{
Insets insets = splitPane.getInsets();
switch (locationIndex)
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.10
diff -u -r1.10 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java 31 Jul 2004 22:56:54 -0000
1.10
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java 19 Sep 2004 23:36:12 -0000
@@ -847,6 +847,10 @@
*/
private class TabbedPaneScrollLayout extends TabbedPaneLayout
{
+ TabbedPaneScrollLayout()
+ {
+ }
+
/**
* This method returns the preferred layout size for the given container.
*
@@ -1120,11 +1124,19 @@
*/
private class ScrollingPanel extends JPanel
{
+ ScrollingPanel()
+ {
+ }
+
/**
* This is a private UI class for our panel.
*/
private class ScrollingPanelUI extends BasicPanelUI
{
+ ScrollingPanelUI()
+ {
+ }
+
/**
* This method overrides the default paint method. It paints the tab
* rectangles for the JTabbedPane in the panel.
@@ -1156,6 +1168,9 @@
*/
private class ScrollingViewport extends JViewport implements UIResource
{
+ ScrollingViewport()
+ {
+ }
}
/**
@@ -1176,19 +1191,19 @@
}
/** The button that increments the current scroll location. */
- private transient ScrollingButton incrButton;
+ transient ScrollingButton incrButton;
/** The button that decrements the current scroll location. */
- private transient ScrollingButton decrButton;
+ transient ScrollingButton decrButton;
/** The viewport used to display the tabs. */
- private transient ScrollingViewport viewport;
+ transient ScrollingViewport viewport;
/** The panel inside the viewport that paints the tabs. */
- private transient ScrollingPanel panel;
+ transient ScrollingPanel panel;
/** The starting visible tab in the run in SCROLL_TAB_MODE. */
- private transient int currentScrollLocation;
+ transient int currentScrollLocation;
/** A reusable rectangle. */
protected Rectangle calcRect;
@@ -1284,13 +1299,13 @@
protected JTabbedPane tabPane;
/** The current layout manager for the tabPane. */
- private transient LayoutManager layoutManager;
+ transient LayoutManager layoutManager;
/** The rectangle that describes the tab area's position and size. */
- private transient Rectangle tabAreaRect;
+ transient Rectangle tabAreaRect;
/** The rectangle that describes the content area's position and size. */
- private transient Rectangle contentRect;
+ transient Rectangle contentRect;
/**
* Creates a new BasicTabbedPaneUI object.
@@ -1306,7 +1321,7 @@
*
* @return The increase ScrollingButton.
*/
- private ScrollingButton createIncreaseButton()
+ ScrollingButton createIncreaseButton()
{
if (incrButton == null)
incrButton = new ScrollingButton(SwingConstants.NORTH);
@@ -1324,7 +1339,7 @@
*
* @return The decrease ScrollingButton.
*/
- private ScrollingButton createDecreaseButton()
+ ScrollingButton createDecreaseButton()
{
if (decrButton == null)
decrButton = new ScrollingButton(SwingConstants.SOUTH);
@@ -1344,7 +1359,7 @@
*
* @return The position of the first visible tab.
*/
- private Point findPointForIndex(int index)
+ Point findPointForIndex(int index)
{
int tabPlacement = tabPane.getTabPlacement();
int selectedIndex = tabPane.getSelectedIndex();
Index: javax/swing/plaf/basic/BasicToolBarUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToolBarUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicToolBarUI.java
--- javax/swing/plaf/basic/BasicToolBarUI.java 4 Sep 2004 17:14:01 -0000 1.4
+++ javax/swing/plaf/basic/BasicToolBarUI.java 19 Sep 2004 23:36:13 -0000
@@ -87,7 +87,7 @@
public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
/** Static owner of all DragWindows. */
- private static JFrame owner = new JFrame();
+ static JFrame owner = new JFrame();
/** The border used when the JToolBar is in nonrollover mode. */
private static Border nonRolloverBorder;
@@ -99,7 +99,7 @@
protected String constraintBeforeFloating;
/** The last known orientation of the JToolBar before floating. */
- private int lastGoodOrientation;
+ int lastGoodOrientation;
/** The color of the border when it is dockable. */
protected Color dockingBorderColor;
@@ -141,19 +141,19 @@
private transient Window floatFrame;
/** The original parent of the JToolBar. */
- private transient Container origParent;
+ transient Container origParent;
/** A hashtable of components and their original borders. */
- private transient Hashtable borders;
+ transient Hashtable borders;
/** A window listener for the floatable frame. */
private transient WindowListener windowListener;
/** A set of cached bounds of the JToolBar. */
- private transient Dimension cachedBounds;
+ transient Dimension cachedBounds;
/** The cached orientation of the JToolBar. */
- private transient int cachedOrientation;
+ transient int cachedOrientation;
/**
* This method creates a new BasicToolBarUI object for the given JToolBar.
@@ -1094,7 +1094,7 @@
/**
* Creates a new DragWindow object.
*/
- private DragWindow()
+ DragWindow()
{
super(owner);
}
@@ -1330,6 +1330,10 @@
*/
private static class ToolBarBorder implements Border
{
+ ToolBarBorder()
+ {
+ }
+
/** The size of the larger, draggable side of the border. */
private static int offset = 10;
Index: javax/swing/text/StyleConstants.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/StyleConstants.java,v
retrieving revision 1.1
diff -u -r1.1 StyleConstants.java
--- javax/swing/text/StyleConstants.java 4 Sep 2004 17:14:01 -0000 1.1
+++ javax/swing/text/StyleConstants.java 19 Sep 2004 23:36:13 -0000
@@ -45,7 +45,7 @@
{
String keyname;
- private StyleConstants(String k)
+ StyleConstants(String k)
{
keyname = k;
}
Index: vm/reference/java/lang/VMProcess.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/java/lang/VMProcess.java,v
retrieving revision 1.3
diff -u -r1.3 VMProcess.java
--- vm/reference/java/lang/VMProcess.java 18 Sep 2004 01:56:18 -0000 1.3
+++ vm/reference/java/lang/VMProcess.java 19 Sep 2004 23:36:13 -0000
@@ -68,32 +68,32 @@
{
// Possible states for a VMProcess
- private static final int INITIAL = 0;
- private static final int RUNNING = 1;
- private static final int TERMINATED = 2;
+ static final int INITIAL = 0;
+ static final int RUNNING = 1;
+ static final int TERMINATED = 2;
// Dedicated thread that does all the fork()'ing and wait()'ing.
- private static Thread processThread;
+ static Thread processThread;
// New processes waiting to be spawned by processThread.
- private static final LinkedList workList = new LinkedList();
+ static final LinkedList workList = new LinkedList();
// Return values set by nativeReap() when a child is reaped.
// These are only accessed by processThread so no locking required.
- private static long reapedPid;
- private static int reapedExitValue;
+ static long reapedPid;
+ static int reapedExitValue;
// Information about this process
- private int state; // current state of process
- private final String[] cmd; // copied from Runtime.exec()
- private final String[] env; // copied from Runtime.exec()
- private final File dir; // copied from Runtime.exec()
- private Throwable exception; // if process failed to start
- private long pid; // process id
- private OutputStream stdin; // process input stream
- private InputStream stdout; // process output stream
- private InputStream stderr; // process error stream
- private int exitValue; // process exit value
+ int state; // current state of process
+ final String[] cmd; // copied from Runtime.exec()
+ final String[] env; // copied from Runtime.exec()
+ final File dir; // copied from Runtime.exec()
+ Throwable exception; // if process failed to start
+ long pid; // process id
+ OutputStream stdin; // process input stream
+ InputStream stdout; // process output stream
+ InputStream stderr; // process error stream
+ int exitValue; // process exit value
//
// Dedicated thread that does all the fork()'ing and wait()'ing
@@ -115,7 +115,7 @@
// constructor will be private, which means the compiler will have
// to generate a second package-private constructor, which is
// bogus.
- public ProcessThread ()
+ ProcessThread ()
{
}
@@ -345,7 +345,7 @@
*
* @throws IOException if the O/S process could not be created.
*/
- private native void nativeSpawn(String[] cmd, String[] env, File dir)
+ native void nativeSpawn(String[] cmd, String[] env, File dir)
throws IOException;
/**
@@ -356,7 +356,8 @@
*
* @return true if a child was reaped, otherwise false
*/
- private static native boolean nativeReap();
+ // This is not private as it is called from an inner class.
+ static native boolean nativeReap();
/**
* Kill a process. This sends it a fatal signal but does not reap it.
- [cp-patches] Patch: RFC: removing accessor methods,
Tom Tromey <=