2003-03-18 Michael Koch <konqueror@gmx.de>

	* java/awt/ScrollPane.java
	(ScrollPane): Rewrote for new ScrollPaneAdjustable.
	(getViewportSize): Likewise.
	(addNotify): Likewise.
	(removeNotify): Likewise.
	* java/awt/ScrollPaneAdjustable.java
	(ScrollPaneAdjustable): No longer extends Scrollbar.
	* java/beans/beancontext/BeanContextServices.java:
	Reformated.
	(getService): Added throws TooManyListenersException;
	* java/beans/beancontext/BeanContextServicesSupport.java:
	Reformated.

From-SVN: r64538

libjava/ChangeLog

 2003-03-18  Michael Koch  <konqueror@gmx.de>
 
+	* java/awt/ScrollPane.java
+	(ScrollPane): Rewrote for new ScrollPaneAdjustable.
+	(getViewportSize): Likewise.
+	(addNotify): Likewise.
+	(removeNotify): Likewise.
+	* java/awt/ScrollPaneAdjustable.java
+	(ScrollPaneAdjustable): No longer extends Scrollbar.
+	* java/beans/beancontext/BeanContextServices.java:
+	Reformated.
+	(getService): Added throws TooManyListenersException;
+	* java/beans/beancontext/BeanContextServicesSupport.java:
+	Reformated.
+
+2003-03-18  Michael Koch  <konqueror@gmx.de>
+
 	* java/io/BufferedOutputStream.java,
 	java/io/DataInput.java,
 	java/io/DataInputStream.java,

libjava/java/awt/ScrollPane.java

@@ -153,8 +153,8 @@ ScrollPane(int scrollbarDisplayPolicy)
 
   if (scrollbarDisplayPolicy != SCROLLBARS_NEVER)
     {
-      hAdjustable = new ScrollPaneAdjustable(Scrollbar.HORIZONTAL);
-      vAdjustable = new ScrollPaneAdjustable(Scrollbar.VERTICAL);
+      hAdjustable = new ScrollPaneAdjustable (this, Scrollbar.HORIZONTAL);
+      vAdjustable = new ScrollPaneAdjustable (this, Scrollbar.VERTICAL);
     }
 
   wheelScrollingEnabled = true;
@@ -215,23 +215,17 @@ getVAdjustable()
   *
   * @return The viewport size.
   */
-public Dimension
-getViewportSize()
+public Dimension getViewportSize ()
 {
-  Dimension viewsize = getSize();
-  Insets insets = getInsets();
-  viewsize.width = viewsize.width - (insets.left + insets.right);
-  viewsize.height = viewsize.height - (insets.top + insets.bottom);
-
-  ScrollPaneAdjustable v = (ScrollPaneAdjustable)getVAdjustable();
-  ScrollPaneAdjustable h = (ScrollPaneAdjustable)getHAdjustable();
-
-  if ((v != null) && v.isVisible())
-    viewsize.width = viewsize.width - v.getSize().width;
-  if ((h != null) && h.isVisible())
-    viewsize.height = viewsize.height - v.getSize().height;
-
-  return(viewsize);
+  Dimension viewsize = getSize ();
+  Insets insets = getInsets ();
+  viewsize.width = (viewsize.width
+                    - (insets.left + insets.right)
+                    - getVScrollbarWidth ());
+  viewsize.height = (viewsize.height
+                     - (insets.top + insets.bottom)
+                     - getHScrollbarHeight ());
+  return viewsize;
 }
 
 /*************************************************************************/
@@ -347,11 +341,7 @@ addNotify()
     return;
 
   setPeer((ComponentPeer)getToolkit().createScrollPane(this));
-
-  if (hAdjustable != null)
-    hAdjustable.addNotify();
-  if (vAdjustable != null)
-    vAdjustable.removeNotify();
+  super.addNotify();
 }
 
 /*************************************************************************/
@@ -362,11 +352,6 @@ addNotify()
 public void
 removeNotify()
 {
-  if (hAdjustable != null)
-    hAdjustable.removeNotify();
-  if (vAdjustable != null)
-    vAdjustable.removeNotify();
-
   super.removeNotify();
 }
 

libjava/java/awt/ScrollPaneAdjustable.java

@@ -49,7 +49,6 @@ import java.io.Serializable;
  * @since 1.4
  */
 public class ScrollPaneAdjustable
