[kaffe] CVS kaffe (guilhem): Fix for RMI protocol 1.1
Kaffe CVS
Kaffe Mailing List <kaffe@kaffe.org>
Thu Aug 21 05:51:02 2003
PatchSet 3969
Date: 2003/08/21 12:48:46
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Fix for RMI protocol 1.1
See ChangeLog.
Members:
libraries/javalib/Makefile.am:1.131->1.132
libraries/javalib/gnu/java/rmi/server/RMIVoidValue.java:INITIAL->1.1
libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.1->1.2
libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.1->1.2
libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.1->1.2
libraries/javalib/profiles/allatonce/all.files:1.18->1.19
libraries/javalib/profiles/default/rmi.files:1.4->1.5
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.131 kaffe/libraries/javalib/Makefile.am:1.132
--- kaffe/libraries/javalib/Makefile.am:1.131 Mon Aug 18 17:40:31 2003
+++ kaffe/libraries/javalib/Makefile.am Thu Aug 21 12:48:46 2003
@@ -409,6 +409,7 @@
gnu/java/rmi/server/RMIHashes.java \
gnu/java/rmi/server/RMIObjectInputStream.java \
gnu/java/rmi/server/RMIObjectOutputStream.java \
+ gnu/java/rmi/server/RMIVoidValue.java \
gnu/java/rmi/server/UnicastConnection.java \
gnu/java/rmi/server/UnicastConnectionManager.java \
gnu/java/rmi/server/UnicastRef.java \
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/rmi/server/RMIVoidValue.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/rmi/server/RMIVoidValue.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/rmi/server/RMIVoidValue.java Thu Aug 21 12:50:31 2003
@@ -0,0 +1,40 @@
+/* RMIVoidValue.java
+ Copyright (c) 2003 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 gnu.java.rmi.server;
+
+public class RMIVoidValue
+{}
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.1 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.2
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java:1.1 Mon Aug 18 17:40:33 2003
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastRemoteCall.java Thu Aug 21 12:48:47 2003
@@ -65,6 +65,7 @@
private long hash;
private Vector vec;
private int ptr;
+ private ObjID objid;
private ObjectOutput oout;
private ObjectInput oin;
@@ -86,22 +87,7 @@
this.conn = conn;
this.opnum = opnum;
this.hash = hash;
-
- // signal the call when constructing
- try
- {
- DataOutputStream dout = conn.getDataOutputStream();
- dout.write(MESSAGE_CALL);
-
- oout = conn.getObjectOutputStream();
- objid.write(oout);
- oout.writeInt(opnum);
- oout.writeLong(hash);
- }
- catch(IOException ex)
- {
- throw new MarshalException("Try to write header but failed.", ex);
- }
+ this.objid = objid;
}
UnicastConnection getConnection()
@@ -111,22 +97,43 @@
public ObjectOutput getOutputStream() throws IOException
{
- if (conn != null)
- {
- if(oout == null)
- return (oout = conn.getObjectOutputStream());
- else
- return oout;
- }
- else
- {
- vec = new Vector();
- return (new DummyObjectOutputStream());
- }
+ if (vec == null)
+ vec = new Vector();
+ return (new DummyObjectOutputStream());
}
public void releaseOutputStream() throws IOException
{
+ if (vec != null)
+ {
+ oout = conn.getObjectOutputStream();
+
+ for (int i=0;i<vec.size();i+=2)
+ {
+ boolean primitive = ((Boolean)vec.elementAt(i)).booleanValue();
+ Object data = vec.elementAt(i+1);
+
+ // No type, this is
+ if (!primitive)
+ oout.writeObject(data);
+ else
+ {
+ if (data instanceof Boolean)
+ oout.writeBoolean(((Boolean)data).booleanValue());
+ else if (data instanceof Character)
+ oout.writeChar(((Character)data).charValue());
+ else if (data instanceof Byte)
+ oout.writeByte(((Byte)data).byteValue());
+ else if (data instanceof Short)
+ oout.writeShort(((Short)data).shortValue());
+ else if (data instanceof Integer)
+ oout.writeInt(((Integer)data).intValue());
+ else if (data instanceof Long)
+ oout.writeLong(((Long)data).longValue());
+ }
+ }
+ vec = null;
+ }
if(oout != null)
oout.flush();
}
@@ -163,6 +170,23 @@
{
byte returncode;
ObjectInput oin;
+
+ // signal the call when constructing
+ try
+ {
+ DataOutputStream dout = conn.getDataOutputStream();
+ dout.write(MESSAGE_CALL);
+
+ oout = conn.getObjectOutputStream();
+ objid.write(oout);
+ oout.writeInt(opnum);
+ oout.writeLong(hash);
+ }
+ catch(IOException ex)
+ {
+ throw new MarshalException("Try to write header but failed.", ex);
+ }
+
try
{
releaseOutputStream();
@@ -211,9 +235,15 @@
// conn.disconnect();
}
+ boolean isReturnValue()
+ {
+ return vec.size() > 0;
+ }
+
Object returnValue()
{
- return (vec.size() > 0 ? vec.elementAt(0) : null);
+ // This is not the first one (Boolean) but the second.
+ return vec.elementAt(1);
}
Object[] getArguments()
@@ -256,46 +286,55 @@
public void writeBoolean(boolean v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Boolean(v));
}
public void writeByte(int v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Byte((byte) v));
}
public void writeChar(int v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Character((char) v));
}
public void writeDouble(double v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Double(v));
}
public void writeFloat(float v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Float(v));
}
public void writeInt(int v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Integer(v));
}
public void writeLong(long v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Long(v));
}
public void writeShort(int v) throws IOException
{
+ vec.addElement(new Boolean(true));
vec.addElement(new Short((short) v));
}
public void writeObject(Object obj) throws IOException
{
+ vec.addElement(new Boolean(false));
vec.addElement(obj);
}
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.1 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.2
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java:1.1 Mon Aug 18 17:40:33 2003
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServer.java Thu Aug 21 12:48:47 2003
@@ -144,7 +144,7 @@
(new UID()).write(out);
if(returnval != null && returncls != null)
((RMIObjectOutputStream)out).writeValue(returnval, returncls);
- else
+ else if (!(returnval instanceof RMIVoidValue))
out.writeObject(returnval);
out.flush();
Index: kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java
diff -u kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.1 kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.2
--- kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java:1.1 Mon Aug 18 17:40:33 2003
+++ kaffe/libraries/javalib/gnu/java/rmi/server/UnicastServerRef.java Thu Aug 21 12:48:47 2003
@@ -254,8 +254,11 @@
throw new NoSuchMethodException();
}
UnicastRemoteCall call = new UnicastRemoteCall(conn);
- skel.dispatch(myself, call, method, hash);
- return (call.returnValue());
+ skel.dispatch(myself, call, method, hash);
+ if (!call.isReturnValue())
+ return new RMIVoidValue();
+ else
+ return (call.returnValue());
}
}
Index: kaffe/libraries/javalib/profiles/allatonce/all.files
diff -u kaffe/libraries/javalib/profiles/allatonce/all.files:1.18 kaffe/libraries/javalib/profiles/allatonce/all.files:1.19
--- kaffe/libraries/javalib/profiles/allatonce/all.files:1.18 Mon Aug 18 17:40:39 2003
+++ kaffe/libraries/javalib/profiles/allatonce/all.files Thu Aug 21 12:48:47 2003
@@ -1,338 +1,103 @@
-
-gnu/classpath/Configuration.java
-gnu/classpath/RawData.java
-gnu/classpath/RawData.java
-gnu/crypto/cipher/IBlockCipher.java
-gnu/crypto/hash/IMessageDigest.java
-gnu/crypto/mac/IMac.java
-gnu/crypto/mode/IMode.java
-gnu/crypto/prng/IRandom.java
-gnu/crypto/prng/LimitReachedException.java
+java/awt/ActiveEvent.java
+java/awt/AWTPermission.java
+java/awt/BasicStroke.java
+java/awt/Canvas.java
+java/awt/CardLayout.java
+java/awt/color/CMMException.java
+java/awt/color/ICC_ProfileGray.java
+java/awt/color/ICC_ProfileRGB.java
+java/awt/color/ProfileDataException.java
+java/awt/datatransfer/MimeTypeParseException.java
+java/awt/datatransfer/StringSelection.java
+java/awt/DefKeyFilter.java
+java/awt/Dialog.java
+java/awt/event/AWTEventListener.java
+java/awt/event/ComponentAdapter.java
+java/awt/event/ContainerAdapter.java
+java/awt/event/FocusAdapter.java
+java/awt/event/HierarchyBoundsAdapter.java
+java/awt/event/KeyAdapter.java
+java/awt/FileDialog.java
+java/awt/FocusTraversalPolicy.java
+java/awt/FontFormatException.java
+java/awt/geom/Arc2D.java
+java/awt/geom/Area.java
+java/awt/geom/CubicCurve2D.java
+java/awt/geom/Ellipse2D.java
+java/awt/geom/QuadCurve2D.java
+java/awt/geom/RoundRectangle2D.java
+java/awt/GradientPaint.java
+java/awt/GridBagConstraints.java
+java/awt/GridBagLayout.java
+java/awt/GridLayout.java
+java/awt/IllegalComponentStateException.java
+java/awt/image/AreaAveragingScaleFilter.java
+java/awt/image/BufferStrategy.java
+java/awt/image/CropImageFilter.java
+java/awt/image/FilteredImageSource.java
+java/awt/image/ImageFilter.java
+java/awt/image/ImagingOpException.java
+java/awt/image/PackedColorModel.java
+java/awt/image/PixelGrabber.java
+java/awt/image/RasterFormatException.java
+java/awt/image/renderable/ContextualRenderedImageFactory.java
+java/awt/image/renderable/ParameterBlock.java
+java/awt/image/renderable/RenderableImageOp.java
+java/awt/image/renderable/RenderableImageProducer.java
+java/awt/image/renderable/RenderedImageFactory.java
+java/awt/image/ReplicateScaleFilter.java
+java/awt/image/RGBImageFilter.java
+java/awt/JobAttributes.java
+java/awt/KeyEvt.java
+java/awt/KeyEventDispatcher.java
+java/awt/KeyEventPostProcessor.java
+java/awt/OpaqueComponent.java
+java/awt/PageAttributes.java
+java/awt/peer/ActiveEvent.java
+java/awt/ScrollPaneAdjustable.java
+java/awt/ScrollPane.java
+java/awt/SystemColor.java
+java/awt/TextEvt.java
+java/awt/Button.java
+java/awt/Choice.java
+java/awt/Label.java
+java/awt/TextArea.java
+java/awt/TextBuffer.java
+java/awt/TextComponent.java
+java/awt/TextCursor.java
+java/awt/TextField.java
+kaffe/awt/HookInstaller.java
+kaffe/awt/ImageClass.java
+kaffe/awt/ImageDict.java
+kaffe/awt/ImageSpec.java
+kaffe/awt/OpaqueComponent.java
+kaffe/util/log/SimpleLogViewer.java
gnu/java/awt/BitMaskExtent.java
gnu/java/awt/Buffers.java
gnu/java/awt/ComponentDataBlitOp.java
gnu/java/awt/EventModifier.java
-gnu/java/io/ASN1ParsingException.java
-gnu/java/lang/reflect/TypeSignature.java
-gnu/java/locale/Calendar_de.java
-gnu/java/locale/Calendar_en.java
-gnu/java/locale/Calendar.java
-gnu/java/locale/Calendar_nl.java
-gnu/java/locale/LocaleInformation_af_ZA.java
-gnu/java/locale/LocaleInformation_ar_AE.java
-gnu/java/locale/LocaleInformation_ar_BH.java
-gnu/java/locale/LocaleInformation_ar_DZ.java
-gnu/java/locale/LocaleInformation_ar_EG.java
-gnu/java/locale/LocaleInformation_ar_IN.java
-gnu/java/locale/LocaleInformation_ar_IQ.java
-gnu/java/locale/LocaleInformation_ar_JO.java
-gnu/java/locale/LocaleInformation_ar_KW.java
-gnu/java/locale/LocaleInformation_ar_LB.java
-gnu/java/locale/LocaleInformation_ar_LY.java
-gnu/java/locale/LocaleInformation_ar_MA.java
-gnu/java/locale/LocaleInformation_ar_OM.java
-gnu/java/locale/LocaleInformation_ar_QA.java
-gnu/java/locale/LocaleInformation_ar_SD.java
-gnu/java/locale/LocaleInformation_ar_SY.java
-gnu/java/locale/LocaleInformation_ar_TN.java
-gnu/java/locale/LocaleInformation_ar_YE.java
-gnu/java/locale/LocaleInformation_be_BY.java
-gnu/java/locale/LocaleInformation_bn_IN.java
-gnu/java/locale/LocaleInformation_br_FR.java
-gnu/java/locale/LocaleInformation_bs_BA.java
-gnu/java/locale/LocaleInformation_ca_ES.java
-gnu/java/locale/LocaleInformation_cs_CZ.java
-gnu/java/locale/LocaleInformation_cy_GB.java
-gnu/java/locale/LocaleInformation_da_DK.java
-gnu/java/locale/LocaleInformation_de_AT.java
-gnu/java/locale/LocaleInformation_de_BE.java
-gnu/java/locale/LocaleInformation_de_CH.java
-gnu/java/locale/LocaleInformation_de_DE.java
-gnu/java/locale/LocaleInformation_de.java
-gnu/java/locale/LocaleInformation_de_LU.java
-gnu/java/locale/LocaleInformation_el_GR.java
-gnu/java/locale/LocaleInformation_en_AU.java
-gnu/java/locale/LocaleInformation_en_BW.java
-gnu/java/locale/LocaleInformation_en_CA.java
-gnu/java/locale/LocaleInformation_en_DK.java
-gnu/java/locale/LocaleInformation_en_GB.java
-gnu/java/locale/LocaleInformation_en_HK.java
-gnu/java/locale/LocaleInformation_en_IE.java
-gnu/java/locale/LocaleInformation_en_IN.java
-gnu/java/locale/LocaleInformation_en.java
-gnu/java/locale/LocaleInformation_en_NZ.java
-gnu/java/locale/LocaleInformation_en_PH.java
-gnu/java/locale/LocaleInformation_en_SG.java
-gnu/java/locale/LocaleInformation_en_US.java
-gnu/java/locale/LocaleInformation_en_ZA.java
-gnu/java/locale/LocaleInformation_en_ZW.java
-gnu/java/locale/LocaleInformation_es_AR.java
-gnu/java/locale/LocaleInformation_es_BO.java
-gnu/java/locale/LocaleInformation_es_CL.java
-gnu/java/locale/LocaleInformation_es_CO.java
-gnu/java/locale/LocaleInformation_es_CR.java
-gnu/java/locale/LocaleInformation_es_DO.java
-gnu/java/locale/LocaleInformation_es_EC.java
-gnu/java/locale/LocaleInformation_es_ES.java
-gnu/java/locale/LocaleInformation_es_GT.java
-gnu/java/locale/LocaleInformation_es_HN.java
-gnu/java/locale/LocaleInformation_es_MX.java
-gnu/java/locale/LocaleInformation_es_NI.java
-gnu/java/locale/LocaleInformation_es_PA.java
-gnu/java/locale/LocaleInformation_es_PE.java
-gnu/java/locale/LocaleInformation_es_PR.java
-gnu/java/locale/LocaleInformation_es_PY.java
-gnu/java/locale/LocaleInformation_es_SV.java
-gnu/java/locale/LocaleInformation_es_US.java
-gnu/java/locale/LocaleInformation_es_UY.java
-gnu/java/locale/LocaleInformation_es_VE.java
-gnu/java/locale/LocaleInformation_et_EE.java
-gnu/java/locale/LocaleInformation_eu_ES.java
-gnu/java/locale/LocaleInformation_fa_IR.java
-gnu/java/locale/LocaleInformation_fi_FI.java
-gnu/java/locale/LocaleInformation_fo_FO.java
-gnu/java/locale/LocaleInformation_fr_BE.java
-gnu/java/locale/LocaleInformation_fr_CA.java
-gnu/java/locale/LocaleInformation_fr_CH.java
-gnu/java/locale/LocaleInformation_fr_FR.java
-gnu/java/locale/LocaleInformation_fr_LU.java
-gnu/java/locale/LocaleInformation_ga_IE.java
-gnu/java/locale/LocaleInformation_gd_GB.java
-gnu/java/locale/LocaleInformation_gl_ES.java
-gnu/java/locale/LocaleInformation_gv_GB.java
-gnu/java/locale/LocaleInformation_he_IL.java
-gnu/java/locale/LocaleInformation_hi_IN.java
-gnu/java/locale/LocaleInformation_hr_HR.java
-gnu/java/locale/LocaleInformation_hu_HU.java
-gnu/java/locale/LocaleInformation_id_ID.java
-gnu/java/locale/LocaleInformation_it_CH.java
-gnu/java/locale/LocaleInformation_it_IT.java
-gnu/java/locale/LocaleInformation_iw_IL.java
-gnu/java/locale/LocaleInformation_ja_JP.java
-gnu/java/locale/LocaleInformation.java
-gnu/java/locale/LocaleInformation_ka_GE.java
-gnu/java/locale/LocaleInformation_kl_GL.java
-gnu/java/locale/LocaleInformation_ko_KR.java
-gnu/java/locale/LocaleInformation_kw_GB.java
-gnu/java/locale/LocaleInformation_lt_LT.java
-gnu/java/locale/LocaleInformation_lv_LV.java
-gnu/java/locale/LocaleInformation_mi_NZ.java
-gnu/java/locale/LocaleInformation_mk_MK.java
-gnu/java/locale/LocaleInformation_mr_IN.java
-gnu/java/locale/LocaleInformation_mt_MT.java
-gnu/java/locale/LocaleInformation_nl_BE.java
-gnu/java/locale/LocaleInformation_nl.java
-gnu/java/locale/LocaleInformation_nl_NL.java
-gnu/java/locale/LocaleInformation_nn_NO.java
-gnu/java/locale/LocaleInformation_no_NO.java
-gnu/java/locale/LocaleInformation_oc_FR.java
-gnu/java/locale/LocaleInformation_pl_PL.java
-gnu/java/locale/LocaleInformation_pt_BR.java
-gnu/java/locale/LocaleInformation_pt_PT.java
-gnu/java/locale/LocaleInformation_ro_RO.java
-gnu/java/locale/LocaleInformation_ru_RU.java
-gnu/java/locale/LocaleInformation_ru_UA.java
-gnu/java/locale/LocaleInformation_se_NO.java
-gnu/java/locale/LocaleInformation_sk_SK.java
-gnu/java/locale/LocaleInformation_sl_SI.java
-gnu/java/locale/LocaleInformation_sq_AL.java
-gnu/java/locale/LocaleInformation_sr_YU.java
-gnu/java/locale/LocaleInformation_sv_FI.java
-gnu/java/locale/LocaleInformation_sv_SE.java
-gnu/java/locale/LocaleInformation_ta_IN.java
-gnu/java/locale/LocaleInformation_te_IN.java
-gnu/java/locale/LocaleInformation_tg_TJ.java
-gnu/java/locale/LocaleInformation_tl_PH.java
-gnu/java/locale/LocaleInformation_tr_TR.java
-gnu/java/locale/LocaleInformation_uk_UA.java
-gnu/java/locale/LocaleInformation_ur_PK.java
-gnu/java/locale/LocaleInformation_uz_UZ.java
-gnu/java/locale/LocaleInformation_vi_VN.java
-gnu/java/locale/LocaleInformation_yi_US.java
-gnu/java/locale/LocaleInformation_zh_CN.java
-gnu/java/locale/LocaleInformation_zh_HK.java
-gnu/java/locale/LocaleInformation_zh_SG.java
-gnu/java/locale/LocaleInformation_zh_TW.java
-gnu/java/nio/charset/ISO_8859_1.java
-gnu/java/nio/charset/ISO_8859_1.java
-gnu/java/nio/charset/Provider.java
-gnu/java/nio/charset/Provider.java
-gnu/java/nio/charset/US_ASCII.java
-gnu/java/nio/charset/US_ASCII.java
-gnu/java/nio/charset/UTF_16BE.java
-gnu/java/nio/charset/UTF_16BE.java
-gnu/java/nio/charset/UTF_16Decoder.java
-gnu/java/nio/charset/UTF_16Decoder.java
-gnu/java/nio/charset/UTF_16Encoder.java
-gnu/java/nio/charset/UTF_16Encoder.java
-gnu/java/nio/charset/UTF_16.java
-gnu/java/nio/charset/UTF_16.java
-gnu/java/nio/charset/UTF_16LE.java
-gnu/java/nio/charset/UTF_16LE.java
-gnu/java/nio/charset/UTF_8.java
-gnu/java/nio/charset/UTF_8.java
-gnu/java/nio/DatagramChannelImpl.java
-gnu/java/nio/DatagramChannelImpl.java
-gnu/java/nio/PipeImpl.java
-gnu/java/nio/PipeImpl.java
-gnu/java/nio/SelectionKeyImpl.java
-gnu/java/nio/SelectionKeyImpl.java
-gnu/java/nio/SelectorImpl.java
-gnu/java/nio/SelectorImpl.java
-gnu/java/nio/SelectorProviderImpl.java
-gnu/java/nio/SelectorProviderImpl.java
-gnu/java/nio/ServerSocketChannelImpl.java
-gnu/java/nio/ServerSocketChannelImpl.java
-gnu/java/nio/SocketChannelImpl.java
-gnu/java/nio/SocketChannelImpl.java
-gnu/java/rmi/dgc/DGCImpl.java
-gnu/java/rmi/dgc/DGCImpl_Skel.java
-gnu/java/rmi/dgc/DGCImpl_Stub.java
-gnu/java/rmi/registry/RegistryImpl.java
-gnu/java/rmi/registry/RegistryImpl_Skel.java
-gnu/java/rmi/registry/RegistryImpl_Stub.java
-gnu/java/rmi/rmic/Compile_gcj.java
-gnu/java/rmi/rmic/Compile_jikes.java
-gnu/java/rmi/rmic/Compile_kjc.java
-gnu/java/rmi/rmic/Compiler.java
-gnu/java/rmi/rmic/CompilerProcess.java
-gnu/java/rmi/rmic/RMICException.java
-gnu/java/rmi/rmic/RMIC.java
-gnu/java/rmi/rmic/TabbedWriter.java
-gnu/java/rmi/RMIMarshalledObjectInputStream.java
-gnu/java/rmi/RMIMarshalledObjectOutputStream.java
-gnu/java/rmi/server/ConnectionRunnerPool.java
-gnu/java/rmi/server/ProtocolConstants.java
-gnu/java/rmi/server/RMIDefaultSocketFactory.java
-gnu/java/rmi/server/RMIHashes.java
-gnu/java/rmi/server/RMIObjectInputStream.java
-gnu/java/rmi/server/RMIObjectOutputStream.java
-gnu/java/rmi/server/UnicastConnection.java
-gnu/java/rmi/server/UnicastConnectionManager.java
-gnu/java/rmi/server/UnicastRef.java
-gnu/java/rmi/server/UnicastRemoteCall.java
-gnu/java/rmi/server/UnicastRemoteStub.java
-gnu/java/rmi/server/UnicastServer.java
-gnu/java/rmi/server/UnicastServerRef.java
-gnu/java/security/der/BitString.java
-gnu/java/security/der/DEREncodingException.java
-gnu/java/security/der/DER.java
-gnu/java/security/der/DERReader.java
-gnu/java/security/der/DERValue.java
-gnu/java/security/der/DERWriter.java
-gnu/java/security/Engine.java
-gnu/java/security/OID.java
-gnu/java/security/provider/DefaultPolicy.java
-gnu/java/security/x509/X500DistinguishedName.java
-gnu/java/text/BaseBreakIterator.java
-gnu/java/text/CharacterBreakIterator.java
-gnu/java/text/LineBreakIterator.java
-gnu/java/text/SentenceBreakIterator.java
-gnu/java/text/WordBreakIterator.java
-gnu/java/util/prefs/FileBasedFactory.java
-gnu/java/util/prefs/MemoryBasedFactory.java
-gnu/java/util/prefs/MemoryBasedPreferences.java
-gnu/java/util/prefs/NodeReader.java
-gnu/java/util/prefs/NodeWriter.java
-gnu/javax/rmi/CORBA/DelegateFactory.java
-gnu/javax/rmi/CORBA/GetDelegateInstanceException.java
-gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
-gnu/javax/rmi/CORBA/StubDelegateImpl.java
-gnu/javax/rmi/CORBA/UtilDelegateImpl.java
-gnu/javax/rmi/CORBA/ValueHandlerImpl.java
-gnu/javax/rmi/PortableServer.java
-gnu/regexp/REFilterInputStream.java
-gnu/regexp/REFilterReader.java
-gnu/regexp/UncheckedRE.java
-gnu/xml/aelfred2/JAXPFactory.java
-gnu/xml/aelfred2/SAXDriver.java
-gnu/xml/aelfred2/XmlParser.java
-gnu/xml/aelfred2/XmlReader.java
-gnu/xml/dom/Consumer.java
-gnu/xml/dom/DomAttr.java
-gnu/xml/dom/DomCDATA.java
-gnu/xml/dom/DomCharacterData.java
-gnu/xml/dom/DomComment.java
-gnu/xml/dom/DomDoctype.java
-gnu/xml/dom/DomDocument.java
-gnu/xml/dom/DomElement.java
-gnu/xml/dom/DomEntity.java
-gnu/xml/dom/DomEntityReference.java
-gnu/xml/dom/DomEvent.java
-gnu/xml/dom/DomEx.java
-gnu/xml/dom/DomExtern.java
-gnu/xml/dom/DomFragment.java
-gnu/xml/dom/DomImpl.java
-gnu/xml/dom/DomIterator.java
-gnu/xml/dom/DomNamedNodeMap.java
-gnu/xml/dom/DomNode.java
-gnu/xml/dom/DomNotation.java
-gnu/xml/dom/DomNsNode.java
-gnu/xml/dom/DomPI.java
-gnu/xml/dom/DomText.java
-gnu/xml/dom/JAXPFactory.java
-gnu/xml/pipeline/CallFilter.java
-gnu/xml/pipeline/DomConsumer.java
-gnu/xml/pipeline/EventConsumer.java
-gnu/xml/pipeline/EventFilter.java
-gnu/xml/pipeline/LinkFilter.java
-gnu/xml/pipeline/NSFilter.java
-gnu/xml/pipeline/PipelineFactory.java
-gnu/xml/pipeline/TeeConsumer.java
-gnu/xml/pipeline/TextConsumer.java
-gnu/xml/pipeline/ValidationConsumer.java
-gnu/xml/pipeline/WellFormednessFilter.java
-gnu/xml/pipeline/XIncludeFilter.java
-gnu/xml/pipeline/XsltFilter.java
-gnu/xml/util/DomParser.java
-gnu/xml/util/DoParse.java
-gnu/xml/util/Resolver.java
-gnu/xml/util/SAXNullTransformerFactory.java
-gnu/xml/util/XCat.java
-gnu/xml/util/XHTMLWriter.java
-gnu/xml/util/XMLWriter.java
-java/applet/AppletContext.java
-java/applet/Applet.java
-java/applet/AppletStub.java
-java/applet/AudioClip.java
java/awt/ActionEvt.java
-java/awt/ActiveEvent.java
java/awt/Adjustable.java
java/awt/AdjustmentEvt.java
-java/awt/AlphaComposite.java
java/awt/AttributeValue.java
java/awt/AWTError.java
java/awt/AWTEvent.java
java/awt/AWTEventMulticaster.java
java/awt/AWTException.java
-java/awt/AWTPermission.java
java/awt/BarMenu.java
-java/awt/BasicStroke.java
java/awt/BorderLayout.java
java/awt/BufferCapabilities.java
-java/awt/Button.java
-java/awt/Canvas.java
-java/awt/CardLayout.java
-java/awt/CheckboxGroup.java
-java/awt/Checkbox.java
java/awt/CheckboxMenuItem.java
-java/awt/Choice.java
java/awt/ClassAnalyzer.java
java/awt/ClassProperties.java
-java/awt/color/CMMException.java
java/awt/color/ColorSpace.java
java/awt/color/ICC_ColorSpace.java
-java/awt/color/ICC_ProfileGray.java
java/awt/color/ICC_Profile.java
-java/awt/color/ICC_ProfileRGB.java
java/awt/Color.java
-java/awt/ColorPaintContext.java
-java/awt/color/ProfileDataException.java
java/awt/ComponentEvt.java
java/awt/Component.java
-java/awt/ComponentOrientation.java
-java/awt/CompositeContext.java
java/awt/Composite.java
+java/awt/CompositeContext.java
java/awt/ContainerEvt.java
java/awt/Container.java
java/awt/Cursor.java
@@ -341,69 +106,47 @@
java/awt/datatransfer/DataFlavor.java
java/awt/datatransfer/FlavorMap.java
java/awt/datatransfer/FlavorTable.java
-java/awt/datatransfer/MimeTypeParseException.java
-java/awt/datatransfer/StringSelection.java
java/awt/datatransfer/SystemFlavorMap.java
java/awt/datatransfer/Transferable.java
java/awt/datatransfer/UnsupportedFlavorException.java
java/awt/Defaults.java
-java/awt/DefKeyFilter.java
-java/awt/Dialog.java
java/awt/Dimension.java
java/awt/DisplayMode.java
-java/awt/dnd/Autoscroll.java
java/awt/dnd/DnDConstants.java
java/awt/dnd/DnDEventMulticaster.java
java/awt/dnd/DragGestureEvent.java
java/awt/dnd/DragGestureListener.java
java/awt/dnd/DragGestureRecognizer.java
-java/awt/dnd/DragSourceAdapter.java
+java/awt/dnd/DragSource.java
java/awt/dnd/DragSourceContext.java
java/awt/dnd/DragSourceDragEvent.java
java/awt/dnd/DragSourceDropEvent.java
java/awt/dnd/DragSourceEvent.java
-java/awt/dnd/DragSource.java
java/awt/dnd/DragSourceListener.java
java/awt/dnd/DragSourceMotionListener.java
-java/awt/dnd/DropTargetAdapter.java
-java/awt/dnd/DropTargetContext.java
-java/awt/dnd/DropTargetDragEvent.java
-java/awt/dnd/DropTargetDropEvent.java
-java/awt/dnd/DropTargetEvent.java
-java/awt/dnd/DropTarget.java
-java/awt/dnd/DropTargetListener.java
java/awt/dnd/InvalidDnDOperationException.java
java/awt/dnd/MouseDragGestureRecognizer.java
java/awt/dnd/peer/DragSourceContextPeer.java
-java/awt/dnd/peer/DropTargetContextPeer.java
-java/awt/dnd/peer/DropTargetPeer.java
java/awt/event/ActionEvent.java
java/awt/event/ActionListener.java
java/awt/event/AdjustmentEvent.java
java/awt/event/AdjustmentListener.java
-java/awt/event/AWTEventListener.java
-java/awt/event/ComponentAdapter.java
java/awt/event/ComponentEvent.java
java/awt/event/ComponentListener.java
-java/awt/event/ContainerAdapter.java
java/awt/event/ContainerEvent.java
java/awt/event/ContainerListener.java
java/awt/EventDispatchThread.java
-java/awt/event/FocusAdapter.java
java/awt/event/FocusEvent.java
java/awt/event/FocusListener.java
-java/awt/event/HierarchyBoundsAdapter.java
+java/awt/event/InputEvent.java
java/awt/event/HierarchyBoundsListener.java
java/awt/event/HierarchyEvent.java
java/awt/event/HierarchyListener.java
-java/awt/event/InputEvent.java
java/awt/event/InputMethodEvent.java
java/awt/event/InputMethodListener.java
-java/awt/event/InvocationEvent.java
java/awt/event/ItemEvent.java
java/awt/event/ItemListener.java
java/awt/Event.java
-java/awt/event/KeyAdapter.java
java/awt/event/KeyEvent.java
java/awt/event/KeyListener.java
java/awt/event/MouseAdapter.java
@@ -422,37 +165,20 @@
java/awt/event/WindowFocusListener.java
java/awt/event/WindowListener.java
java/awt/event/WindowStateListener.java
-java/awt/FileDialog.java
java/awt/FlowLayout.java
java/awt/FocusEvt.java
-java/awt/FocusTraversalPolicy.java
+java/awt/Font.java
+java/awt/FontMetrics.java
+java/awt/Frame.java
java/awt/font/FontRenderContext.java
-java/awt/FontFormatException.java
java/awt/font/GlyphJustificationInfo.java
java/awt/font/GlyphMetrics.java
java/awt/font/GlyphVector.java
-java/awt/font/GraphicAttribute.java
-java/awt/font/ImageGraphicAttribute.java
-java/awt/Font.java
-java/awt/font/LineBreakMeasurer.java
-java/awt/font/LineMetrics.java
-java/awt/FontMetrics.java
java/awt/font/MultipleMaster.java
-java/awt/font/NumericShaper.java
java/awt/font/OpenType.java
-java/awt/font/ShapeGraphicAttribute.java
-java/awt/font/TextAttribute.java
java/awt/font/TextHitInfo.java
-java/awt/font/TextLayout.java
-java/awt/font/TextMeasurer.java
-java/awt/font/TransformAttribute.java
-java/awt/Frame.java
java/awt/geom/AffineTransform.java
-java/awt/geom/Arc2D.java
-java/awt/geom/Area.java
-java/awt/geom/CubicCurve2D.java
java/awt/geom/Dimension2D.java
-java/awt/geom/Ellipse2D.java
java/awt/geom/FlatteningPathIterator.java
java/awt/geom/GeneralPath.java
java/awt/geom/IllegalPathStateException.java
@@ -460,85 +186,52 @@
java/awt/geom/NoninvertibleTransformException.java
java/awt/geom/PathIterator.java
java/awt/geom/Point2D.java
-java/awt/geom/QuadCurve2D.java
java/awt/geom/Rectangle2D.java
java/awt/geom/RectangularShape.java
-java/awt/geom/RoundRectangle2D.java
-java/awt/GradientPaint.java
+java/awt/Graphics.java
java/awt/Graphics2D.java
java/awt/GraphicsConfigTemplate.java
java/awt/GraphicsConfiguration.java
java/awt/GraphicsDevice.java
java/awt/GraphicsEnvironment.java
-java/awt/Graphics.java
java/awt/GraphicsLink.java
-java/awt/GridBagConstraints.java
-java/awt/GridBagLayoutInfo.java
-java/awt/GridBagLayout.java
-java/awt/GridLayout.java
java/awt/HeadlessException.java
-java/awt/IllegalComponentStateException.java
-java/awt/image/AreaAveragingScaleFilter.java
java/awt/image/BufferedImage.java
java/awt/image/BufferedImageOp.java
-java/awt/image/BufferStrategy.java
-java/awt/ImageCapabilities.java
java/awt/image/ColorModel.java
java/awt/image/ComponentColorModel.java
java/awt/image/ComponentSampleModel.java
-java/awt/image/CropImageFilter.java
java/awt/image/DataBufferByte.java
java/awt/image/DataBufferInt.java
java/awt/image/DataBuffer.java
java/awt/image/DataBufferUShort.java
java/awt/image/DirectColorModel.java
-java/awt/image/FilteredImageSource.java
-java/awt/ImageFrameLoader.java
java/awt/image/ImageConsumer.java
-java/awt/image/ImageFilter.java
java/awt/image/ImageObserver.java
java/awt/image/ImageProducer.java
-java/awt/image/ImagingOpException.java
java/awt/image/IndexColorModel.java
java/awt/Image.java
+java/awt/ImageCapabilities.java
+java/awt/ImageFrameLoader.java
java/awt/ImageLoader.java
-java/awt/image/MemoryImageSource.java
java/awt/ImageNativeProducer.java
-java/awt/image/PackedColorModel.java
-java/awt/image/PixelGrabber.java
-java/awt/image/RasterFormatException.java
+java/awt/image/MemoryImageSource.java
java/awt/image/Raster.java
java/awt/image/RasterOp.java
-java/awt/image/renderable/ContextualRenderedImageFactory.java
-java/awt/image/renderable/ParameterBlock.java
-java/awt/image/renderable/RenderableImage.java
-java/awt/image/renderable/RenderableImageOp.java
-java/awt/image/renderable/RenderableImageProducer.java
java/awt/image/renderable/RenderContext.java
-java/awt/image/renderable/RenderedImageFactory.java
+java/awt/image/renderable/RenderableImage.java
java/awt/image/RenderedImage.java
-java/awt/image/ReplicateScaleFilter.java
-java/awt/image/RGBImageFilter.java
java/awt/image/SampleModel.java
java/awt/image/SinglePixelPackedSampleModel.java
java/awt/image/TileObserver.java
java/awt/image/VolatileImage.java
java/awt/image/WritableRaster.java
java/awt/image/WritableRenderedImage.java
-java/awt/im/InputMethodHighlight.java
-java/awt/im/InputMethodRequests.java
-java/awt/im/InputSubset.java
java/awt/Insets.java
java/awt/ItemEvt.java
java/awt/ItemSelectable.java
-java/awt/JobAttributes.java
-java/awt/KeyEventDispatcher.java
-java/awt/KeyEventPostProcessor.java
-java/awt/KeyEvt.java
-java/awt/Label.java
java/awt/LayoutManager2.java
java/awt/LayoutManager.java
-java/awt/List.java
java/awt/MediaTracker.java
java/awt/MenuBar.java
java/awt/MenuComponent.java
@@ -550,130 +243,83 @@
java/awt/NativeClipboard.java
java/awt/NativeGraphics.java
java/awt/NativeSelection.java
-java/awt/OpaqueComponent.java
-java/awt/PageAttributes.java
-java/awt/PaintContext.java
-java/awt/PaintEvt.java
java/awt/Paint.java
+java/awt/PaintEvt.java
java/awt/Panel.java
-java/awt/peer/ActiveEvent.java
-java/awt/peer/ButtonPeer.java
-java/awt/peer/CanvasPeer.java
-java/awt/peer/CheckboxMenuItemPeer.java
-java/awt/peer/CheckboxPeer.java
-java/awt/peer/ChoicePeer.java
java/awt/peer/ComponentPeer.java
-java/awt/peer/ContainerPeer.java
-java/awt/peer/DialogPeer.java
-java/awt/peer/FileDialogPeer.java
java/awt/peer/FontPeer.java
-java/awt/peer/FramePeer.java
-java/awt/peer/LabelPeer.java
java/awt/peer/LightweightPeer.java
-java/awt/peer/ListPeer.java
-java/awt/peer/MenuBarPeer.java
java/awt/peer/MenuComponentPeer.java
-java/awt/peer/MenuItemPeer.java
-java/awt/peer/MenuPeer.java
-java/awt/peer/PanelPeer.java
-java/awt/peer/PopupMenuPeer.java
-java/awt/peer/RobotPeer.java
-java/awt/peer/ScrollbarPeer.java
-java/awt/peer/ScrollPanePeer.java
-java/awt/peer/TextAreaPeer.java
-java/awt/peer/TextComponentPeer.java
-java/awt/peer/TextFieldPeer.java
java/awt/peer/WindowPeer.java
java/awt/Point.java
+java/awt/PaintContext.java
java/awt/Polygon.java
java/awt/PopupMenu.java
java/awt/PopupWindow.java
-java/awt/print/Book.java
java/awt/PrintGraphics.java
java/awt/PrintJob.java
-java/awt/print/Pageable.java
-java/awt/print/PageFormat.java
-java/awt/print/Paper.java
-java/awt/print/Printable.java
-java/awt/print/PrinterAbortException.java
-java/awt/print/PrinterException.java
-java/awt/print/PrinterGraphics.java
-java/awt/print/PrinterIOException.java
-java/awt/print/PrinterJob.java
java/awt/PSGraphics.java
java/awt/PSPrintJob.java
java/awt/Rectangle.java
java/awt/RenderingHints.java
-java/awt/Robot.java
java/awt/RootWindow.java
-java/awt/RowCanvas.java
-java/awt/Scrollbar.java
-java/awt/ScrollPaneAdjustable.java
-java/awt/ScrollPane.java
java/awt/Shape.java
java/awt/ShortcutConsumer.java
java/awt/ShortcutHandler.java
java/awt/Stroke.java
-java/awt/SystemColor.java
-java/awt/TextArea.java
-java/awt/TextBuffer.java
-java/awt/TextComponent.java
-java/awt/TextCursor.java
-java/awt/TextEvt.java
-java/awt/TextField.java
-java/awt/TexturePaint.java
java/awt/Toolkit.java
*** Patch too long, truncated ***