mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-21 15:41:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Color.java: New file.

Browse Source 
* 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
This commit is contained in:
Warren Levy 2000-03-17 00:45:06 +00:00 committed by Warren Levy
parent c9869b75ee
commit d05165c393
19 changed files with 533 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libjava/ChangeLog
View File

@ -1,3 +1,46 @@
2000-03-16 Warren Levy <warrenl@cygnus.com>
* 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.
2000-03-15 Tom Tromey <tromey@cygnus.com>
* java/io/natFileDescriptorWin32.cc (winerr): Now static.

11
libjava/Makefile.am
View File

@ -469,11 +469,14 @@ awt_java_source_files = \
java/awt/AWTEvent.java \
java/awt/BorderLayout.java \
java/awt/Component.java \
java/awt/Color.java \
java/awt/Container.java \
java/awt/Dimension.java \
java/awt/Event.java \
java/awt/Font.java \
java/awt/Frame.java \
java/awt/Graphics.java \
java/awt/Image.java \
java/awt/LayoutManager.java \
java/awt/LayoutManager2.java \
java/awt/Menu.java \
@ -481,12 +484,15 @@ java/awt/MenuBar.java \
java/awt/MenuItem.java \
java/awt/MenuComponent.java \
java/awt/MenuContainer.java \
java/awt/Paint.java \
java/awt/PaintContext.java \
java/awt/Point.java \
java/awt/Rectangle.java \
java/awt/Shape.java \
java/awt/TextArea.java \
java/awt/TextComponent.java \
java/awt/Toolkit.java \
java/awt/Transparency.java \
java/awt/Window.java \
java/awt/event/ActionEvent.java \
java/awt/event/ActionListener.java \
@ -759,6 +765,8 @@ java/text/SimpleDateFormat.java \
java/text/StringCharacterIterator.java \
java/util/BitSet.java \
java/util/Calendar.java \
java/util/Collection.java \
java/util/Comparator.java \
java/util/ConcurrentModificationException.java \
java/util/Date.java \
java/util/Dictionary.java \
@ -768,6 +776,9 @@ java/util/EventListener.java \
java/util/EventObject.java \
java/util/GregorianCalendar.java \
java/util/Hashtable.java \
java/util/Iterator.java \
java/util/List.java \
java/util/ListIterator.java \
java/util/ListResourceBundle.java \
java/util/Locale.java \
java/util/MissingResourceException.java \

19
libjava/Makefile.in
View File

@ -286,11 +286,14 @@ awt_java_source_files = \
java/awt/AWTEvent.java \
java/awt/BorderLayout.java \
java/awt/Component.java \
java/awt/Color.java \
java/awt/Container.java \
java/awt/Dimension.java \
java/awt/Event.java \
java/awt/Font.java \
java/awt/Frame.java \
java/awt/Graphics.java \
java/awt/Image.java \
java/awt/LayoutManager.java \
java/awt/LayoutManager2.java \
java/awt/Menu.java \
@ -298,12 +301,15 @@ java/awt/MenuBar.java \
java/awt/MenuItem.java \
java/awt/MenuComponent.java \
java/awt/MenuContainer.java \
java/awt/Paint.java \
java/awt/PaintContext.java \
java/awt/Point.java \
java/awt/Rectangle.java \
java/awt/Shape.java \
java/awt/TextArea.java \
java/awt/TextComponent.java \
java/awt/Toolkit.java \
java/awt/Transparency.java \
java/awt/Window.java \
java/awt/event/ActionEvent.java \
java/awt/event/ActionListener.java \
@ -571,6 +577,8 @@ java/text/SimpleDateFormat.java \
java/text/StringCharacterIterator.java \
java/util/BitSet.java \
java/util/Calendar.java \
java/util/Collection.java \
java/util/Comparator.java \
java/util/ConcurrentModificationException.java \
java/util/Date.java \
java/util/Dictionary.java \
@ -580,6 +588,9 @@ java/util/EventListener.java \
java/util/EventObject.java \
java/util/GregorianCalendar.java \
java/util/Hashtable.java \
java/util/Iterator.java \
java/util/List.java \
java/util/ListIterator.java \
java/util/ListResourceBundle.java \
java/util/Locale.java \
java/util/MissingResourceException.java \
@ -974,14 +985,16 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/text/ParseException.P .deps/java/text/ParsePosition.P \
.deps/java/text/RuleBasedCollator.P .deps/java/text/SimpleDateFormat.P \
.deps/java/text/StringCharacterIterator.P .deps/java/util/BitSet.P \
.deps/java/util/Calendar.P \
.deps/java/util/Calendar.P .deps/java/util/Collection.P \
.deps/java/util/Comparator.P \
.deps/java/util/ConcurrentModificationException.P \
.deps/java/util/Date.P .deps/java/util/Dictionary.P \
.deps/java/util/EmptyStackException.P .deps/java/util/Enumeration.P \
.deps/java/util/EventListener.P .deps/java/util/EventObject.P \
.deps/java/util/GregorianCalendar.P .deps/java/util/Hashtable.P \
.deps/java/util/ListResourceBundle.P .deps/java/util/Locale.P \
.deps/java/util/MissingResourceException.P \
.deps/java/util/Iterator.P .deps/java/util/List.P \
.deps/java/util/ListIterator.P .deps/java/util/ListResourceBundle.P \
.deps/java/util/Locale.P .deps/java/util/MissingResourceException.P \
.deps/java/util/NoSuchElementException.P .deps/java/util/Observable.P \
.deps/java/util/Observer.P .deps/java/util/Properties.P \
.deps/java/util/PropertyResourceBundle.P .deps/java/util/Random.P \