-  extends Scrollbar
   implements Adjustable, Serializable
 {
   private static final long serialVersionUID = -3359745691033257079L;
@@ -60,13 +59,14 @@ public class ScrollPaneAdjustable
   int minimum;
   int maximum;
   int visibleAmount;
-  int unitIncrement;
-  int blockIncrement;
+  int unitIncrement = 1;
+  int blockIncrement = 1;
   AdjustmentListener adjustmentListener;
 
-  ScrollPaneAdjustable (int orientation)
+  ScrollPaneAdjustable (ScrollPane sp, int orientation)
   {
-    throw new Error ("not implemented");
+    this.sp = sp;
+    this.orientation = orientation;
   }
   
   ScrollPaneAdjustable (ScrollPane sp, int orientation, int value, int minimum,

libjava/java/beans/beancontext/BeanContextServices.java

@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.beans.beancontext;
 
 import java.util.Iterator;
+import java.util.TooManyListenersException;
 
 /**
  * Allows a <code>BeanContext</code> to provide services to its children.
@@ -46,10 +47,12 @@ import java.util.Iterator;
  * @specnote it is unclear whether a <code>BeanContextServices</code>
  *           should delegate unhandled requests to parents.  I assume so.
  * @author John Keiser
- * @since JDK1.2
+ * @since 1.2
  */
 
-public interface BeanContextServices extends BeanContext, BeanContextServicesListener {
+public interface BeanContextServices
+  extends BeanContext, BeanContextServicesListener
+{
   /**
    * Register a service to make it available to others.
    * This class may refuse to add the service based on whatever
@@ -60,7 +63,8 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * @param provider the factory that will actually provide the service.
    * @return whether the service was added or not.
    */
-	public boolean addService(Class serviceClass, BeanContextServiceProvider provider);
+  public boolean addService (Class serviceClass,
+                             BeanContextServiceProvider provider);
 
   /**
    * Make it so that no one else can use this service.
@@ -79,7 +83,9 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * @param revokeNow whether to release all current references to
    *        the service.
    */
-	public void revokeService(Class serviceClass, BeanContextServiceProvider provider, boolean revokeNow);
+  public void revokeService (Class serviceClass,
+                             BeanContextServiceProvider provider,
+                             boolean revokeNow);
 
   /**
    * Release your copy of this service.
@@ -96,7 +102,8 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * @param service the service to relinquish
    * @see #getService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Class,java.lang.Object,java.beans.beancontext.BeanContextServiceRevokedListener)
    */
-	public void releaseService(BeanContextChild requestorChild, Object requestor, Object service);
+  public void releaseService (BeanContextChild requestorChild, Object requestor,
+                              Object service);
 
   /**
    * Get a service from this <code>BeanContextServices</code>.
@@ -145,7 +152,10 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    *        <code>instanceof</code> serviceClass is true), or
    *        <code>null</code>.
    */
-	public Object getService(BeanContextChild requestorChild, Object requestor, Class serviceClass, Object serviceSelector, BeanContextServiceRevokedListener listener);
+  public Object getService (BeanContextChild requestorChild, Object requestor,
+                            Class serviceClass, Object serviceSelector,
+                            BeanContextServiceRevokedListener listener)
+    throws TooManyListenersException;
 
   /**
    * Get a list of all service classes supported.
@@ -157,7 +167,7 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * @return a list of all service classes supported.
    * @see java.beans.beancontext.BeanContext#globalHierarchyLock
    */
-	public Iterator getCurrentServiceClasses();
+  public Iterator getCurrentServiceClasses ();
 
   /**
    * Get a list of valid service selectors for the specified service class.
@@ -177,7 +187,7 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * @return a list of valid service selectors for the service
    *         class, or <code>null</code>.
    */
-	public Iterator getCurrentServiceSelectors(Class serviceClass);
+  public Iterator getCurrentServiceSelectors (Class serviceClass);
 
   /**
    * Tell whether the specified service class is available.
@@ -185,15 +195,16 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    * specified service, this method will return <code>true</code>.
    *
    * @param serviceClass the service class to check on.
-	 * @return whether the specified service class is availabe.
+   * @return whether the specified service class is available.
    */
-	public boolean hasService(Class serviceClass);
+  public boolean hasService (Class serviceClass);
 
   /**
    * Add a listener on all adds and removes of services.
    * @param listener the listener to add.
    */
-	public void addBeanContextServicesListener(BeanContextServicesListener listener);
+  public void
+  addBeanContextServicesListener (BeanContextServicesListener listener);
 
   /**
    * Remove a listener on all adds and removes of services.
@@ -202,5 +213,6 @@ public interface BeanContextServices extends BeanContext, BeanContextServicesLis
    *           <code>getService()</code>.
    * @param listener the listener to add.
    */
-	public void removeBeanContextServicesListener(BeanContextServicesListener listener);
+  public void
+  removeBeanContextServicesListener (BeanContextServicesListener listener);
 }

libjava/java/beans/beancontext/BeanContextServicesSupport.java

@@ -131,12 +131,14 @@ public class BeanContextServicesSupport
     this (peer, lcle, true, true);
   }
 
-  public BeanContextServicesSupport (BeanContextServices peer, Locale lcle, boolean dtime)
+  public BeanContextServicesSupport (BeanContextServices peer, Locale lcle,
+                                     boolean dtime)
   {
     this (peer, lcle, dtime, true);
   }
 
-  public BeanContextServicesSupport (BeanContextServices peer, Locale lcle, boolean dtime, boolean visible)
+  public BeanContextServicesSupport (BeanContextServices peer, Locale lcle,
+                                     boolean dtime, boolean visible)
   {
     throw new Error ("Not implemented");
   }
@@ -151,7 +153,9 @@ public class BeanContextServicesSupport
     throw new Error ("Not implemented");
   }
 
-  protected boolean addService (Class serviceClass, BeanContextServiceProvider bcsp, boolean fireEvent)
+  protected boolean addService (Class serviceClass,
+                                BeanContextServiceProvider bcsp,
+                                boolean fireEvent)
   {
     throw new Error ("Not implemented");
   }
@@ -167,17 +171,21 @@ public class BeanContextServicesSupport
   {
     throw new Error ("Not implemented");
   }
-  protected void childJustRemovedHook (Object child, BeanContextSupport.BCSChild bcsc)
+  
+  protected void childJustRemovedHook (Object child,
+                                       BeanContextSupport.BCSChild bcsc)
   {
     throw new Error ("Not implemented");
   }
 
-  protected BeanContextSupport.BCSChild createBCSChild (Object targetChild, Object peer) 
+  protected BeanContextSupport.BCSChild createBCSChild (Object targetChild,
+                                                        Object peer) 
   {
     throw new Error ("Not implemented");
   }
 
-  protected BeanContextServicesSupport.BCSSServiceProvider createBCSSServiceProvider (Class sc, BeanContextServiceProvider bcsp)
+  protected BeanContextServicesSupport.BCSSServiceProvider
+  createBCSSServiceProvider (Class sc, BeanContextServiceProvider bcsp)
   {
     throw new Error ("Not implemented");
   }
@@ -192,12 +200,14 @@ public class BeanContextServicesSupport
     throw new Error ("Not implemented");
   }
 
