From 73c87b405d1e5344eeae341c80432ecf3e796ca2 Mon Sep 17 00:00:00 2001 From: rolfwr Date: Wed, 16 Aug 2000 18:03:48 +0000 Subject: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35748 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/awt/Graphics.java | 216 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 5 deletions(-) (limited to 'libjava/java/awt/Graphics.java') diff --git a/libjava/java/awt/Graphics.java b/libjava/java/awt/Graphics.java index 8b11f812113..56c732fc2f1 100644 --- a/libjava/java/awt/Graphics.java +++ b/libjava/java/awt/Graphics.java @@ -8,6 +8,8 @@ details. */ package java.awt; +import java.awt.image.ImageObserver; + /** * @author Warren Levy * @date March 15, 2000. @@ -16,14 +18,218 @@ package java.awt; /** * Written using on-line Java Platform 1.2 API Specification, as well * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). - * Status: Stubbed; A very incomplete placeholder. + * Status: Almost complete */ -public abstract class Graphics extends Object +public abstract class Graphics { - protected Graphics() + protected Graphics() {} + + public abstract Graphics create(); + + public Graphics create(int x, int y, int width, int height) + { + Graphics gfx = create(); + gfx.translate(x, y); + gfx.setClip(0, y, width, height); + return gfx; + } + + public abstract void translate(int x, int y); + + public abstract Color getColor(); + + public abstract void setColor(Color color); + + public abstract void setPaintMode(); + + public abstract void setXORMode(Color altColor); + + public abstract Font getFont(); + + public abstract void setFont(Font font); + + public FontMetrics getFontMetrics() + { + return getFontMetrics(getFont()); + } + + public abstract FontMetrics getFontMetrics(Font font); + + public abstract Rectangle getClipBounds(); + + public abstract void clipRect(int x, int y, int width, int height); + + public abstract void setClip(int x, int y, int width, int height); + + public abstract Shape getClip(); + + public abstract void setClip(Shape clip); + + public abstract void copyArea(int x, int y, int width, int height, + int dx, int dy); + + public abstract void drawLine(int x1, int y1, int x2, int y2); + + public abstract void fillRect(int x, int y, int width, int height); + + public void drawRect(int x, int y, int width, int height) + { + int x1 = x; + int y1 = y; + int x2 = x + width; + int y2 = y + height; + drawLine(x1, y1, x2, y1); + drawLine(x2, y1, x2, y2); + drawLine(x2, y2, x1, y2); + drawLine(x1, y2, x1, y1); + } + + public abstract void clearRect(int x, int y, int width, int height); + + public abstract void drawRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight); + + public abstract void fillRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight); + + public void draw3DRect(int x, int y, int width, int height, + boolean raised) + { + Color color = getColor(); + Color tl = color.brighter(); + Color br = color.darker(); + + if (!raised) + { + Color tmp = tl; + tl = br; + br = tmp; + } + + int x1 = x; + int y1 = y; + int x2 = x + width; + int y2 = y + height; + + setColor(tl); + drawLine(x1, y1, x2, y1); + drawLine(x1, y2, x1, y1); + setColor(br); + drawLine(x2, y1, x2, y2); + drawLine(x2, y1, x1, y2); + setColor(color); + } + + public void fill3DRect(int x, int y, int width, int height, + boolean raised) + { + fillRect(x, y, width, height); + draw3DRect(x, y, width-1, height-1, raised); + } + + public abstract void drawOval(int x, int y, int width, int height); + + public abstract void fillOval(int x, int y, int width, int height); + + public abstract void drawArc(int x, int y, int width, int height, + int startAngle, int arcAngle); + + public abstract void fillArc(int x, int y, int width, int height, + int startAngle, int arcAngle); + + public abstract void drawPolyline(int[] xPoints, int[] yPoints, + int nPoints); + + public abstract void drawPolygon(int[] xPoints, int[] yPoints, + int nPoints); + + //public void drawPolygon(Polygon p); + + public abstract void fillPolygon(int[] xPoints, int[] yPoints, + int nPoints); + + //public void fillPolygon(Polygon p); + + public abstract void drawString(String str, int x, int y); + + /* + public abstract void drawString(AttributedCharacterIterator iterator, + int x, int y) + */ + + public void drawChars(char[] data, int offset, int length, + int x, int y) + { + String str = new String(data, offset, length); + drawString(str, x, y); + } + + public void drawBytes(byte[] data, int offset, int length, + int x, int y) + { + String str = new String(data, offset, length); + drawString(str, x, y); + } + + public abstract boolean drawImage(Image img, int x, int y, + ImageObserver observer); + + public abstract boolean drawImage(Image img, int x, int y, + int width, int height, + ImageObserver observer); + + public abstract boolean drawImage(Image img, int x, int y, Color bgcolor, + ImageObserver observer); + + public abstract boolean drawImage(Image img, int x, int y, + int width, int height, Color bgcolor, + ImageObserver observer); + + public abstract boolean drawImage(Image img, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + ImageObserver observer); + + public abstract boolean drawImage(Image img, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer); + + public abstract void dispose(); + + public void finalize() + { + dispose(); + } + + public String toString() + { + return super.toString(); // FIXME + } + + /** @deprecated */ + public Rectangle getClipRect() { - super(); // ??? - throw new Error ("java.awt.Graphics: not implemented"); + return getClipBounds(null); + } + + public boolean hitClip(int x, int y, int width, int height) + { + throw new UnsupportedOperationException("not implemented yet"); + } + + public Rectangle getClipBounds(Rectangle r) + { + Rectangle clipBounds = getClipBounds(); + + if (r == null) + return clipBounds; + + r.x = clipBounds.x; + r.y = clipBounds.y; + r.width = clipBounds.width; + r.height = clipBounds.height; + return r; } } -- cgit v1.2.3