This is the mail archive of the java-patches@sources.redhat.com mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch: indentation, etc


I'm checking this in.  It fixes an indentation nit.  It also removes
the Latin-1 copyright symbol from all the source files.  My iconv
patch for gcj changes gcj to assume that files are UTF-8 encoded (by
default), and furthermore gcj will give an error if an incorrect
encoding is found.

2000-08-28  Tom Tromey  <tromey@cygnus.com>

	* gnu/gcj/awt/BitMaskExtent.java, gnu/gcj/awt/Buffers.java,
	gnu/gcj/awt/ComponentDataBlitOp.java,
	gnu/gcj/awt/GLightweightPeer.java, java/awt/Graphics2D.java,
	java/awt/RenderingHints.java, java/awt/color/ColorSpace.java,
	java/awt/color/ICC_ColorSpace.java,
	java/awt/color/ICC_Profile.java,
	java/awt/image/BufferedImage.java, java/awt/image/ColorModel.java,
	java/awt/image/ComponentColorModel.java,
	java/awt/image/ComponentSampleModel.java,
	java/awt/image/DataBuffer.java,
	java/awt/image/DataBufferByte.java,
	java/awt/image/DataBufferInt.java,
	java/awt/image/DataBufferUShort.java,
	java/awt/image/DirectColorModel.java,
	java/awt/image/IndexColorModel.java,
	java/awt/image/PackedColorModel.java, java/awt/image/Raster.java,
	java/awt/image/RasterOp.java, java/awt/image/SampleModel.java,
	java/awt/image/SinglePixelPackedSampleModel.java,
	java/awt/image/WritableRaster.java, java/util/zip/ZipFile.java:
	Removed Latin-1 copyright symbols.
	* java/util/zip/ZipFile.java: Indentation fixes.

Tom

