Removed additional addNotify() peer hacks.

From-SVN: r38367

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bed53ea01af10a7196cf9039f99678fca3ecb548..793e410a34967fc6c59a85a2c36cb5507e463e2c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -2,6 +2,12 @@
 
        * java/awt/Window.java (addNotify): Remove peer casting hack now that 
        gcj/312 is fixed.
+       * java/awt/Button.java (addNotify): Likewise.
+       * java/awt/Label.java (addNotify): Likewise.
+       * java/awt/Panel.java (addNotify): Likewise.
+       * java/awt/Scrollbar.java (addNotify): Likewise.
+       * java/awt/Component.java (processPaintEvent): Use peer not getPeer.
+       Remove redundant null checks.
 
 2000-12-18  Joseph S. Myers  <jsm28@cam.ac.uk>
 

diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java
index cee3ae753583109526adcff93c2d70f26faf5d9d..2544e9e4bea643c37307d24fae557535f04a08d0 100644 (file)
--- a/libjava/java/awt/Button.java
+++ b/libjava/java/awt/Button.java
@@ -38,7 +38,7 @@ public class Button extends Component
   public void addNotify ()
   {
     if (peer == null)
-      peer = (ComponentPeer) getToolkit ().createButton (this);
+      peer = getToolkit ().createButton (this);
     super.addNotify();
   }
 

diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java
index 3614b2b5a3014aaf138590afcb7aabe65b6fbd88..09b724470715fc014d29e23e119e6765696f55e8 100644 (file)
--- a/libjava/java/awt/Component.java
+++ b/libjava/java/awt/Component.java
@@ -1306,8 +1306,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
 
   private void processPaintEvent(PaintEvent event)
   {
-    ComponentPeer peer = getPeer();
-       
     // Can't do graphics without peer
     if (peer == null)
       return;
@@ -1319,10 +1317,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
     switch (event.id)
       {
       case PaintEvent.PAINT:
-       if (peer != null) paint(gfx);
+       paint(gfx);
        break;
       case PaintEvent.UPDATE:
-       if (peer != null) update(gfx);
+       update(gfx);
        break;
       default:
        throw new IllegalArgumentException("unknown paint event");

diff --git a/libjava/java/awt/Label.java b/libjava/java/awt/Label.java
index 840456db74feb372db81df53e0aaebe4791d42f2..c184dce03b969916f60965cd93538508a9c0a9e8 100644 (file)
--- a/libjava/java/awt/Label.java
+++ b/libjava/java/awt/Label.java
@@ -42,7 +42,7 @@ public class Label extends Component
   public void addNotify ()
   {
     if (peer == null)
-      peer = (ComponentPeer) getToolkit ().createLabel (this);
+      peer = getToolkit ().createLabel (this);
   }
 
   public int getAlignment ()

diff --git a/libjava/java/awt/Panel.java b/libjava/java/awt/Panel.java
index a6e4f3e39f260e2a24b0328dce69845717f38391..871969584821949d8887593a3a76be868e6ab052 100644 (file)
--- a/libjava/java/awt/Panel.java
+++ b/libjava/java/awt/Panel.java
@@ -32,8 +32,8 @@ public class Panel extends Container
 
   public void addNotify()
   {
-    if (getPeer() == null)
-      peer = (ComponentPeer) getToolkit().createPanel(this);
+    if (peer == null)
+      peer = getToolkit().createPanel(this);
     super.addNotify();
   }
 }

diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java
index 2a65a814e2a7e4157f11194229381f2c92d874ce..88a8d1fec5a497ecc54675aa76ee7a339637476c 100644 (file)
--- a/libjava/java/awt/Scrollbar.java
+++ b/libjava/java/awt/Scrollbar.java
@@ -54,7 +54,7 @@ public class Scrollbar extends Component implements Adjustable
   public void addNotify ()
   {
     if (peer == null)
-      peer = (ComponentPeer) getToolkit ().createScrollbar (this);
+      peer = getToolkit ().createScrollbar (this);
   }
 
   public int getOrientation ()