jdk-sandbox: comparison jdk/src/share/classes/java/awt/Container.java

equal deleted inserted replaced

-:192552ca8292
+:c90a9d542c79
 focusTraversalKeys = new Set[4];
 }
 /**
 * Gets the number of components in this panel.
+* <p>
+* Note: This method should be called under AWT tree lock.
+*
 * @return    the number of components in this panel.
 * @see       #getComponent
 * @since     JDK1.1
+* @see Component#getTreeLock()
 */
 public int getComponentCount() {
 return countComponents();
 }
 * @deprecated As of JDK version 1.1,
 * replaced by getComponentCount().
 */
 @Deprecated
 public int countComponents() {
-synchronized (getTreeLock()) {
+// This method is not synchronized under AWT tree lock.
-return component.size();
+// Instead, the calling code is responsible for the
-}
+// synchronization. See 6784816 for details.
+return component.size();
 }
 /**
 * Gets the nth component in this container.
+* <p>
+* Note: This method should be called under AWT tree lock.
+*
 * @param      n   the index of the component to get.
 * @return     the n<sup>th</sup> component in this container.
 * @exception  ArrayIndexOutOfBoundsException
 *                 if the n<sup>th</sup> value does not exist.
+* @see Component#getTreeLock()
 */
 public Component getComponent(int n) {
-synchronized (getTreeLock()) {
+// This method is not synchronized under AWT tree lock.
-if ((n < 0) || (n >= component.size())) {
+// Instead, the calling code is responsible for the
-throw new ArrayIndexOutOfBoundsException("No such child: " + n);
+// synchronization. See 6784816 for details.
-}
+try {
 return component.get(n);
+} catch (IndexOutOfBoundsException z) {
+throw new ArrayIndexOutOfBoundsException("No such child: " + n);
 }
 }
 /**
 * Gets all the components in this container.
+* <p>
+* Note: This method should be called under AWT tree lock.
+*
 * @return    an array of all the components in this container.
+* @see Component#getTreeLock()
 */
 public Component[] getComponents() {
+// This method is not synchronized under AWT tree lock.
+// Instead, the calling code is responsible for the
+// synchronization. See 6784816 for details.
 return getComponents_NoClientCode();
 }
 // NOTE: This method may be called by privileged threads.
 //       This functionality is implemented in a package-private method
 //       to insure that it cannot be overridden by client subclasses.
 //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
 final Component[] getComponents_NoClientCode() {
+return component.toArray(EMPTY_ARRAY);
+}
+/*
+* Wrapper for getComponents() method with a proper synchronization.
+*/
+Component[] getComponentsSync() {
 synchronized (getTreeLock()) {
-return component.toArray(EMPTY_ARRAY);
+return getComponents();
 }
-} // getComponents_NoClientCode()
+}
 /**
 * Determines the insets of this container, which indicate the size
 * of the container's border.
 * <p>
 throw new IllegalArgumentException(
 "illegal component position");
 }
 checkAddToSelf(comp);
 checkNotAWindow(comp);
 if (thisGC != null) {
 comp.checkGD(thisGC.getDevice().getIDstring());
 }
 /* Reparent the component and tidy up the tree's state. */
 if (comp.parent != null) {
 comp.parent.remove(comp);
 if (index > component.size()) {
 }
 return descendantsCount + 1;
 }
 private int getListenersCount(int id, boolean enabledOnToolkit) {
-assert Thread.holdsLock(getTreeLock());
+checkTreeLock();
 if (enabledOnToolkit) {
 return descendantsCount;
 }
 switch (id) {
 case HierarchyEvent.HIERARCHY_CHANGED:
 }
 final int createHierarchyEvents(int id, Component changed,
 Container changedParent, long changeFlags, boolean enabledOnToolkit)
 {
-assert Thread.holdsLock(getTreeLock());
+checkTreeLock();
 int listeners = getListenersCount(id, enabledOnToolkit);
 for (int count = listeners, i = 0; count > 0; i++) {
 count -= component.get(i).createHierarchyEvents(id, changed,
 changedParent, changeFlags, enabledOnToolkit);
 }
 final void createChildHierarchyEvents(int id, long changeFlags,
 boolean enabledOnToolkit)
 {
-assert Thread.holdsLock(getTreeLock());
+checkTreeLock();
 if (component.isEmpty()) {
 return;
 }
 int listeners = getListenersCount(id, enabledOnToolkit);
 *
 * @see #doLayout
 * @see #validate
 */
 protected void validateTree() {
+checkTreeLock();
 if (!isValid()) {
 if (peer instanceof ContainerPeer) {
 ((ContainerPeer)peer).beginLayout();
 }
 doLayout();
 // Paint self and forward the paint to lightweight subcomponents.
 // super.paint(); -- Don't bother, since it's a NOP.
 GraphicsCallback.PaintCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.LIGHTWEIGHTS);
+runComponents(getComponentsSync(), g, GraphicsCallback.LIGHTWEIGHTS);
 }
 }
 /**
 * Updates the container.  This forwards the update to any lightweight
 printing = !printingThreads.isEmpty();
 }
 }
 GraphicsCallback.PrintCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.LIGHTWEIGHTS);
+runComponents(getComponentsSync(), g, GraphicsCallback.LIGHTWEIGHTS);
 }
 }
 /**
 * Paints each of the components in this container.
 * @see       Component#paintAll
 */
 public void paintComponents(Graphics g) {
 if (isShowing()) {
 GraphicsCallback.PaintAllCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.TWO_PASSES);
+runComponents(getComponentsSync(), g, GraphicsCallback.TWO_PASSES);
 }
 }
 /**
 * Simulates the peer callbacks into java.awt for printing of
 * Prints all the heavyweight subcomponents.
 */
 void paintHeavyweightComponents(Graphics g) {
 if (isShowing()) {
 GraphicsCallback.PaintHeavyweightComponentsCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.LIGHTWEIGHTS |
+runComponents(getComponentsSync(), g,
-GraphicsCallback.HEAVYWEIGHTS);
+GraphicsCallback.LIGHTWEIGHTS | GraphicsCallback.HEAVYWEIGHTS);
 }
 }
 /**
 * Prints each of the components in this container.
 * @see       Component#printAll
 */
 public void printComponents(Graphics g) {
 if (isShowing()) {
 GraphicsCallback.PrintAllCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.TWO_PASSES);
+runComponents(getComponentsSync(), g, GraphicsCallback.TWO_PASSES);
 }
 }
 /**
 * Simulates the peer callbacks into java.awt for printing of
 * Prints all the heavyweight subcomponents.
 */
 void printHeavyweightComponents(Graphics g) {
 if (isShowing()) {
 GraphicsCallback.PrintHeavyweightComponentsCallback.getInstance().
-runComponents(component.toArray(EMPTY_ARRAY), g, GraphicsCallback.LIGHTWEIGHTS |
+runComponents(getComponentsSync(), g,
-GraphicsCallback.HEAVYWEIGHTS);
+GraphicsCallback.LIGHTWEIGHTS | GraphicsCallback.HEAVYWEIGHTS);
 }
 }
 /**
 * Adds the specified container listener to receive container events
 * @see Component#contains
 * @see #getComponentAt
 * @since 1.2
 */
 public Component findComponentAt(int x, int y) {
-synchronized (getTreeLock()) {
+return findComponentAt(x, y, true);
-return findComponentAt(x, y, true);
-}
 }
 /**
 * Private version of findComponentAt which has a controllable
 * behavior. Setting 'ignoreEnabled' to 'false' bypasses disabled
 * The cursor code calls this function directly via native code.
 *
 * The addition of this feature is temporary, pending the
 * adoption of new, public API which exports this feature.
 */
