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

equal deleted inserted replaced

-:a016d2637922
+:bac0a7ff7e1e
 * behavior. The peer is set when the <code>Component</code> is
 * added to a container that also is a peer.
 * @see #addNotify
 * @see #removeNotify
 */
-transient ComponentPeer peer;
+transient volatile ComponentPeer peer;
 /**
 * The parent of the object. It may be <code>null</code>
 * for top-level components.
 * @see #getParent
 return comp.peer != null;
 }
 public Cursor getCursor(Component comp) {
 return comp.getCursor_NoClientCode();
 }
-public ComponentPeer getPeer(Component comp) {
+@SuppressWarnings("unchecked")
-return comp.peer;
+public <T extends ComponentPeer> T getPeer(Component comp) {
+return (T) comp.peer;
 }
 public void setPeer(Component comp, ComponentPeer peer) {
 comp.peer = peer;
 }
 public boolean isLightweight(Component comp) {
 // This method is overridden in the Window class to return null,
 //    because the parent field of the Window object contains
 //    the owner of the window, not its parent.
 Container getContainer() {
 return getParent_NoClientCode();
-}
-/**
-* @deprecated As of JDK version 1.1,
-* programs should not directly manipulate peers;
-* replaced by <code>boolean isDisplayable()</code>.
-* @return the peer for this component
-*/
-@Deprecated
-public ComponentPeer getPeer() {
-return peer;
 }
 /**
 * Associate a <code>DropTarget</code> with this component.
 * The <code>Component</code> will receive drops only if it
 return false;
 }
 graphicsConfig = gc;
-ComponentPeer peer = getPeer();
+ComponentPeer peer = this.peer;
 if (peer != null) {
 return peer.updateGraphicsData(gc);
 }
 return false;
 }
 * @see Container#remove(Component)
 * @see Window#dispose
 * @since 1.2
 */
 public boolean isDisplayable() {
-return getPeer() != null;
+return peer != null;
 }
 /**
 * Determines whether this component should be visible when its
 * parent is visible. Components are
 * @return true if this component is completely opaque
 * @see #isLightweight
 * @since 1.2
 */
 public boolean isOpaque() {
-if (getPeer() == null) {
+if (peer == null) {
 return false;
 }
 else {
 return !isLightweight();
 }
 *         it has a native peer or no peer
 * @see #isDisplayable
 * @since 1.2
 */
 public boolean isLightweight() {
-return getPeer() instanceof LightweightPeer;
+return peer instanceof LightweightPeer;
 }
 /**
 * Sets the preferred size of this component to a constant
 * {@link Font Font} class.
 * @param font the font for which font metrics is to be
 *          obtained
 * @return the font metrics for <code>font</code>
 * @see       #getFont
-* @see       #getPeer
 * @see       java.awt.peer.ComponentPeer#getFontMetrics(Font)
 * @see       Toolkit#getFontMetrics(Font)
 * @since     1.0
 */
 public FontMetrics getFontMetrics(Font font) {
 if (peer instanceof LightweightPeer) {
 Container nativeContainer = getNativeContainer();
 if (nativeContainer == null) return;
-ComponentPeer cPeer = nativeContainer.getPeer();
+ComponentPeer cPeer = nativeContainer.peer;
 if (cPeer != null) {
 cPeer.updateCursorImmediately();
 }
 } else if (peer != null) {
 // processes event
 Component source = (Component)e.getSource();
 if (source != null) {
 Container target = source.getNativeContainer();
 if (target != null) {
-tpeer = target.getPeer();
+tpeer = target.peer;
 }
 }
 }
 if (tpeer != null) {
 tpeer.handleEvent(e);
 }
 return;
 }
 if (!isLightweight()) {
-ComponentPeer peer = getPeer();
+ComponentPeer peer = this.peer;
 if (peer != null) {
 // The Region class has some optimizations. That's why
 // we should manually check whether it's empty and
 // substitute the object ourselves. Otherwise we end up
 // with some incorrect Region object with loX being
 while (cont != null) {
 for (int i = indexAbove; i > -1; i--) {
 Component comp = cont.getComponent(i);
 if (comp != null && comp.isDisplayable() && !comp.isLightweight()) {
-return comp.getPeer();
+return comp.peer;
 }
 }
 // traversing the hierarchy up to the closest HW container;
 // further traversing may return a component that is not actually
 // a native sibling of this component and this kind of z-order

changeset 30469	bac0a7ff7e1e
parent 29886	545c0c3809b8
child 30470	bd197b8eda21