diff options
author | Warren Levy <warrenl@cygnus.com> | 2000-03-17 00:45:06 +0000 |
---|---|---|
committer | Warren Levy <warrenl@gcc.gnu.org> | 2000-03-17 00:45:06 +0000 |
commit | d05165c3933de4ce587e8f45c2e31e9c3dcccba7 (patch) | |
tree | e13c2ee8b0bb648f9f9ab698a7a4d17c7b938323 /libjava/java/awt | |
parent | c9869b75ee626214ec24447f33215fb4b6c9f038 (diff) | |
download | gcc-d05165c3933de4ce587e8f45c2e31e9c3dcccba7.zip gcc-d05165c3933de4ce587e8f45c2e31e9c3dcccba7.tar.gz gcc-d05165c3933de4ce587e8f45c2e31e9c3dcccba7.tar.bz2 |
Color.java: New file.
* java/awt/Color.java: New file.
* java/awt/Graphics.java: New file.
* java/awt/Image.java: New file.
* java/awt/Paint.java: New file.
* java/awt/PaintContext.java: New file.
* java/awt/Transparency.java: New file.
* java/util/Collection.java: New file.
* java/util/Comparator.java: New file.
* java/util/Iterator.java: New file.
* java/util/List.java: New file.
* java/util/ListIterator.java: New file.
* Makefile.am: Added above new files.
* Makefile.in: Rebuilt.
* java/awt/Font.java (PLAIN): New field.
(BOLD): New field.
(ITALIC): New field.
(ROMAN_BASELINE): New field.
(CENTER_BASELINE): New field.
(HANGING_BASELINE): New field.
(name): New field.
(style): New field.
(size): New field.
(pointSize): New field.
(Font): Implemented constructor.
(isPlain): Implemented method.
(isBold): Implemented method.
(isItalic): Implemented method.
(getName): Implemented method.
(getStyle): Implemented method.
(getSize): Implemented method.
(getSize2D): Implemented method.
(decode): Stubbed.
* java/awt/Frame.java (getFont): Stubbed.
(postEvent): Stubbed.
(remove): Stubbed.
* java/awt/Menu.java (postEvent): Stubbed.
* java/awt/MenuBar.java (getFont): Stubbed.
(postEvent): Stubbed.
* java/awt/Toolkit.java (getImage): Added abstract method.
From-SVN: r32598
Diffstat (limited to 'libjava/java/awt')
-rw-r--r-- | libjava/java/awt/Color.java | 64 | ||||
-rw-r--r-- | libjava/java/awt/Font.java | 79 | ||||
-rw-r--r-- | libjava/java/awt/Frame.java | 6 | ||||
-rw-r--r-- | libjava/java/awt/Graphics.java | 29 | ||||
-rw-r--r-- | libjava/java/awt/Image.java | 29 | ||||
-rw-r--r-- | libjava/java/awt/Menu.java | 4 | ||||
-rw-r--r-- | libjava/java/awt/MenuBar.java | 5 | ||||
-rw-r--r-- | libjava/java/awt/Paint.java | 30 | ||||
-rw-r--r-- | libjava/java/awt/PaintContext.java | 28 | ||||
-rw-r--r-- | libjava/java/awt/Toolkit.java | 3 | ||||
-rw-r--r-- | libjava/java/awt/Transparency.java | 29 |
11 files changed, 299 insertions, 7 deletions
diff --git a/libjava/java/awt/Color.java b/libjava/java/awt/Color.java new file mode 100644 index 0000000..0f0742c --- /dev/null +++ b/libjava/java/awt/Color.java @@ -0,0 +1,64 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 15, 2000. + */ + +/** + * 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 implementation. + */ + +public class Color extends Object implements Paint, Serializable +{ + public static final Color white = new Color(0xff, 0xff, 0xff); + public static final Color lightGray = new Color(0xc0, 0xc0, 0xc0); + public static final Color gray = new Color(0x80, 0x80, 0x80); + public static final Color darkGray = new Color(0x40, 0x40, 0x40); + public static final Color black = new Color(0x00, 0x00, 0x00); + public static final Color red = new Color(0xff, 0x00, 0x00); + public static final Color pink = new Color(0xff, 0xaf, 0xaf); + public static final Color orange = new Color(0xff, 0xc8, 0x00); + public static final Color yellow = new Color(0xff, 0xff, 0x00); + public static final Color green = new Color(0x00, 0xff, 0x00); + public static final Color magenta = new Color(0xff, 0x00, 0xff); + public static final Color cyan = new Color(0x00, 0xff, 0xff); + public static final Color blue = new Color(0x00, 0x00, 0xff); + + // The internal sRGB representation. + private float r; + private float g; + private float b; + private int alpha = 255; + + public Color(int rgb) + { + this(rgb, false); + } + + public Color(int rgba, boolean hasalpha) + { + // Alpha is bits 24-31, if hasalpha is true. + // Red is bits 16-23; Green is bits 8-15; Blue is bits 0-7. + b = rgb & 0xFF; + g = (rgb >>= 8) & 0xFF; + r = (rgb >>= 8) & 0xFF; + if (hasalpha) + alpha = (rgb >>= 8) & 0xFF; + } + + public int getRGB() + { + return alpha << 24 | r << 16 | g << 8 | b; + } +} diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index 0850367..edf5144 100644 --- a/libjava/java/awt/Font.java +++ b/libjava/java/awt/Font.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -8,8 +8,83 @@ details. */ package java.awt; -/* A *very* incomplete placeholder. */ +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 16, 2000. + */ + +/** + * 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 implementation. + */ public class Font { + // FIXME + + public static final int PLAIN = 0; + public static final int BOLD = 1; + public static final int ITALIC = 2; + public static final int ROMAN_BASELINE = 0; + public static final int CENTER_BASELINE = 1; + public static final int HANGING_BASELINE = 2; + protected String name; + protected int style; + protected int size; + protected float pointSize; + + public Font(String name, int style, int size) + { + this.name = name; + this.style = style & 0x3; // Only use lowest 2 bits. + this.size = size; + pointSize = size; // Assume some subclass can set a different val. + } + + public boolean isPlain() + { + if (style == PLAIN) + return true; + + return false; + } + + public boolean isBold() + { + if (style & BOLD == BOLD) + return true; + + return false; + } + + public boolean isItalic() + { + if (style & ITALIC == ITALIC) + return true; + + return false; + } + + public String getName() + { + return name; + } + + public int getStyle() + { + return style; + } + + public int getSize() + { + return size; + } + + public float getSize2D() + { + return pointSize; + } + + public static Font decode(String str) { return null; } // FIXME } diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index 6f2cc24..93c7e76 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -52,4 +52,8 @@ public class Frame extends Window implements MenuContainer } super.addNotify(); } + + public Font getFont() { return null; } // FIXME + public boolean postEvent(Event evt) { return null; } // FIXME + public void remove(MenuComponent comp) { } // FIXME } diff --git a/libjava/java/awt/Graphics.java b/libjava/java/awt/Graphics.java new file mode 100644 index 0000000..8b11f81 --- /dev/null +++ b/libjava/java/awt/Graphics.java @@ -0,0 +1,29 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 15, 2000. + */ + +/** + * 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. + */ + +public abstract class Graphics extends Object +{ + protected Graphics() + { + super(); // ??? + throw new Error ("java.awt.Graphics: not implemented"); + } +} diff --git a/libjava/java/awt/Image.java b/libjava/java/awt/Image.java new file mode 100644 index 0000000..75ddd2e --- /dev/null +++ b/libjava/java/awt/Image.java @@ -0,0 +1,29 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 15, 2000. + */ + +/** + * 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. + */ + +public abstract class Image extends Object +{ + public Image() + { + super(); // ??? + throw new Error("java.awt.Image: not implemented"); + } +} diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java index b171bca..dadc0c0 100644 --- a/libjava/java/awt/Menu.java +++ b/libjava/java/awt/Menu.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -28,6 +28,6 @@ public class Menu extends MenuItem implements MenuContainer } public Font getFont() { return null; } // FIXME - //public boolean postEvent(Event evt); + public boolean postEvent(Event evt) { return null; } // FIXME public void remove(MenuComponent comp) { } // FIXME } diff --git a/libjava/java/awt/MenuBar.java b/libjava/java/awt/MenuBar.java index c0f6430..5953835 100644 --- a/libjava/java/awt/MenuBar.java +++ b/libjava/java/awt/MenuBar.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -41,4 +41,7 @@ public class MenuBar extends MenuComponent implements MenuContainer } } } + + public Font getFont() { return null; } // FIXME + public boolean postEvent(Event evt) { return null; } // FIXME } diff --git a/libjava/java/awt/Paint.java b/libjava/java/awt/Paint.java new file mode 100644 index 0000000..0836402 --- /dev/null +++ b/libjava/java/awt/Paint.java @@ -0,0 +1,30 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 15, 2000. + */ + +/** + * Written using on-line Java Platform 1.2 API Specification, as well + * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). + * Status: Stubbed. + */ + +public interface Paint extends Transparency +{ + // FIXME + // public PaintContext createContext(ColorModel cm, + // Rectangle deviceBounds, + // Rectangle2D userBounds, + // AffineTransform xform, + // RenderingHints hints); +} diff --git a/libjava/java/awt/PaintContext.java b/libjava/java/awt/PaintContext.java new file mode 100644 index 0000000..0b4e6a7 --- /dev/null +++ b/libjava/java/awt/PaintContext.java @@ -0,0 +1,28 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 16, 2000. + */ + +/** + * Written using on-line Java Platform 1.2 API Specification, as well + * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). + * Status: Partially stubbed. + */ + +public interface PaintContext +{ + public void dispose(); + // FIXME + // public ColorModel getColorModel(); + // public Raster getRaster(int x, int y, int w, int h); +} diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index cfb2d77..8ba7ee2 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2000 Free Software Foundation This file is part of libjava. @@ -23,6 +23,7 @@ public abstract class Toolkit } protected abstract FramePeer createFrame(Frame target); + public abstract Image getImage(URL url); private static native void init(); // static { init(); } diff --git a/libjava/java/awt/Transparency.java b/libjava/java/awt/Transparency.java new file mode 100644 index 0000000..c119006 --- /dev/null +++ b/libjava/java/awt/Transparency.java @@ -0,0 +1,29 @@ +/* Copyright (C) 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package java.awt; + +/** + * @author Warren Levy <warrenl@cygnus.com> + * @date March 15, 2000. + */ + +/** + * Written using on-line Java Platform 1.2 API Specification, as well + * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). + * Status: Believed complete and correct. + */ + +public interface Transparency +{ + public static final int OPAQUE = 1; + public static final int BITMASK = 2; + public static final int TRANSLUCENT = 3; + + public int getTransparency(); +} |