From 777e6d799a6db0549568c5dd668a226194486c02 Mon Sep 17 00:00:00 2001 From: "Rolf W. Rasmussen" Date: Wed, 16 Aug 2000 20:03:48 +0200 Subject: ComponentDataBlitOp.java: New file. * gnu/gcj/awt/ComponentDataBlitOp.java: New file. * gnu/gcj/awt/GLightweightPeer.java: New file. * java/awt/BorderLayout.java: Implemented all methods. * java/awt/Button.java (actionListener, actionCommand): Renamed and modifier change. (addNotify): Call super. (dispatchEventImpl): New method. (getListeners): New method. (label): Made package-private, not private. * java/awt/Canvas.java: Implemented class body. * java/awt/Color.java (brighter): New method. (darker): New method. (hashCode): New method. * java/awt/Component.java (visible, enabled, eventMask): Set defaults. (getGraphicsConfiguration): Delegate to getGraphicsConfigurationImpl(). (getGraphicsConfigurationImpl): New method. (getToolkit): Only return value from peer if not null. (isDisplayable): Check with parent. (isShowing): No parent implies not showing. (getForeground): Check parent property if local is null. (getBackground): Likewise. (getFont): Likewise. (setForeground): Inform peer. (setBackground): Likewise (setLocale): Invalidate component. (getColorModel): Implemented. (setLocation): Invalidate, or ignore if no change. (setSize): Invalidate, or ignore if no change. (setBounds): Invalidate, or ignore if no change. (isOpaque): By default, heavyweight implies opaque. (isLightweight): Implemented. (getMaximumSize): Implemented. (doLayout): Implemented, NOP. (validate): Implemented, NOP. (invalidate): Only propagate to parent if parent was valid. (getGraphics): Implemented. (getFontMetrics): Implemented. (update): Implemented. (paintAll): Implemented. (repaint): Implemented all repaint methods. (print): Implemented. (printAll): Implemented. (createImage): Implemented. (dispatchEvent): Give the peer a chance to handle the event. (dispatchEventImpl): Dispatch paint events. (enableEvents): Lightweights enable events on parent component. (coalesceEvents): Coalesce paint events, and select event type using a switch. (coalescePaintEvents): New method. (processEvent): Fix unfortunate ordering of statements, and call correct method for MOUSE_CLICKED. (processPaintEvent): New method. (addNotify): Allow container to notify children before event mask is set in peer. (addNotifyContainerChildren): New method. (removeNotify): Visibility should not change on removeNotify. (paramString): Implemented. (list): Implemented two of the list methods. * Container (myInsets): Removed, insets are managed by peer. (getInsets): Query peer. (addImpl): Fix reparenting, enable events for lightweights, initialize component array. (validate): Call doLayout in validateTree() instead. (validateTree): Do nothing if already valid. Call beginValidate(), endValidate() on peer. Call validateTree() instead of validate() for children that are containers. Mark valid after validation of children. (setFont): Partial implementation. (paint): Implemented. (visitChildren): New method. (visitChild): New method. (update): Implemented. (print): Implemented. (paintComponents): Implemented. (printComponents): Consider translation and clipping. (getComponentAt): Ignore invisible children. Return this if no child match. (addNotify): Call super. (addNotifyContainerChildren): New method. (paramString): Implemented. (list): Implemented. * java/awt/EventQueue (invokeAndWait): Get system event queue the right way. (invokeLater): Likewise. (isDispatchThread): Likewise. * java/awt/FontMetrics (getLeading): Formula change. (getDescent): Consider leading also. (getMaxAscent): Default to getAscent(). (getMaxDescent): Default to getDescent. (getMaxAdvance): Return value signifying unknown. (charWidth): Both methods implemented. (charsWidth): Implemented. (bytesWidth): Implemented. (getWidths): Implemented. * java/awt/Frame.java (NORMAL, ICONIFIED, iconImage, isResizable, state): New fields. (Frame): Rearragend constuctor chaining to disallow null being passed as a graphics configuration. (getTitle): Return empty string if null. (dispose): Removed. (getIconImage): New method. (setIconImage): New method. (finalize): New method. (setMenuBar): Notify peer. (isResizable): New method. (setResizable): New method. (getState): New method. (getFont): Removed. (remove): Implemented. (removeNotify): New method. (getFrames): New method. * java/awt/Graphics.java: Implemented body of class. * java/awt/Graphics2D.java: New file. * java/awt/GraphicsConfiguration.java: Enabled part of the API. * java/awt/Image.java: Implemented body of class. * java/awt/Panel.java (Panel): Call correct super constructor. (addNotify): Implemented. * java/awt/Rectangle.java (isEmpty): Fixed reversed logic. * java/awt/RenderingHints.java: New file. * java/awt/Toolkit.java (createComponent): Implemented. (getSystemEventQueue): Delegate to getSystemEventQueueImpl(). * java/awt/Window.java (Window): Two new constructors. Reordered constructor chaining. (getGraphicsConfigurationImpl): New method. (finalize): Call super. (addNotify): Call super. (pack): Do layout stuff. (show): Ensure that peer exists and that component is valid. (dispose): Dispose owned children. (getOwner): Simplify code, casting null pointers is valid. (getGraphicsConfiguration): Ask peer if local value is null. * java/awt/event/ActionEvent.java (getActionCommand): Renamed from getcmd(). * java/awt/image/BufferedImage.java: New file. * java/awt/image/RasterOp.java: New file. * java/awt/peer/ComponentPeer.java (getGraphicsConfiguration): More powerfull replacement for getColorModel(). (getColorModel) Removed. (setEventMask) New method. * Makefile.am: Added new files. * Makefile.in: Rebuilt. From-SVN: r35748 --- libjava/java/awt/Frame.java | 111 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 8 deletions(-) (limited to 'libjava/java/awt/Frame.java') diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index fb9f7fd..22497f7 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -13,22 +13,43 @@ import java.awt.peer.FramePeer; public class Frame extends Window implements MenuContainer { + public static final int NORMAL = 0; + public static final int ICONIFIED = 1; + MenuBar menuBar = null; String title; + private transient Image iconImage; + private transient boolean isResizable = true; + private transient int state = NORMAL; + public Frame () { - super (null); + super(); + } + + public Frame(GraphicsConfiguration gc) + { + super(gc); } public Frame (String title) { - super (null); + super(); setTitle(title); } - public String getTitle () { return title; } + public Frame(String title, GraphicsConfiguration gc) + { + super(gc); + setTitle(title); + } + public String getTitle() + { + return (title != null) ? title : ""; + } + public void setTitle (String title) { this.title = title; @@ -36,11 +57,60 @@ public class Frame extends Window implements MenuContainer ((FramePeer)peer).setTitle(title); } - public synchronized void dispose () - { /* FIXME */ } + public Image getIconImage() + { + return iconImage; + } + + public void setIconImage(Image image) + { + iconImage = image; + if (peer != null) + ((FramePeer) peer).setIconImage(iconImage); + } + + protected void finalize() throws Throwable + { + //frames.remove(this); + /* FIXME: This won't work. Finalize will never be called if frames + has a reference to the object. We need weak references to + implement this correctly. */ + + super.finalize(); + } public synchronized void setMenuBar (MenuBar menuBar) - { this.menuBar = menuBar; } + { + if (this.menuBar != menuBar) + { + //this.menuBar.removeNotify(); + this.menuBar = menuBar; + //this.menuBar.addNotify(); + } + + if (peer != null) + ((FramePeer) peer).setMenuBar(menuBar); + } + + public boolean isResizable() + { + return isResizable; + } + + public void setResizable(boolean resizable) + { + isResizable = resizable; + if (peer != null) + ((FramePeer) peer).setResizable(isResizable); + } + + public int getState() + { + /* FIXME: State might have changed in the peer... Must check. */ + + return state; + } + public synchronized void addNotify () { @@ -49,7 +119,32 @@ public class Frame extends Window implements MenuContainer super.addNotify(); } - public Font getFont() { return null; } // FIXME public boolean postEvent(Event evt) { return false; } // FIXME - public void remove(MenuComponent comp) { } // FIXME + + public void remove(MenuComponent m) + { + if (m == menuBar) + { + setMenuBar(null); + return; + } + + super.remove(m); + } + + public void removeNotify() + { + //if ((peer != null) && (menuBar != null)) menuBar.removeNotify(); + super.removeNotify(); + } + + public static Frame[] getFrames() + { + //Frame[] array = new Frames[frames.size()]; + //return frames.toArray(array); + + // see finalize() comment + String msg = "FIXME: can't be implemented without weak references"; + throw new UnsupportedOperationException(msg); + } } -- cgit v1.1