3 files changed, 21 insertions, 14 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
index 513c75c094a..65152472e5a 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
+++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
@@ -110,19 +110,22 @@ public class GdkGraphics2D extends Graphics2D
   
   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;
+  // These are package-private to avoid accessor methods.
+  Paint paint;
+  Stroke stroke;
+  Color fg;
+  Color bg;
+  Shape clip;
+  AffineTransform transform;
   private GtkComponentPeer component;
-  private Font font;
+  // This is package-private to avoid an accessor method.
+  Font font;
   private RenderingHints hints;
   private BufferedImage bimage;
   private boolean pixelConversionRequired;
   private int[] pixelBuffer;
-  private Composite comp;
+  // This is package-private to avoid an accessor method.
+  Composite comp;
   private Stack stateStack;
 
   private native void initState(GtkComponentPeer component);
diff --git a/libjava/gnu/java/beans/decoder/PersistenceParser.java b/libjava/gnu/java/beans/decoder/PersistenceParser.java
index 33154780a9e..5bb4acfdf87 100644
--- a/libjava/gnu/java/beans/decoder/PersistenceParser.java
+++ b/libjava/gnu/java/beans/decoder/PersistenceParser.java
@@ -1,5 +1,5 @@
 /* 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.
 
@@ -83,8 +83,9 @@ public class PersistenceParser extends DefaultHandler implements Context
 	private ElementHandler currentHandler;
 
 	/** 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. */
 	private List objects = new LinkedList();
diff --git a/libjava/gnu/javax/swing/text/html/parser/support/Parser.java b/libjava/gnu/javax/swing/text/html/parser/support/Parser.java
index 084edf65cf9..1e5147a4728 100755
--- a/libjava/gnu/javax/swing/text/html/parser/support/Parser.java
+++ b/libjava/gnu/javax/swing/text/html/parser/support/Parser.java
@@ -157,8 +157,9 @@ public class Parser
 
   /**
    * The attributes of the current HTML element.
+   * Package-private to avoid an accessor method.
    */
-  private htmlAttributeSet attributes =
+  htmlAttributeSet attributes =
     htmlAttributeSet.EMPTY_HTML_ATTRIBUTE_SET;
 
   /**
@@ -1154,9 +1155,10 @@ public class Parser
 
   /**
    * 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();
 
@@ -1183,9 +1185,10 @@ public class Parser
    * A hooks for operations, preceeding call to handleStartTag().
    * The method is called when the HTML opening tag ((like <table>)
    * is found.
+   * Package-private to avoid an accessor method.
    * @param The tag
    */
-  private void _handleStartTag(TagElement tag)
+  void _handleStartTag(TagElement tag)
   {
     validator.openTag(tag, attributes);
     startingTag(tag);