2006-01-27 Roman Kennke <kennke@aicas.com>

	* javax/swing/AbstractButton.java
	(ButtonChangeListener.ButtonChangeListener()): Made constructor
	package private.
	* javax/swing/ImageIcon.java
	(component): Made field final.
	(tracker): Made field final.
	* javax/swing/JApplet.java
	(AccessibleJApplet.AccessibleJApplet): Made constructor protected.
	* javax/swing/JCheckBox.java
	(AccessibleJCheckBox.AccessibleJCheckBox): Made constructor
	protected.
	* javax/swing/JDialog.java
	(AccessibleJDialog.AccessibleJDialog): Made constructor protected.
	* javax/swing/JFrame.java
	(AccessibleJFrame.AccessibleJFrame): Made constructor protected.
	* javax/swing/JLayeredPane.java
	(AccessibleJLayered.AccessibleJLayeredPane): Made constructor
	protected.
	(DEFAULT_LAYER): Made field final.
	(PALETTE_LAYER): Made field final.
	(MODAL_LAYER): Made field final.
	(POPUP_LAYER): Made field final.
	(DRAG_LAYER): Made field final.
	* javax/swing/JMenu.java
	(ActionChangeListener): Made class private.
	* javax/swing/JOptionPane.java
	(UNITITIALIZED_VALUE): Made field final.
	* javax/swing/JPanel.java
	(AccessibleJPanel.AccessibleJPanel): Made constructor protected.
	* javax/swing/JPopupMenu.java
	(ActionChangeListener): Made class private.
	* javax/swing/JTree.java
	(paramString): Made method protected.
	* javax/swing/JViewport.java
	(AccessibleJViewport.AccessibleJViewport): Made constructor protected.
	* javax/swing/JWindow.java
	(AccessibleJWindow.AccessibleJWindow): Made constructor protected.
	* javax/swing/RepaintManager.java
	(RepaintWorker): Made class private.

16 files changed, 70 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index efa6816f2..1bbab6b83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,47 @@
 2006-01-27  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/AbstractButton.java
+	(ButtonChangeListener.ButtonChangeListener()): Made constructor
+	package private.
+	* javax/swing/ImageIcon.java
+	(component): Made field final.
+	(tracker): Made field final.
+	* javax/swing/JApplet.java
+	(AccessibleJApplet.AccessibleJApplet): Made constructor protected.
+	* javax/swing/JCheckBox.java
+	(AccessibleJCheckBox.AccessibleJCheckBox): Made constructor
+	protected.
+	* javax/swing/JDialog.java
+	(AccessibleJDialog.AccessibleJDialog): Made constructor protected.
+	* javax/swing/JFrame.java
+	(AccessibleJFrame.AccessibleJFrame): Made constructor protected.
+	* javax/swing/JLayeredPane.java
+	(AccessibleJLayered.AccessibleJLayeredPane): Made constructor
+	protected.
+	(DEFAULT_LAYER): Made field final.
+	(PALETTE_LAYER): Made field final.
+	(MODAL_LAYER): Made field final.
+	(POPUP_LAYER): Made field final.
+	(DRAG_LAYER): Made field final.
+	* javax/swing/JMenu.java
+	(ActionChangeListener): Made class private.
+	* javax/swing/JOptionPane.java
+	(UNITITIALIZED_VALUE): Made field final.
+	* javax/swing/JPanel.java
+	(AccessibleJPanel.AccessibleJPanel): Made constructor protected.
+	* javax/swing/JPopupMenu.java
+	(ActionChangeListener): Made class private.
+	* javax/swing/JTree.java
+	(paramString): Made method protected.
+	* javax/swing/JViewport.java
+	(AccessibleJViewport.AccessibleJViewport): Made constructor protected.
+	* javax/swing/JWindow.java
+	(AccessibleJWindow.AccessibleJWindow): Made constructor protected.
+	* javax/swing/RepaintManager.java
+	(RepaintWorker): Made class private.
+
+2006-01-27  Roman Kennke  <kennke@aicas.com>
+
 	* gnu/java/awt/peer/swing/SwingComponentPeer.java
 	(handleEvent): Removed debug statement.
 
