diff options
Diffstat (limited to 'libjava/java/awt')
| -rw-r--r-- | libjava/java/awt/Graphics2D.java | 37 | ||||
| -rw-r--r-- | libjava/java/awt/GridBagLayout.java | 92 | ||||
| -rw-r--r-- | libjava/java/awt/image/MemoryImageSource.java | 2 |
3 files changed, 108 insertions, 23 deletions
diff --git a/libjava/java/awt/Graphics2D.java b/libjava/java/awt/Graphics2D.java index aa662fc..879fae5 100644 --- a/libjava/java/awt/Graphics2D.java +++ b/libjava/java/awt/Graphics2D.java @@ -37,9 +37,14 @@ exception statement from your version. */ package java.awt; import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.awt.image.RenderedImage; import java.awt.image.ImageObserver; +import java.awt.image.renderable.RenderableImage; -//import java.util.Map; +import java.text.AttributedCharacterIterator; + +import java.util.Map; /** * @author Rolf W. Rasmussen <rolfwr@ii.uib.no> @@ -68,40 +73,28 @@ public abstract class Graphics2D extends Graphics public abstract boolean drawImage(Image image, AffineTransform xform, ImageObserver obs); - /* public abstract void drawImage(BufferedImage image, - BufferedImageOp op, + BufferedImage op, int x, int y); - */ - /* public abstract void drawRenderedImage(RenderedImage image, AffineTransform xform); - */ - /* public abstract void drawRenderableImage(RenderableImage image, AffineTransform xform); - */ public abstract void drawString(String text, int x, int y); public abstract void drawString(String text, float x, float y); - /* public abstract void drawString(AttributedCharacterIterator iterator, int x, int y); - */ - /* public abstract void drawString(AttributedCharacterIterator iterator, float x, float y); - */ - /* - public abstract void drawGlyphVector(GlyphVector g, float x, float y); - */ + // public abstract void drawGlyphVector(GlyphVector g, float x, float y); public abstract void fill(Shape shape); @@ -110,20 +103,20 @@ public abstract class Graphics2D extends Graphics public abstract GraphicsConfiguration getDeviceConfiguration(); - //public abstract void setComposite(Composite comp); + public abstract void setComposite(Composite comp); public abstract void setPaint(Paint paint); - //public abstract void setStroke(Stroke stroke) + public abstract void setStroke(Stroke stroke); public abstract void setRenderingHint(RenderingHints.Key hintKey, Object hintValue); public abstract Object getRenderingHint(RenderingHints.Key hintKey); - //public abstract void setRenderingHints(Map hints); + public abstract void setRenderingHints(Map hints); - //public abstract void addRenderingHints(Map hints); + public abstract void addRenderingHints(Map hints); public abstract RenderingHints getRenderingHints(); @@ -147,15 +140,15 @@ public abstract class Graphics2D extends Graphics public abstract Paint getPaint(); - //public abstract Composite getComposite(); + public abstract Composite getComposite(); public abstract void setBackground(Color color); public abstract Color getBackground(); - //public abstract Stroke getStroke(); + public abstract Stroke getStroke(); public abstract void clip(Shape s); - //public abstract FontRenderContext getFontRenderContext() + // public abstract FontRenderContext getFontRenderContext(); } diff --git a/libjava/java/awt/GridBagLayout.java b/libjava/java/awt/GridBagLayout.java new file mode 100644 index 0000000..29e1bea --- /dev/null +++ b/libjava/java/awt/GridBagLayout.java @@ -0,0 +1,92 @@ +/* GridBagLayout - Layout manager for components according to GridBagConstraints + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.awt; + +import java.io.Serializable; + +/** + * Stub implementeation. + */ +public class GridBagLayout + implements Serializable, LayoutManager2 +{ + public void addLayoutComponent(String name, Component component) + { + } + + public void removeLayoutComponent(Component component) + { + } + + public Dimension preferredLayoutSize(Container parent) + { + return null; + } + + public Dimension minimumLayoutSize(Container parent) + { + return null; + } + + public void layoutContainer(Container parent) + { + } + + public void addLayoutComponent(Component component, Object contraint) + { + } + + public Dimension maximumLayoutSize(Container target) + { + return null; + } + + public float getLayoutAlignmentX(Container target) + { + return 0.0f; + } + + public float getLayoutAlignmentY(Container target) + { + return 0.0f; + } + + public void invalidateLayout(Container target) + { + } +} diff --git a/libjava/java/awt/image/MemoryImageSource.java b/libjava/java/awt/image/MemoryImageSource.java index fce112a..0e8d462 100644 --- a/libjava/java/awt/image/MemoryImageSource.java +++ b/libjava/java/awt/image/MemoryImageSource.java @@ -116,7 +116,7 @@ public class MemoryImageSource implements ImageProducer Constructs an ImageProducer from memory using the default RGB ColorModel */ public MemoryImageSource(int w, int h, - byte pix[], int off, int scan) + int pix[], int off, int scan) { this ( w, h, ColorModel.getRGBdefault(), pix, off, scan, null); } |