Index: gnu/gcj/awt/BitMaskExtent.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/awt/BitMaskExtent.java,v
retrieving revision 1.1
diff -u -r1.1 BitMaskExtent.java
--- BitMaskExtent.java	2000/07/25 17:53:28	1.1
+++ BitMaskExtent.java	2000/08/29 03:19:18
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: gnu/gcj/awt/Buffers.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/awt/Buffers.java,v
retrieving revision 1.1
diff -u -r1.1 Buffers.java
--- Buffers.java	2000/07/25 17:53:28	1.1
+++ Buffers.java	2000/08/29 03:19:18
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: gnu/gcj/awt/ComponentDataBlitOp.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/awt/ComponentDataBlitOp.java,v
retrieving revision 1.1
diff -u -r1.1 ComponentDataBlitOp.java
--- ComponentDataBlitOp.java	2000/08/16 18:03:47	1.1
+++ ComponentDataBlitOp.java	2000/08/29 03:19:18
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: gnu/gcj/awt/GLightweightPeer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/awt/GLightweightPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GLightweightPeer.java
--- GLightweightPeer.java	2000/08/16 18:03:47	1.1
+++ GLightweightPeer.java	2000/08/29 03:19:18
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/Graphics2D.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Graphics2D.java,v
retrieving revision 1.1
diff -u -r1.1 Graphics2D.java
--- Graphics2D.java	2000/08/16 18:03:47	1.1
+++ Graphics2D.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/RenderingHints.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/RenderingHints.java,v
retrieving revision 1.1
diff -u -r1.1 RenderingHints.java
--- RenderingHints.java	2000/08/16 18:03:47	1.1
+++ RenderingHints.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/color/ColorSpace.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/color/ColorSpace.java,v
retrieving revision 1.1
diff -u -r1.1 ColorSpace.java
--- ColorSpace.java	2000/07/25 17:53:29	1.1
+++ ColorSpace.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/color/ICC_ColorSpace.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/color/ICC_ColorSpace.java,v
retrieving revision 1.1
diff -u -r1.1 ICC_ColorSpace.java
--- ICC_ColorSpace.java	2000/07/25 17:53:29	1.1
+++ ICC_ColorSpace.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/color/ICC_Profile.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/color/ICC_Profile.java,v
retrieving revision 1.2
diff -u -r1.2 ICC_Profile.java
--- ICC_Profile.java	2000/08/09 13:01:44	1.2
+++ ICC_Profile.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/BufferedImage.java,v
retrieving revision 1.1
diff -u -r1.1 BufferedImage.java
--- BufferedImage.java	2000/08/16 18:03:48	1.1
+++ BufferedImage.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/ColorModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/ColorModel.java,v
retrieving revision 1.2
diff -u -r1.2 ColorModel.java
--- ColorModel.java	2000/08/09 13:01:44	1.2
+++ ColorModel.java	2000/08/29 03:19:19
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/ComponentColorModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/ComponentColorModel.java,v
retrieving revision 1.1
diff -u -r1.1 ComponentColorModel.java
--- ComponentColorModel.java	2000/07/25 17:53:30	1.1
+++ ComponentColorModel.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/ComponentSampleModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/ComponentSampleModel.java,v
retrieving revision 1.1
diff -u -r1.1 ComponentSampleModel.java
--- ComponentSampleModel.java	2000/07/25 17:53:30	1.1
+++ ComponentSampleModel.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/DataBuffer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/DataBuffer.java,v
retrieving revision 1.1
diff -u -r1.1 DataBuffer.java
--- DataBuffer.java	2000/07/25 17:53:30	1.1
+++ DataBuffer.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/DataBufferByte.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/DataBufferByte.java,v
retrieving revision 1.1
diff -u -r1.1 DataBufferByte.java
--- DataBufferByte.java	2000/07/25 17:53:30	1.1
+++ DataBufferByte.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/DataBufferInt.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/DataBufferInt.java,v
retrieving revision 1.1
diff -u -r1.1 DataBufferInt.java
--- DataBufferInt.java	2000/07/25 17:53:30	1.1
+++ DataBufferInt.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/DataBufferUShort.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/DataBufferUShort.java,v
retrieving revision 1.1
diff -u -r1.1 DataBufferUShort.java
--- DataBufferUShort.java	2000/07/25 17:53:30	1.1
+++ DataBufferUShort.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/DirectColorModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/DirectColorModel.java,v
retrieving revision 1.1
diff -u -r1.1 DirectColorModel.java
--- DirectColorModel.java	2000/07/25 17:53:30	1.1
+++ DirectColorModel.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/IndexColorModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/IndexColorModel.java,v
retrieving revision 1.1
diff -u -r1.1 IndexColorModel.java
--- IndexColorModel.java	2000/07/25 17:53:30	1.1
+++ IndexColorModel.java	2000/08/29 03:19:20
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/PackedColorModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/PackedColorModel.java,v
retrieving revision 1.1
diff -u -r1.1 PackedColorModel.java
--- PackedColorModel.java	2000/07/25 17:53:30	1.1
+++ PackedColorModel.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/Raster.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/Raster.java,v
retrieving revision 1.1
diff -u -r1.1 Raster.java
--- Raster.java	2000/07/25 17:53:30	1.1
+++ Raster.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/RasterOp.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/RasterOp.java,v
retrieving revision 1.1
diff -u -r1.1 RasterOp.java
--- RasterOp.java	2000/08/16 18:03:48	1.1
+++ RasterOp.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/SampleModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/SampleModel.java,v
retrieving revision 1.1
diff -u -r1.1 SampleModel.java
--- SampleModel.java	2000/07/25 17:53:30	1.1
+++ SampleModel.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/SinglePixelPackedSampleModel.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/SinglePixelPackedSampleModel.java,v
retrieving revision 1.1
diff -u -r1.1 SinglePixelPackedSampleModel.java
--- SinglePixelPackedSampleModel.java	2000/07/25 17:53:30	1.1
+++ SinglePixelPackedSampleModel.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/awt/image/WritableRaster.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/image/WritableRaster.java,v
retrieving revision 1.1
diff -u -r1.1 WritableRaster.java
--- WritableRaster.java	2000/07/25 17:53:30	1.1
+++ WritableRaster.java	2000/08/29 03:19:21
@@ -1,4 +1,4 @@
-/* Copyright  2000  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
Index: java/util/zip/ZipFile.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/zip/ZipFile.java,v
retrieving revision 1.12
diff -u -r1.12 ZipFile.java
--- ZipFile.java	2000/08/27 22:26:27	1.12
+++ ZipFile.java	2000/08/29 03:19:22
@@ -161,16 +161,21 @@
     return is;
   }
 
-  public String getName () { return name; }
+  public String getName ()
+  {
+    return name;
+  }
 
-  public int size () {
+  public int size ()
+  {
     if (entries == null)
       throw new IllegalStateException("ZipFile already closed");
     else
       return numEntries;
   }
 
-  protected void finalize () throws IOException {
+  protected void finalize () throws IOException
+  {
     close();
   }
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]