diff --git a/javax/swing/AbstractButton.java b/javax/swing/AbstractButton.java
index 376b3a056..3d289084e 100644
--- a/javax/swing/AbstractButton.java
+++ b/javax/swing/AbstractButton.java
@@ -159,6 +159,14 @@ public abstract class AbstractButton extends JComponent
     private static final long serialVersionUID = 1471056094226600578L;
 
     /**
+     * The spec has no public/protected constructor for this class, so do we.
+     */
+    ButtonChangeListener()
+    {
+      // Nothing to do here.
+    }
+
+    /**
      * Notified when the target of the listener changes its state.
      *
      * @param ev the ChangeEvent describing the change
diff --git a/javax/swing/ImageIcon.java b/javax/swing/ImageIcon.java
index b6ed949d8..9e6265830 100644
--- a/javax/swing/ImageIcon.java
+++ b/javax/swing/ImageIcon.java
@@ -205,13 +205,13 @@ public class ImageIcon
   private static final long serialVersionUID = 532615968316031794L;
 
   /** A dummy Component that is used in the MediaTracker. */
-  protected static Component component = new Component()
+  protected static final Component component = new Component()
   {
     // No need to implement this. 
   };
 
   /** The MediaTracker used to monitor the loading of images. */
-  protected static MediaTracker tracker = new MediaTracker(component);
+  protected static final MediaTracker tracker = new MediaTracker(component);
 
   /** The ID that is used in the tracker. */
   private static int id;
diff --git a/javax/swing/JApplet.java b/javax/swing/JApplet.java
index e90c45189..68eb983dd 100644
--- a/javax/swing/JApplet.java
+++ b/javax/swing/JApplet.java
@@ -66,7 +66,7 @@ public class JApplet extends Applet
     /**
      * Creates a new instance of <code>AccessibleJApplet</code>.
      */