-  protected final void fireServiceRevoked (BeanContextServiceRevokedEvent bcsre) 
+  protected final void
+  fireServiceRevoked (BeanContextServiceRevokedEvent bcsre)
   {
     throw new Error ("Not implemented");
   }
 
-  protected final void fireServiceRevoked (Class serviceClass, boolean revokeNow)
+  protected final void fireServiceRevoked (Class serviceClass,
+                                           boolean revokeNow)
   {
     throw new Error ("Not implemented");
   }
@@ -207,7 +217,8 @@ public class BeanContextServicesSupport
     throw new Error ("Not implemented");
   }
 
-  protected static final BeanContextServicesListener getChildBeanContextServicesListener (Object child) 
+  protected static final BeanContextServicesListener
+  getChildBeanContextServicesListener (Object child) 
   {
     throw new Error ("Not implemented");
   }
@@ -222,7 +233,9 @@ public class BeanContextServicesSupport
     throw new Error ("Not implemented");
   }
 
-  public Object getService (BeanContextChild child, Object requestor, Class serviceClass, Object serviceSelector, BeanContextServiceRevokedListener bcsrl)
+  public Object getService (BeanContextChild child, Object requestor,
+                            Class serviceClass, Object serviceSelector,
+                            BeanContextServiceRevokedListener bcsrl)
     throws TooManyListenersException
   {
     throw new Error ("Not implemented");
@@ -248,17 +261,20 @@ public class BeanContextServicesSupport
     throw new Error ("Not implemented");
   }
 
-  public void releaseService (BeanContextChild child, Object requestor, Object service) 
+  public void releaseService (BeanContextChild child, Object requestor,
+                              Object service)
   {
     throw new Error ("Not implemented");
   }
 
-  public void removeBeanContextServicesListener (BeanContextServicesListener bcsl) 
+  public void
+  removeBeanContextServicesListener (BeanContextServicesListener bcsl)
   {
     throw new Error ("Not implemented");
   }
 
-  public void revokeService (Class serviceClass, BeanContextServiceProvider bcsp, boolean revokeCurrentServicesNow) 
+  public void revokeService (Class serviceClass, BeanContextServiceProvider bcsp,
+                             boolean revokeCurrentServicesNow) 
   {
     throw new Error ("Not implemented");
   }