From 897db4af51cf3c7abccb0dfa75d957304671c7cf Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 18 Mar 2003 18:16:54 +0000 Subject: [PATCH] 2003-03-18 Michael Koch * 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 | 15 + libjava/java/awt/ScrollPane.java | 41 +-- libjava/java/awt/ScrollPaneAdjustable.java | 10 +- .../beancontext/BeanContextServices.java | 322 +++++++++--------- .../BeanContextServicesSupport.java | 46 ++- 5 files changed, 231 insertions(+), 203 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d63331d1124..ab1c75b3e9c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2003-03-18 Michael Koch + + * 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 * java/io/BufferedOutputStream.java, diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index 4ca8e703114..930ace7d1b5 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/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(); } diff --git a/libjava/java/awt/ScrollPaneAdjustable.java b/libjava/java/awt/ScrollPaneAdjustable.java index 2307e590542..13131f9c45b 100644 --- a/libjava/java/awt/ScrollPaneAdjustable.java +++ b/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, diff --git a/libjava/java/beans/beancontext/BeanContextServices.java b/libjava/java/beans/beancontext/BeanContextServices.java index 77ed94deba5..89906aa977d 100644 --- a/libjava/java/beans/beancontext/BeanContextServices.java +++ b/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 BeanContext to provide services to its children. @@ -46,161 +47,172 @@ import java.util.Iterator; * @specnote it is unclear whether a BeanContextServices * should delegate unhandled requests to parents. I assume so. * @author John Keiser - * @since JDK1.2 + * @since 1.2 */ -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 - * information it can gather, including whether the service - * provider is trusted. - * - * @param serviceClass the service class. - * @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); - - /** - * Make it so that no one else can use this service. - *

- * - * If revokeNow is false, the only - * effect of this method is to make all subsequent calls to - * getService() on this service class fail. - *

- * - * If it is true, a message is also sent out to all - * listeners on the service and all references to it are released. - * - * @param serviceClass the service class to revoke. - * @param provider the service provider providing the service class. - * @param revokeNow whether to release all current references to - * the service. - */ - public void revokeService(Class serviceClass, BeanContextServiceProvider provider, boolean revokeNow); - - /** - * Release your copy of this service. - *

- * - * If all copies of the service's class have been relinquished by - * the requestor, the BeanContextServiceRevokedListener - * previously registered by getService() will be - * unregistered. - * - * @param requestorChild the original BeanContextChild - * requesting the service. - * @param requestor the original requestor of the service. - * @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); - - /** - * Get a service from this BeanContextServices. - *

- * - * The specified listener will be registered to receive a - * revocation notice for the specified serviceClass. One - * notification per service class per requestor object will be - * sent. - *

- * - * The listener will be unregistered when all services that were - * obtained by that requestor for that service class are released. - *

- * - * If the requested service class is not available, or if this - * BeanContextServices object chooses not honor the - * request because the service class has been revoked or for some - * other reason, then this method will return null. - *

- * - * This method may throw unchecked exceptions, so watch out. - * - * @specnote it is not specified what happens when two subsequent - * calls are made to getService() with the - * same requestor object and service class but different - * listeners. Which listener is to be notified? - * - * @param requestorChild the BeanContextChild - * associated with the requestor. Typically this will be - * the same as the requestor itself, but since any - * Object, even one outside the hierarchy, may - * make a request, this parameter is necessary. Only weak - * references to this will be retained, and it will never - * be changed, only queried in a read-only manner. - * @param requestor the actual requestor of the service. Only - * weak references to this will be retained, and it will - * never be changed, only queried in a read-only manner. - * @param serviceClass the Class of the service being - * requested. - * @param serviceSelector a parameter to customize the service - * returned with. - * @param listener a listener that will be notified if the service - * being requested is revoked. - * @return an instance of serviceClass (such that - * instanceof serviceClass is true), or - * null. - */ - public Object getService(BeanContextChild requestorChild, Object requestor, Class serviceClass, Object serviceSelector, BeanContextServiceRevokedListener listener); - - /** - * Get a list of all service classes supported. - *

- * - * This method must synchronize on - * BeanContext.globalHierarchyLock. - * - * @return a list of all service classes supported. - * @see java.beans.beancontext.BeanContext#globalHierarchyLock - */ - public Iterator getCurrentServiceClasses(); - - /** - * Get a list of valid service selectors for the specified service class. - *

- * - * If the specified service class does not have a finite number of - * valid service selectors, it should return null. - * If it takes a general Integer parameter, for - * example, you may as well return null or the poor - * soul who called this method will be iterating all day. - *

- * - * If it has no valid service selectors, it should still return an empty - * Iterator. - * - * @param serviceClass the service class to get selectors for. - * @return a list of valid service selectors for the service - * class, or null. - */ - public Iterator getCurrentServiceSelectors(Class serviceClass); - - /** - * Tell whether the specified service class is available. - * Iff getService() could return a non-null value for the - * specified service, this method will return true. - * - * @param serviceClass the service class to check on. - * @return whether the specified service class is availabe. - */ - 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); - - /** - * Remove a listener on all adds and removes of services. - * @specnote it is not certain whether this should remove this - * listener if it was specified in - * getService(). - * @param listener the listener to add. - */ - public void removeBeanContextServicesListener(BeanContextServicesListener listener); +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 + * information it can gather, including whether the service + * provider is trusted. + * + * @param serviceClass the service class. + * @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); + + /** + * Make it so that no one else can use this service. + *

+ * + * If revokeNow is false, the only + * effect of this method is to make all subsequent calls to + * getService() on this service class fail. + *

+ * + * If it is true, a message is also sent out to all + * listeners on the service and all references to it are released. + * + * @param serviceClass the service class to revoke. + * @param provider the service provider providing the service class. + * @param revokeNow whether to release all current references to + * the service. + */ + public void revokeService (Class serviceClass, + BeanContextServiceProvider provider, + boolean revokeNow); + + /** + * Release your copy of this service. + *

+ * + * If all copies of the service's class have been relinquished by + * the requestor, the BeanContextServiceRevokedListener + * previously registered by getService() will be + * unregistered. + * + * @param requestorChild the original BeanContextChild + * requesting the service. + * @param requestor the original requestor of the service. + * @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); + + /** + * Get a service from this BeanContextServices. + *

+ * + * The specified listener will be registered to receive a + * revocation notice for the specified serviceClass. One + * notification per service class per requestor object will be + * sent. + *

+ * + * The listener will be unregistered when all services that were + * obtained by that requestor for that service class are released. + *

+ * + * If the requested service class is not available, or if this + * BeanContextServices object chooses not honor the + * request because the service class has been revoked or for some + * other reason, then this method will return null. + *

+ * + * This method may throw unchecked exceptions, so watch out. + * + * @specnote it is not specified what happens when two subsequent + * calls are made to getService() with the + * same requestor object and service class but different + * listeners. Which listener is to be notified? + * + * @param requestorChild the BeanContextChild + * associated with the requestor. Typically this will be + * the same as the requestor itself, but since any + * Object, even one outside the hierarchy, may + * make a request, this parameter is necessary. Only weak + * references to this will be retained, and it will never + * be changed, only queried in a read-only manner. + * @param requestor the actual requestor of the service. Only + * weak references to this will be retained, and it will + * never be changed, only queried in a read-only manner. + * @param serviceClass the Class of the service being + * requested. + * @param serviceSelector a parameter to customize the service + * returned with. + * @param listener a listener that will be notified if the service + * being requested is revoked. + * @return an instance of serviceClass (such that + * instanceof serviceClass is true), or + * null. + */ + public Object getService (BeanContextChild requestorChild, Object requestor, + Class serviceClass, Object serviceSelector, + BeanContextServiceRevokedListener listener) + throws TooManyListenersException; + + /** + * Get a list of all service classes supported. + *

+ * + * This method must synchronize on + * BeanContext.globalHierarchyLock. + * + * @return a list of all service classes supported. + * @see java.beans.beancontext.BeanContext#globalHierarchyLock + */ + public Iterator getCurrentServiceClasses (); + + /** + * Get a list of valid service selectors for the specified service class. + *

+ * + * If the specified service class does not have a finite number of + * valid service selectors, it should return null. + * If it takes a general Integer parameter, for + * example, you may as well return null or the poor + * soul who called this method will be iterating all day. + *

+ * + * If it has no valid service selectors, it should still return an empty + * Iterator. + * + * @param serviceClass the service class to get selectors for. + * @return a list of valid service selectors for the service + * class, or null. + */ + public Iterator getCurrentServiceSelectors (Class serviceClass); + + /** + * Tell whether the specified service class is available. + * Iff getService() could return a non-null value for the + * specified service, this method will return true. + * + * @param serviceClass the service class to check on. + * @return whether the specified service class is available. + */ + 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); + + /** + * Remove a listener on all adds and removes of services. + * @specnote it is not certain whether this should remove this + * listener if it was specified in + * getService(). + * @param listener the listener to add. + */ + public void + removeBeanContextServicesListener (BeanContextServicesListener listener); } diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport.java b/libjava/java/beans/beancontext/BeanContextServicesSupport.java index ad6773e68e3..02ee53aa909 100644 --- a/libjava/java/beans/beancontext/BeanContextServicesSupport.java +++ b/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"); } @@ -146,12 +148,14 @@ public class BeanContextServicesSupport throw new Error ("Not implemented"); } - public boolean addService (Class serviceClass, BeanContextServiceProvider bcsp) + public boolean addService (Class serviceClass, BeanContextServiceProvider bcsp) { 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,22 +171,26 @@ 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"); } - protected final void fireServiceAdded (BeanContextServiceAvailableEvent bcssae) + protected final void fireServiceAdded (BeanContextServiceAvailableEvent bcssae) { 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"); } -- 2.30.2