Commit be36b6d0 by Bryce McKinlay Committed by Bryce McKinlay

Removed additional addNotify() peer hacks.

From-SVN: r38367
parent 2cb5082c
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
* java/awt/Window.java (addNotify): Remove peer casting hack now that * java/awt/Window.java (addNotify): Remove peer casting hack now that
gcj/312 is fixed. 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> 2000-12-18 Joseph S. Myers <jsm28@cam.ac.uk>
......
...@@ -38,7 +38,7 @@ public class Button extends Component ...@@ -38,7 +38,7 @@ public class Button extends Component
public void addNotify () public void addNotify ()
{ {
if (peer == null) if (peer == null)
peer = (ComponentPeer) getToolkit ().createButton (this); peer = getToolkit ().createButton (this);
super.addNotify(); super.addNotify();
} }
......
...@@ -1306,8 +1306,6 @@ public abstract class Component implements ImageObserver, MenuContainer, ...@@ -1306,8 +1306,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
private void processPaintEvent(PaintEvent event) private void processPaintEvent(PaintEvent event)
{ {
ComponentPeer peer = getPeer();
// Can't do graphics without peer // Can't do graphics without peer
if (peer == null) if (peer == null)
return; return;
...@@ -1319,10 +1317,10 @@ public abstract class Component implements ImageObserver, MenuContainer, ...@@ -1319,10 +1317,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
switch (event.id) switch (event.id)
{ {
case PaintEvent.PAINT: case PaintEvent.PAINT:
if (peer != null) paint(gfx); paint(gfx);
break; break;
case PaintEvent.UPDATE: case PaintEvent.UPDATE:
if (peer != null) update(gfx); update(gfx);
break; break;
default: default:
throw new IllegalArgumentException("unknown paint event"); throw new IllegalArgumentException("unknown paint event");
......
...@@ -42,7 +42,7 @@ public class Label extends Component ...@@ -42,7 +42,7 @@ public class Label extends Component
public void addNotify () public void addNotify ()
{ {
if (peer == null) if (peer == null)
peer = (ComponentPeer) getToolkit ().createLabel (this); peer = getToolkit ().createLabel (this);
} }
public int getAlignment () public int getAlignment ()
......
...@@ -32,8 +32,8 @@ public class Panel extends Container ...@@ -32,8 +32,8 @@ public class Panel extends Container
public void addNotify() public void addNotify()
{ {
if (getPeer() == null) if (peer == null)
peer = (ComponentPeer) getToolkit().createPanel(this); peer = getToolkit().createPanel(this);
super.addNotify(); super.addNotify();
} }
} }
...@@ -54,7 +54,7 @@ public class Scrollbar extends Component implements Adjustable ...@@ -54,7 +54,7 @@ public class Scrollbar extends Component implements Adjustable
public void addNotify () public void addNotify ()
{ {
if (peer == null) if (peer == null)
peer = (ComponentPeer) getToolkit ().createScrollbar (this); peer = getToolkit ().createScrollbar (this);
} }
public int getOrientation () public int getOrientation ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment