summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2005-08-22 18:55:18 +0000
committerTom Tromey <tromey@redhat.com>2005-08-22 18:55:18 +0000
commit28e72d9aca16f3093c9e3996d08cad956ea5544d (patch)
tree2aa9532642e7c8b0fd3785ccf07d9fd3592e813d
parentd307f6f029f8dc71c6c030b9e4d40b295f20eeb1 (diff)
downloadclasspath-28e72d9aca16f3093c9e3996d08cad956ea5544d.tar.gz
Reverted erroneous commit
-rw-r--r--include/gnu_java_awt_peer_qt_QMatrix.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QPainterPath.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QPen.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtAudioClip.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtButtonPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtCanvasPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtCheckboxPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtChoicePeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtComponentPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtContainerPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtDialogPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtFileDialogPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtFontMetrics.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtFontPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtFramePeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtGraphics.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtImage.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtLabelPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtListPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtMenuBarPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtMenuItemPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtMenuPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtPanelPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtScreenDevice.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtScrollPanePeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtScrollbarPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtTextAreaPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtTextFieldPeer.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtToolkit.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtVolatileImage.h2
-rw-r--r--include/gnu_java_awt_peer_qt_QtWindowPeer.h2
-rw-r--r--java/io/PrintWriter.java20
-rw-r--r--javax/swing/text/LayoutQueue.java115
36 files changed, 6 insertions, 197 deletions
diff --git a/include/gnu_java_awt_peer_qt_QMatrix.h b/include/gnu_java_awt_peer_qt_QMatrix.h
index 536a1d7c3..a8485212f 100644
--- a/include/gnu_java_awt_peer_qt_QMatrix.h
+++ b/include/gnu_java_awt_peer_qt_QMatrix.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QMatrix__
#define __gnu_java_awt_peer_qt_QMatrix__
diff --git a/include/gnu_java_awt_peer_qt_QPainterPath.h b/include/gnu_java_awt_peer_qt_QPainterPath.h
index eaea6309c..3c5514586 100644
--- a/include/gnu_java_awt_peer_qt_QPainterPath.h
+++ b/include/gnu_java_awt_peer_qt_QPainterPath.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QPainterPath__
#define __gnu_java_awt_peer_qt_QPainterPath__
diff --git a/include/gnu_java_awt_peer_qt_QPen.h b/include/gnu_java_awt_peer_qt_QPen.h
index 7ac3320ce..b75bdfdca 100644
--- a/include/gnu_java_awt_peer_qt_QPen.h
+++ b/include/gnu_java_awt_peer_qt_QPen.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QPen__
#define __gnu_java_awt_peer_qt_QPen__
diff --git a/include/gnu_java_awt_peer_qt_QtAudioClip.h b/include/gnu_java_awt_peer_qt_QtAudioClip.h
index d696a411c..e76afa76a 100644
--- a/include/gnu_java_awt_peer_qt_QtAudioClip.h
+++ b/include/gnu_java_awt_peer_qt_QtAudioClip.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtAudioClip__
#define __gnu_java_awt_peer_qt_QtAudioClip__
diff --git a/include/gnu_java_awt_peer_qt_QtButtonPeer.h b/include/gnu_java_awt_peer_qt_QtButtonPeer.h
index b75064971..86f2b2316 100644
--- a/include/gnu_java_awt_peer_qt_QtButtonPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtButtonPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtButtonPeer__
#define __gnu_java_awt_peer_qt_QtButtonPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtCanvasPeer.h b/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
index df12c03b3..3f9bfe778 100644
--- a/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtCanvasPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtCanvasPeer__
#define __gnu_java_awt_peer_qt_QtCanvasPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h b/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
index 2d8958e9e..b228eed83 100644
--- a/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtCheckboxPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtCheckboxPeer__
#define __gnu_java_awt_peer_qt_QtCheckboxPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtChoicePeer.h b/include/gnu_java_awt_peer_qt_QtChoicePeer.h
index ad67de4a9..efdbf39b2 100644
--- a/include/gnu_java_awt_peer_qt_QtChoicePeer.h
+++ b/include/gnu_java_awt_peer_qt_QtChoicePeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtChoicePeer__
#define __gnu_java_awt_peer_qt_QtChoicePeer__
diff --git a/include/gnu_java_awt_peer_qt_QtComponentPeer.h b/include/gnu_java_awt_peer_qt_QtComponentPeer.h
index ccc3b179e..700fe812a 100644
--- a/include/gnu_java_awt_peer_qt_QtComponentPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtComponentPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtComponentPeer__
#define __gnu_java_awt_peer_qt_QtComponentPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtContainerPeer.h b/include/gnu_java_awt_peer_qt_QtContainerPeer.h
index 2993e1841..8c108c9a7 100644
--- a/include/gnu_java_awt_peer_qt_QtContainerPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtContainerPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtContainerPeer__
#define __gnu_java_awt_peer_qt_QtContainerPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtDialogPeer.h b/include/gnu_java_awt_peer_qt_QtDialogPeer.h
index 631b85e5e..31d29f123 100644
--- a/include/gnu_java_awt_peer_qt_QtDialogPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtDialogPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtDialogPeer__
#define __gnu_java_awt_peer_qt_QtDialogPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h b/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
index 515013b72..a63bb2bfe 100644
--- a/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtFileDialogPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtFileDialogPeer__
#define __gnu_java_awt_peer_qt_QtFileDialogPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtFontMetrics.h b/include/gnu_java_awt_peer_qt_QtFontMetrics.h
index 632167a76..7a8db0157 100644
--- a/include/gnu_java_awt_peer_qt_QtFontMetrics.h
+++ b/include/gnu_java_awt_peer_qt_QtFontMetrics.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtFontMetrics__
#define __gnu_java_awt_peer_qt_QtFontMetrics__
diff --git a/include/gnu_java_awt_peer_qt_QtFontPeer.h b/include/gnu_java_awt_peer_qt_QtFontPeer.h
index 79ab66cb2..cc6e82ade 100644
--- a/include/gnu_java_awt_peer_qt_QtFontPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtFontPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtFontPeer__
#define __gnu_java_awt_peer_qt_QtFontPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtFramePeer.h b/include/gnu_java_awt_peer_qt_QtFramePeer.h
index 019c6cdae..e3a0d1d22 100644
--- a/include/gnu_java_awt_peer_qt_QtFramePeer.h
+++ b/include/gnu_java_awt_peer_qt_QtFramePeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtFramePeer__
#define __gnu_java_awt_peer_qt_QtFramePeer__
diff --git a/include/gnu_java_awt_peer_qt_QtGraphics.h b/include/gnu_java_awt_peer_qt_QtGraphics.h
index a096c6b64..a23001507 100644
--- a/include/gnu_java_awt_peer_qt_QtGraphics.h
+++ b/include/gnu_java_awt_peer_qt_QtGraphics.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtGraphics__
#define __gnu_java_awt_peer_qt_QtGraphics__
diff --git a/include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h b/include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h
index d964760f3..545c8cfd9 100644
--- a/include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h
+++ b/include/gnu_java_awt_peer_qt_QtGraphicsEnvironment.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
#define __gnu_java_awt_peer_qt_QtGraphicsEnvironment__
diff --git a/include/gnu_java_awt_peer_qt_QtImage.h b/include/gnu_java_awt_peer_qt_QtImage.h
index 238415229..dae242eda 100644
--- a/include/gnu_java_awt_peer_qt_QtImage.h
+++ b/include/gnu_java_awt_peer_qt_QtImage.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtImage__
#define __gnu_java_awt_peer_qt_QtImage__
diff --git a/include/gnu_java_awt_peer_qt_QtLabelPeer.h b/include/gnu_java_awt_peer_qt_QtLabelPeer.h
index ece10bc2f..5762abea8 100644
--- a/include/gnu_java_awt_peer_qt_QtLabelPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtLabelPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtLabelPeer__
#define __gnu_java_awt_peer_qt_QtLabelPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtListPeer.h b/include/gnu_java_awt_peer_qt_QtListPeer.h
index 07477e3e3..e8d7a992d 100644
--- a/include/gnu_java_awt_peer_qt_QtListPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtListPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtListPeer__
#define __gnu_java_awt_peer_qt_QtListPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h b/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h
index f4ed76fee..7f4c04a60 100644
--- a/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtMenuBarPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtMenuBarPeer__
#define __gnu_java_awt_peer_qt_QtMenuBarPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h b/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h
index 91c9b2686..17d14cd8f 100644
--- a/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtMenuComponentPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtMenuComponentPeer__
#define __gnu_java_awt_peer_qt_QtMenuComponentPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h b/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h
index 9f8d20ed4..53615740c 100644
--- a/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtMenuItemPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtMenuItemPeer__
#define __gnu_java_awt_peer_qt_QtMenuItemPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtMenuPeer.h b/include/gnu_java_awt_peer_qt_QtMenuPeer.h
index ae8fc2e17..2927963eb 100644
--- a/include/gnu_java_awt_peer_qt_QtMenuPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtMenuPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtMenuPeer__
#define __gnu_java_awt_peer_qt_QtMenuPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtPanelPeer.h b/include/gnu_java_awt_peer_qt_QtPanelPeer.h
index 00e97082b..b778a377f 100644
--- a/include/gnu_java_awt_peer_qt_QtPanelPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtPanelPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtPanelPeer__
#define __gnu_java_awt_peer_qt_QtPanelPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h b/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h
index 79ee4619d..29b36e00f 100644
--- a/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtPopupMenuPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtPopupMenuPeer__
#define __gnu_java_awt_peer_qt_QtPopupMenuPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtScreenDevice.h b/include/gnu_java_awt_peer_qt_QtScreenDevice.h
index 8fb5c2737..8bc55f1d2 100644
--- a/include/gnu_java_awt_peer_qt_QtScreenDevice.h
+++ b/include/gnu_java_awt_peer_qt_QtScreenDevice.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtScreenDevice__
#define __gnu_java_awt_peer_qt_QtScreenDevice__
diff --git a/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h b/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
index d831dae94..2e36d6744 100644
--- a/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
+++ b/include/gnu_java_awt_peer_qt_QtScrollPanePeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtScrollPanePeer__
#define __gnu_java_awt_peer_qt_QtScrollPanePeer__
diff --git a/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h b/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
index 2ff22db50..48098c511 100644
--- a/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtScrollbarPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtScrollbarPeer__
#define __gnu_java_awt_peer_qt_QtScrollbarPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h b/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
index 17c2def5c..cef880d42 100644
--- a/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtTextAreaPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtTextAreaPeer__
#define __gnu_java_awt_peer_qt_QtTextAreaPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h b/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
index d86e1c7fa..570b962f1 100644
--- a/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtTextFieldPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtTextFieldPeer__
#define __gnu_java_awt_peer_qt_QtTextFieldPeer__
diff --git a/include/gnu_java_awt_peer_qt_QtToolkit.h b/include/gnu_java_awt_peer_qt_QtToolkit.h
index af882b6cf..5931759a6 100644
--- a/include/gnu_java_awt_peer_qt_QtToolkit.h
+++ b/include/gnu_java_awt_peer_qt_QtToolkit.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtToolkit__
#define __gnu_java_awt_peer_qt_QtToolkit__
diff --git a/include/gnu_java_awt_peer_qt_QtVolatileImage.h b/include/gnu_java_awt_peer_qt_QtVolatileImage.h
index 87a1b978f..f96019d2e 100644
--- a/include/gnu_java_awt_peer_qt_QtVolatileImage.h
+++ b/include/gnu_java_awt_peer_qt_QtVolatileImage.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtVolatileImage__
#define __gnu_java_awt_peer_qt_QtVolatileImage__
diff --git a/include/gnu_java_awt_peer_qt_QtWindowPeer.h b/include/gnu_java_awt_peer_qt_QtWindowPeer.h
index fc29642a2..0dd0a4ec6 100644
--- a/include/gnu_java_awt_peer_qt_QtWindowPeer.h
+++ b/include/gnu_java_awt_peer_qt_QtWindowPeer.h
@@ -1,5 +1,3 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
#ifndef __gnu_java_awt_peer_qt_QtWindowPeer__
#define __gnu_java_awt_peer_qt_QtWindowPeer__
diff --git a/java/io/PrintWriter.java b/java/io/PrintWriter.java
index 268095086..5fd0b162f 100644
--- a/java/io/PrintWriter.java
+++ b/java/io/PrintWriter.java
@@ -1,5 +1,5 @@
/* PrintWriter.java -- prints primitive values and objects to a stream as text
- Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation
+ Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
This file is part of GNU Classpath.
@@ -72,11 +72,6 @@ public class PrintWriter extends Writer
private boolean error;
/**
- * Set to true if close() has been called on this PrintWriter.
- */
- private boolean closed;
-
- /**
* This is the underlying <code>Writer</code> we are sending output
* to
*/
@@ -153,19 +148,17 @@ public class PrintWriter extends Writer
}
/**
- * This method checks to see if an error has occurred on this
- * stream. Note that once an error has occurred, this method will
- * continue to report <code>true</code> forever for this stream. If
- * the stream has not been closed, then before checking for an error
- * condition, this method flushes the stream.
+ * This method checks to see if an error has occurred on this stream. Note
+ * that once an error has occurred, this method will continue to report
+ * <code>true</code> forever for this stream. Before checking for an
+ * error condition, this method flushes the stream.
*
* @return <code>true</code> if an error has occurred,
* <code>false</code> otherwise
*/
public boolean checkError()
{
- if (! closed)
- flush();
+ flush();
return error;
}
@@ -198,7 +191,6 @@ public class PrintWriter extends Writer
{
error = true;
}
- closed = true;
}
/**
diff --git a/javax/swing/text/LayoutQueue.java b/javax/swing/text/LayoutQueue.java
deleted file mode 100644
index 83433b6ee..000000000
--- a/javax/swing/text/LayoutQueue.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/* LayoutQueue.java --
- Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 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 javax.swing.text;
-
-import java.util.LinkedList;
-
-/**
- * This is a queue which holds {@link Runnable} objects. It is
- * intended for deferring layout operations.
- */
-public class LayoutQueue
-{
- // The default layout queue.
- private static LayoutQueue defaultQueue = new LayoutQueue();
-
- // The queue of tasks.
- private LinkedList list = new LinkedList();
-
- /**
- * Create a new layout queue.
- */
- public LayoutQueue()
- {
- }
-
- /**
- * Add a layout task to the queue.
- */
- public void addTask(Runnable task)
- {
- synchronized (list)
- {
- list.addLast(task);
- list.notify();
- }
- }
-
- /**
- * Called by a worker thread to retrieve the next layout task. This
- * will block until a new task is available. This method will
- * return null if the thread is interrupted while waiting.
- */
- protected Runnable waitForWork()
- {
- synchronized (list)
- {
- while (list.size() == 0)
- {
- try
- {
- list.wait();
- }
- catch (InterruptedException _)
- {
- // This seemed like a good idea, but it has not been
- // tested on the JDK.
- return null;
- }
- }
- return (Runnable) list.removeFirst();
- }
- }
-
- /**
- * Return the default layout queue.
- */
- public static synchronized LayoutQueue getDefaultQueue()
- {
- return defaultQueue;
- }
-
- /**
- * Set the default layout queue.
- */
- public static synchronized void setDefaultQueue(LayoutQueue q)
- {
- defaultQueue = q;
- }
-}