Removed additional addNotify() peer hacks.

From-SVN: r38367
This commit is contained in:
Bryce McKinlay 2000-12-18 22:17:25 +00:00 committed by Bryce McKinlay
parent 2cb5082c1e
commit be36b6d0dd
6 changed files with 13 additions and 9 deletions

View File

@ -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>

View File

@ -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();
}

View File

@ -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");

View File

@ -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 ()

View File

@ -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();
}
}

View File

@ -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 ()