2004-03-19 Michael Koch <konqueror@gmx.de>

	* java/awt/image/AffineTransformOp.java
	(AffineTransformOp): Made public.
	* javax/swing/JComponent.java
	(listenerList): Made protected.
	(accessibleContext): Likewise.
	* javax/swing/JList.java
	(valueChanged): Dont use internal fields of ListSelectionEvent.
	* javax/swing/JViewport.java
	(getView): Dont use internal fields of Component.
	(addImpl): Likewise.
	* javax/swing/Timer.java
	(isRunning): Made public.
	(start): Likewise.
	(stop): Likewise.
	* javax/swing/UIDefaults.java
	(getInt): Made public.
	* javax/swing/plaf/basic/BasicListUI.java
	(mousePressed): Dont use internal fields of MouseEvent.
	(propertyChanged): Dont use internal fields of PropertyChangeEvent.
	* javax/swing/plaf/basic/BasicScrollBarUI.java
	(arrowIcon): Made static.
	* javax/swing/plaf/basic/BasicViewportUI.java
	(stateChanged): Dont use internal field on ChangeEvent.
	* javax/swing/text/JTextComponent.java
	(getUI): Call UIManager.getUI().
	(updateUI): Use getUI().


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79699 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 32 insertions, 33 deletions

diff --git a/libjava/javax/swing/JComponent.java b/libjava/javax/swing/JComponent.java
index fdc5dbcc8a9..c98f52dfb83 100644
--- a/libjava/javax/swing/JComponent.java
+++ b/libjava/javax/swing/JComponent.java
@@ -89,12 +89,12 @@ public abstract class JComponent extends Container implements Serializable
 {
   static final long serialVersionUID = -5242478962609715464L;
 
-  EventListenerList listenerList = new EventListenerList();
+  protected EventListenerList listenerList = new EventListenerList();
   
   /**
    * accessibleContext
    */
-  AccessibleContext accessibleContext;
+  protected AccessibleContext accessibleContext;
   
   Dimension pref,min,max;
   Border border;
diff --git a/libjava/javax/swing/JList.java b/libjava/javax/swing/JList.java
index 92cce2240c1..7ed776c0380 100644
--- a/libjava/javax/swing/JList.java
+++ b/libjava/javax/swing/JList.java
@@ -293,9 +293,9 @@ public class JList extends JComponent implements Accessible, Scrollable
     // ListSelectionListener events
     public void valueChanged(ListSelectionEvent event)
     {
-      JList.this.fireSelectionValueChanged(event.firstIndex,
-                                           event.lastIndex,
-                                           event.isAdjusting);
+      JList.this.fireSelectionValueChanged(event.getFirstIndex(),
+                                           event.getLastIndex(),
+                                           event.getValueIsAdjusting());
       JList.this.repaint();
     }
   };
diff --git a/libjava/javax/swing/JViewport.java b/libjava/javax/swing/JViewport.java
index 9174a833b70..17e60f1a560 100644
--- a/libjava/javax/swing/JViewport.java
+++ b/libjava/javax/swing/JViewport.java
@@ -199,10 +199,10 @@ public class JViewport extends JComponent
 
   public Component getView()
   {
-    if (ncomponents > 0)
-      return component[0];
-    else
+    if (getComponentCount() == 0)
       return null;
+  
+    return getComponents()[0];
   }
 
   public void setView(Component v)
@@ -214,8 +214,9 @@ public class JViewport extends JComponent
     
   public void addImpl(Component comp, Object constraints, int index)
   {
-    if (ncomponents > 0)
-      remove(component[0]);
+    if (getComponentCount() > 0)
+      remove(getComponents()[0]);
+    
     super.addImpl(comp, constraints, index);
   }
 
diff --git a/libjava/javax/swing/Timer.java b/libjava/javax/swing/Timer.java
index 89df756eee2..adb695a1035 100644
--- a/libjava/javax/swing/Timer.java
+++ b/libjava/javax/swing/Timer.java
@@ -136,7 +136,6 @@ public class Timer implements Serializable
     return verbose;
   }
     
-
   public void setDelay(int delay)
   {
     interval = delay;
@@ -147,7 +146,6 @@ public class Timer implements Serializable
     return (int)interval;
   }
 
-
   public void setInitialDelay(int initialDelay)
   {
     init_delay = initialDelay;
@@ -158,12 +156,12 @@ public class Timer implements Serializable
     repeat_ticks = flag;
   }
 
-  boolean isRunning()
+  public boolean isRunning()
   {
     return running;
   }
 
-  void start()
+  public void start()
   {
     if (isRunning())
       {
@@ -173,7 +171,7 @@ public class Timer implements Serializable
     new Waker().start();
   }
 
-  void stop()
+  public void stop()
   {
     running = false;
   }
diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java
index 722f922e194..da23a54d344 100644
--- a/libjava/javax/swing/UIDefaults.java
+++ b/libjava/javax/swing/UIDefaults.java
@@ -369,13 +369,13 @@ public class UIDefaults extends Hashtable
     return o instanceof String ? (String) o : null;
   }
 
-  int getInt(Object key)
+  public int getInt(Object key)
   {
     Object o = get(key);
     return o instanceof Integer ? ((Integer) o).intValue() : 0;
   }
 
-  int getInt(Object key, Locale l)
+  public int getInt(Object key, Locale l)
   {
     Object o = get(key, l);
     return o instanceof Integer ? ((Integer) o).intValue() : 0;
diff --git a/libjava/javax/swing/plaf/basic/BasicListUI.java b/libjava/javax/swing/plaf/basic/BasicListUI.java
index 7a1f5a4a820..4be87652735 100644
--- a/libjava/javax/swing/plaf/basic/BasicListUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicListUI.java
@@ -190,7 +190,7 @@ public class BasicListUI extends ListUI
     public void mousePressed(MouseEvent event)
     {
       // System.err.println("got mouse click event " + event);
-      int row = BasicListUI.this.convertYToRow(event.y);
+      int row = BasicListUI.this.convertYToRow(event.getY());
       if (row == -1)
         return;
 
@@ -263,13 +263,13 @@ public class BasicListUI extends ListUI
     public void propertyChange(PropertyChangeEvent e)
     {
       // System.err.println(this + ".propertyChange(" + e + ")");
-      if (e.source == BasicListUI.this.list)
+      if (e.getSource() == BasicListUI.this.list)
         {
-          if (e.oldValue != null && e.oldValue instanceof ListModel)
-            ((ListModel) e.oldValue).removeListDataListener(BasicListUI.this.listDataListener);
+          if (e.getOldValue() != null && e.getOldValue() instanceof ListModel)
+            ((ListModel) e.getOldValue()).removeListDataListener(BasicListUI.this.listDataListener);
 
-          if (e.newValue != null && e.newValue instanceof ListModel)
-            ((ListModel) e.newValue).addListDataListener(BasicListUI.this.listDataListener);
+          if (e.getNewValue() != null && e.getNewValue() instanceof ListModel)
+            ((ListModel) e.getNewValue()).addListDataListener(BasicListUI.this.listDataListener);
         }
       BasicListUI.this.damageLayout();
     }
diff --git a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java
index 2e9f76d2e5f..f0f56d30c79 100644
--- a/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -472,7 +472,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    * A helper class that allows us to draw icons for 
    * the JButton.
    */
-  private class arrowIcon implements Icon
+  private static class arrowIcon implements Icon
   {
     /** The polygon that describes the icon. */
     private Polygon arrow;
diff --git a/libjava/javax/swing/plaf/basic/BasicViewportUI.java b/libjava/javax/swing/plaf/basic/BasicViewportUI.java
index 62e51e114ee..f686ca08010 100644
--- a/libjava/javax/swing/plaf/basic/BasicViewportUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicViewportUI.java
@@ -64,7 +64,7 @@ public class BasicViewportUI extends ViewportUI
   {
     public void stateChanged(ChangeEvent event)
     {
-      JViewport v = (JViewport)event.source;
+      JViewport v = (JViewport) event.getSource();
       v.repaint();
     }
   }
diff --git a/libjava/javax/swing/text/JTextComponent.java b/libjava/javax/swing/text/JTextComponent.java
index e112cb42c62..48bb0c03ce6 100644
--- a/libjava/javax/swing/text/JTextComponent.java
+++ b/libjava/javax/swing/text/JTextComponent.java
@@ -472,15 +472,15 @@ public abstract class JTextComponent extends JComponent
 	//          Sets the vertical position of the label's text, relative to its image.  
     }
 
-    public TextUI getUI()
-    {	return (TextUI) ui;
-    }
+  public TextUI getUI()
+  {
+    return (TextUI) UIManager.getUI(this);
+  }
 
-    public void updateUI()
-    {
-	TextUI b = (TextUI)UIManager.getUI(this);
-	setUI(b);
-    }
+  public void updateUI()
+  {
+    setUI(getUI());
+  }
 
   public Dimension getPreferredScrollableViewportSize()
   {