-    public AccessibleJApplet()
+    protected AccessibleJApplet()
     {
       super();
       // Nothing to do here.
diff --git a/javax/swing/JCheckBox.java b/javax/swing/JCheckBox.java
index 74fda8f6d..26f9f6ca5 100644
--- a/javax/swing/JCheckBox.java
+++ b/javax/swing/JCheckBox.java
@@ -67,7 +67,7 @@ public class JCheckBox extends JToggleButton implements Accessible
     /**
      * Creates a new instance of <code>AccessibleJCheckBox</code>.
      */
-    public AccessibleJCheckBox()
+    protected AccessibleJCheckBox()
     {
       // Nothing to do here.
     }
diff --git a/javax/swing/JDialog.java b/javax/swing/JDialog.java
index d8d395a29..08dada2fd 100644
--- a/javax/swing/JDialog.java
+++ b/javax/swing/JDialog.java
@@ -74,7 +74,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
     /**
      * Creates a new instance of <code>AccessibleJDialog</code>.
      */
-    public AccessibleJDialog()
+    protected AccessibleJDialog()
     {
       super();
       // Nothing to do here.
diff --git a/javax/swing/JFrame.java b/javax/swing/JFrame.java
index 8d4dcb53b..f3673dc12 100644
--- a/javax/swing/JFrame.java
+++ b/javax/swing/JFrame.java
@@ -76,7 +76,7 @@ public class JFrame extends Frame
     /**
      * Creates a new instance of <code>AccessibleJFrame</code>.
      */
-    public AccessibleJFrame()
+    protected AccessibleJFrame()
     {
       super();
       // Nothing to do here.
diff --git a/javax/swing/JLayeredPane.java b/javax/swing/JLayeredPane.java
index dc8b10d21..23b3d741a 100644
--- a/javax/swing/JLayeredPane.java
+++ b/javax/swing/JLayeredPane.java
@@ -131,7 +131,7 @@ public class JLayeredPane extends JComponent implements Accessible
     /**
      * Creates a new instance of <code>AccessibleJLayeredPane</code>.
      */
-    public AccessibleJLayeredPane()
+    protected AccessibleJLayeredPane()
     {
       // Nothing to do here.
     }
@@ -152,11 +152,11 @@ public class JLayeredPane extends JComponent implements Accessible
 
   public static Integer FRAME_CONTENT_LAYER = new Integer (-30000);
 
-  public static Integer DEFAULT_LAYER = new Integer (0);
-  public static Integer PALETTE_LAYER = new Integer (100);
-  public static Integer MODAL_LAYER   = new Integer (200);
-  public static Integer POPUP_LAYER   = new Integer (300);
-  public static Integer DRAG_LAYER    = new Integer (400);
+  public static final Integer DEFAULT_LAYER = new Integer (0);
+  public static final Integer PALETTE_LAYER = new Integer (100);
+  public static final Integer MODAL_LAYER   = new Integer (200);
+  public static final Integer POPUP_LAYER   = new Integer (300);
+  public static final Integer DRAG_LAYER    = new Integer (400);
 
   TreeMap layers;               // Layer Number (Integer) -> Layer Size (Integer)
   Hashtable componentToLayer;   // Component -> Layer Number (Integer)
diff --git a/javax/swing/JMenu.java b/javax/swing/JMenu.java
index 369c44d40..a160dd448 100644
--- a/javax/swing/JMenu.java
+++ b/javax/swing/JMenu.java
@@ -906,7 +906,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
   /**
    * This class listens to PropertyChangeEvents occuring in menu's action
    */
-  protected class ActionChangedListener implements PropertyChangeListener
+  private class ActionChangedListener implements PropertyChangeListener
   {
     /** menu item associated with the action */
     private JMenuItem menuItem;
diff --git a/javax/swing/JOptionPane.java b/javax/swing/JOptionPane.java
index 4a6127684..705eca832 100644
--- a/javax/swing/JOptionPane.java
+++ b/javax/swing/JOptionPane.java
@@ -197,7 +197,7 @@ public class JOptionPane extends JComponent implements Accessible
   public static final String WANTS_INPUT_PROPERTY = "wantsInput";
 
   /** The value returned when the inputValue is uninitialized. */
-  public static Object UNINITIALIZED_VALUE = "uninitializedValue";
+  public static final Object UNINITIALIZED_VALUE = "uninitializedValue";
 
   /** The icon displayed in the dialog/internal frame. */
   protected Icon icon;
diff --git a/javax/swing/JPanel.java b/javax/swing/JPanel.java
index c02a9cfad..815e452dc 100644
--- a/javax/swing/JPanel.java
+++ b/javax/swing/JPanel.java
@@ -63,7 +63,7 @@ public class JPanel extends JComponent implements Accessible
     /**
      * Creates a new instance of <code>AccessibleJPanel</code>.
      */
-    public AccessibleJPanel()
+    protected AccessibleJPanel()
     {
       // Nothing to do here.
     }
diff --git a/javax/swing/JPopupMenu.java b/javax/swing/JPopupMenu.java
index 1f2282e23..74f733e92 100644
--- a/javax/swing/JPopupMenu.java
+++ b/javax/swing/JPopupMenu.java
@@ -866,7 +866,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
 
   /* This class resizes popup menu and repaints popup menu appropriately if one
    of item's action has changed */
-  protected class ActionChangeListener implements PropertyChangeListener
+  private class ActionChangeListener implements PropertyChangeListener
   {
     public void propertyChange(PropertyChangeEvent evt)
     {
diff --git a/javax/swing/JTree.java b/javax/swing/JTree.java
index 4d7ab003a..3b73ef118 100644
--- a/javax/swing/JTree.java
+++ b/javax/swing/JTree.java
@@ -2740,7 +2740,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * 
    * @return a String representation of this JTree
    */
-  public String paramString()
+  protected String paramString()
   {
     // TODO: this is completely legal, but it would possibly be nice
     // to return some more content, like the tree structure, some properties
diff --git a/javax/swing/JViewport.java b/javax/swing/JViewport.java
index debb5742e..5ad9593b4 100644
--- a/javax/swing/JViewport.java
+++ b/javax/swing/JViewport.java
@@ -113,7 +113,7 @@ public class JViewport extends JComponent implements Accessible
     /**
      * Creates a new instance of <code>AccessibleJViewport</code>.
      */
-    public AccessibleJViewport()
+    protected AccessibleJViewport()
     {
       // Nothing to do here.
     }
diff --git a/javax/swing/JWindow.java b/javax/swing/JWindow.java
index 8fffd9d52..19d830ed1 100644
--- a/javax/swing/JWindow.java
+++ b/javax/swing/JWindow.java
@@ -68,7 +68,7 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
     /**
      * Creates a new instance of <code>AccessibleJWindow</code>.
      */
-    public AccessibleJWindow()
+    protected AccessibleJWindow()
     {
       super();
       // Nothing to do here.
diff --git a/javax/swing/RepaintManager.java b/javax/swing/RepaintManager.java
index 0be81053d..5dd1e6ae3 100644
--- a/javax/swing/RepaintManager.java
+++ b/javax/swing/RepaintManager.java
@@ -84,7 +84,7 @@ public class RepaintManager
    * swing paint thread, which revalidates all invalid components and
    * repaints any damage in the swing scene.</p>
    */
-  protected class RepaintWorker
+  private class RepaintWorker
     implements Runnable
   {