summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-10 03:56:38 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-10 03:56:38 +0000
commit7b3ac3407fcce2e911d526e1f022cdbe2f33da60 (patch)
treea9d181bc694f2828491a477cc370dd3d179e0aa2 /libjava
parentcb0593adb3c527225d9e954232d96a01a325a240 (diff)
downloadgcc-7b3ac3407fcce2e911d526e1f022cdbe2f33da60.tar.gz
* java/awt/ImageMediaEntry: Removed.
* java/awt/MediaEntry: Removed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50524 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/awt/ImageMediaEntry.java86
-rw-r--r--libjava/java/awt/MediaEntry.java117
3 files changed, 5 insertions, 203 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6ad310fdfdd..c03384e2303 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2002-03-09 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
+ * java/awt/ImageMediaEntry: Removed.
+ * java/awt/MediaEntry: Removed.
+
+2002-03-09 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
+
Hashtable synchronization for PowerPC.
* configure.in: Define SLOW_PTHREAD_SELF if configure.host set
slow_pthread_self. Set up symlink for sysdeps directory.
diff --git a/libjava/java/awt/ImageMediaEntry.java b/libjava/java/awt/ImageMediaEntry.java
deleted file mode 100644
index 6ca0f02842a..00000000000
--- a/libjava/java/awt/ImageMediaEntry.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ImageMediaEntry.java -- A media entry type for images.
- Copyright (C) 1999 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.awt.image.ImageObserver;
-import java.io.Serializable;
-
-/**
- * A concrete MediaEntry subtype for images.
- *
- * @author Aaron M. Renn (arenn@urbanophile.com)
- */
-class ImageMediaEntry extends MediaEntry implements ImageObserver,
- Serializable
-{
-
-private Image image;
-private int width;
-private int height;
-
-ImageMediaEntry(MediaTracker tracker, Image image, int ID, int width, int height)
-{
- super(tracker, ID);
- this.image = image;
- this.width = width;
- this.height = height;
-}
-
-public Object
-getMedia()
-{
- return(image.getSource()); // FIXME: Is this really right?
-}
-
-public void
-startLoad()
-{
- int status = getStatus();
-// status |= MediaEntry.LOADSTARTED;
-}
-
-public boolean
-imageUpdate(Image image, int flags, int x, int y, int width, int height)
-{
- // implement me
- return true;
-}
-
-} // class ImageMediaEntry
-
diff --git a/libjava/java/awt/MediaEntry.java b/libjava/java/awt/MediaEntry.java
deleted file mode 100644
index edff9320568..00000000000
--- a/libjava/java/awt/MediaEntry.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/* MediaEntry.java -- An entry in a MediaTracker
- Copyright (C) 1999 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;
-
-/**
- * This is an entry in the media tracker
- *
- * @author Aaron M. Renn (arenn@urbanophile.com)
- */
-abstract class MediaEntry implements java.io.Serializable
-{
-
-protected static final int LOADING = 1;
-protected static final int ABORTED = 2;
-protected static final int ERRORED = 4;
-protected static final int COMPLETE = 8;
-protected static final int LOADSTARTED = 16;
-protected static final int DONE = 32;
-
-private MediaTracker tracker;
-private int ID;
-private int status;
-private boolean cancelled;
-private MediaEntry next;
-
-static MediaEntry
-insert(MediaEntry a, MediaEntry b)
-{
- while (a.next != null)
- a = a.next;
-
- a.next = b;
- return(b);
-}
-
-MediaEntry(MediaTracker tracker, int ID)
-{
- this.tracker = tracker;
- this.ID = ID;
-}
-
-public int
-getID()
-{
- return(ID);
-}
-
-public int
-getStatus()
-{
- return(status);
-}
-
-public void
-setStatus(int status)
-{
- this.status = status;
-}
-
-public MediaEntry
-getNext()
-{
- return(next);
-}
-
-public void
-cancel()
-{
- cancelled = true;
- if ((status == LOADING) || (status == LOADSTARTED))
- setStatus(ABORTED);
-}
-
-abstract void
-startLoad();
-
-abstract Object
-getMedia();
-
-} // class MediaEntry
-