-final Component findComponentAt(int x, int y, boolean ignoreEnabled)
+final Component findComponentAt(int x, int y, boolean ignoreEnabled) {
-{
+synchronized (getTreeLock()) {
 if (isRecursivelyVisible()){
 return findComponentAtImpl(x, y, ignoreEnabled);
+}
 }
 return null;
 }
 final Component findComponentAtImpl(int x, int y, boolean ignoreEnabled){
+checkTreeLock();
 if (!(contains(x, y) && visible && (ignoreEnabled || enabled))) {
 return null;
 }
 // Two passes: see comment in sun.awt.SunGraphicsCallback
-synchronized (getTreeLock()) {
+for (int i = 0; i < component.size(); i++) {
-for (int i = 0; i < component.size(); i++) {
+Component comp = component.get(i);
-Component comp = component.get(i);
+if (comp != null &&
-if (comp != null &&
+!(comp.peer instanceof LightweightPeer)) {
-!(comp.peer instanceof LightweightPeer)) {
+if (comp instanceof Container) {
-if (comp instanceof Container) {
+comp = ((Container)comp).findComponentAtImpl(x - comp.x,
-comp = ((Container)comp).findComponentAtImpl(x - comp.x,
+y - comp.y,
-y - comp.y,
+ignoreEnabled);
-ignoreEnabled);
+} else {
-} else {
+comp = comp.locate(x - comp.x, y - comp.y);
-comp = comp.locate(x - comp.x, y - comp.y);
+}
-}
+if (comp != null && comp.visible &&
-if (comp != null && comp.visible &&
+(ignoreEnabled || comp.enabled))
-(ignoreEnabled || comp.enabled))
+{
-{
+return comp;
-return comp;
+}
 }
 }
-}
+for (int i = 0; i < component.size(); i++) {
-for (int i = 0; i < component.size(); i++) {
+Component comp = component.get(i);
-Component comp = component.get(i);
+if (comp != null &&
-if (comp != null &&
+comp.peer instanceof LightweightPeer) {
-comp.peer instanceof LightweightPeer) {
+if (comp instanceof Container) {
-if (comp instanceof Container) {
+comp = ((Container)comp).findComponentAtImpl(x - comp.x,
-comp = ((Container)comp).findComponentAtImpl(x - comp.x,
+y - comp.y,
-y - comp.y,
+ignoreEnabled);
-ignoreEnabled);
+} else {
-} else {
+comp = comp.locate(x - comp.x, y - comp.y);
-comp = comp.locate(x - comp.x, y - comp.y);
+}
-}
+if (comp != null && comp.visible &&
-if (comp != null && comp.visible &&
+(ignoreEnabled || comp.enabled))
-(ignoreEnabled || comp.enabled))
+{
-{
+return comp;
-return comp;
+}
 }
 }
-}
-}
 return this;
 }
 /**
 * Locates the visible child component that contains the specified
 * @see #readObject(ObjectInputStream)
 */
 private void writeObject(ObjectOutputStream s) throws IOException {
 ObjectOutputStream.PutField f = s.putFields();
 f.put("ncomponents", component.size());
-f.put("component", component.toArray(EMPTY_ARRAY));
+f.put("component", getComponentsSync());
 f.put("layoutMgr", layoutMgr);
 f.put("dispatcher", dispatcher);
 f.put("maxSize", maxSize);
 f.put("focusCycleRoot", focusCycleRoot);
 f.put("containerSerializedDataVersion", containerSerializedDataVersion);

changeset 2463	c90a9d542c79
parent 2462	192552ca8292
child 2644	63360b4ca6c4