64
libjava/java/awt/Color.java Normal file
View File

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

79
libjava/java/awt/Font.java
View File

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

6
libjava/java/awt/Frame.java
View File

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

29
libjava/java/awt/Graphics.java Normal file
View File

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

29
libjava/java/awt/Image.java Normal file
View File

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

4
libjava/java/awt/Menu.java
View File

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

5
libjava/java/awt/MenuBar.java
View File

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

30
libjava/java/awt/Paint.java Normal file
View File

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

28
libjava/java/awt/PaintContext.java Normal file
View File

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

3
libjava/java/awt/Toolkit.java
View File

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

29
libjava/java/awt/Transparency.java Normal file
View File

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

37
libjava/java/util/Collection.java Normal file
View File

@ -0,0 +1,37 @@
/* 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.util;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 16, 2000.
*/
/* Written using on-line Java Platform 1.2 API Specification.
* Status: Believed complete and correct.
*/
// JDK1.2
public interface Collection
{
public int size();
public boolean isEmpty();
public boolean contains(Object o);
public Iterator iterator();
public Object[] toArray();
public Object[] toArray(Object[] a);
public boolean add(Object o);
public boolean remove(Object o);
public boolean containsAll(Collection c);
public boolean addAll(Collection c);
public boolean removeAll(Collection c);
public boolean retainAll(Collection c);
public void clear();
public boolean equals(Object o);
public int hashCode();
}

24
libjava/java/util/Comparator.java Normal file
View File

@ -0,0 +1,24 @@
/* 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.util;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 16, 2000.
*/
/* Written using on-line Java Platform 1.2 API Specification.
* Status: Believed complete and correct.
*/
// JDK1.2
public interface Comparator
{
public int compare(Object o1, Object o2);
public boolean equals(Object obj);
}

25
libjava/java/util/Iterator.java Normal file
View File

@ -0,0 +1,25 @@
/* 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.util;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 16, 2000.
*/
/* Written using on-line Java Platform 1.2 API Specification.
* Status: Believed complete and correct.
*/
// JDK1.2
public interface Iterator
{
public boolean hasNext();
public Object next();
public void remove();
}

47
libjava/java/util/List.java Normal file
View File

@ -0,0 +1,47 @@
/* 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.util;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 16, 2000.
*/
/* Written using on-line Java Platform 1.2 API Specification.
* Status: Believed complete and correct.
*/
// JDK1.2
public interface List extends Collection
{
public int size();
public boolean isEmpty();
public boolean contains(Object o);
public Iterator iterator();
public Object[] toArray();
public Object[] toArray(Object[] a);
public boolean add(Object o);
public boolean remove(Object o);
public boolean containsAll(Collection c);
public boolean addAll(Collection c);
public boolean addAll(int index, Collection c);
public boolean removeAll(Collection c);
public boolean retainAll(Collection c);
public void clear();
public boolean equals(Object o);
public int hashCode();
public Object get(int index);
public Object set(int index, Object element);
public void add(int index, Object element);
public Object remove(int index);
public int indexOf(Object o);
public int lastIndexOf(Object o);
public ListIterator listIterator();
public ListIterator listIterator(int index);
public List subList(int fromIndex, int toIndex);
}

31
libjava/java/util/ListIterator.java Normal file
View File

@ -0,0 +1,31 @@
/* 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.util;
/**
* @author Warren Levy <warrenl@cygnus.com>
* @date March 16, 2000.
*/
/* Written using on-line Java Platform 1.2 API Specification.
* Status: Believed complete and correct.
*/
// JDK1.2
public interface ListIterator extends Iterator
{
public boolean hasNext();
public Object next();
public boolean hasPrevious();
public Object previous();
public int nextIndex();
public int previousIndex();
public void remove();
public void set(Object o);
public void add(Object o);
}