Index: java/awt/geom/PathIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/PathIterator.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 PathIterator.java
--- java/awt/geom/PathIterator.java 26 Sep 2003 15:14:21 -0000 1.7
+++ java/awt/geom/PathIterator.java 9 Jan 2004 08:50:44 -0000
@@ -59,24 +59,24 @@
* from the point to infinity (in any direction) crosses an odd number of
* segments.
*/
- static final int WIND_EVEN_ODD = 0;
+ int WIND_EVEN_ODD = 0;
/**
* The non-zero winding mode: a point is internal to the shape if a ray
* from the point to infinity (in any direction) crosses a different number
* of segments headed clockwise than those headed counterclockwise.
*/
- static final int WIND_NON_ZERO = 1;
+ int WIND_NON_ZERO = 1;
/**
* Starts a new subpath. There is no segment from the previous vertex.
*/
- static final int SEG_MOVETO = 0;
+ int SEG_MOVETO = 0;
/**
* The current segment is a line.
*/
- static final int SEG_LINETO = 1;
+ int SEG_LINETO = 1;
/**
* The current segment is a quadratic parametric curve. It is interpolated
@@ -91,7 +91,7 @@
* = n! / (m! * (n-m)!)
*
*/
- static final int SEG_QUADTO = 2;
+ int SEG_QUADTO = 2;
/**
* The current segment is a cubic parametric curve (more commonly known as
@@ -107,13 +107,13 @@
* = n! / (m! * (n-m)!)
*
*/
- static final int SEG_CUBICTO = 3;
+ int SEG_CUBICTO = 3;
/**
* The current segment closes a loop by an implicit line to the previous
* SEG_MOVETO coordinate.
*/
- static final int SEG_CLOSE = 4;
+ int SEG_CLOSE = 4;
/**
* Returns the winding rule to determine which points are inside this path.
Index: java/awt/image/SinglePixelPackedSampleModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/SinglePixelPackedSampleModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 SinglePixelPackedSampleModel.java
--- java/awt/image/SinglePixelPackedSampleModel.java 26 Sep 2003 19:59:55 -0000 1.5
+++ java/awt/image/SinglePixelPackedSampleModel.java 9 Jan 2004 08:50:44 -0000
@@ -47,7 +47,7 @@
private int scanlineStride;
private int[] bitMasks;
private int[] bitOffsets;
- private int[] sampleSize;;
+ private int[] sampleSize;
public SinglePixelPackedSampleModel(int dataType, int w, int h,
int[] bitMasks)
Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectInputStream.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 ObjectInputStream.java
--- java/io/ObjectInputStream.java 30 Dec 2003 15:51:15 -0000 1.24
+++ java/io/ObjectInputStream.java 9 Jan 2004 08:50:45 -0000
@@ -657,8 +657,6 @@
{
ObjectStreamClass osc = lookupClass(clazz);
- ObjectStreamClass[] ret_val;
-
if (osc == null)
return new ObjectStreamClass[0];
else
Index: java/util/logging/Filter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/Filter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Filter.java
--- java/util/logging/Filter.java 21 Jun 2003 10:31:55 -0000 1.1
+++ java/util/logging/Filter.java 9 Jan 2004 08:50:45 -0000
@@ -64,5 +64,5 @@
* @return true
if the record should be published,
* false
if it should be discarded.
*/
- public boolean isLoggable(LogRecord record);
+ boolean isLoggable(LogRecord record);
}
Index: java/util/logging/LogManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/LogManager.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LogManager.java
--- java/util/logging/LogManager.java 31 Aug 2003 16:52:16 -0000 1.2
+++ java/util/logging/LogManager.java 9 Jan 2004 08:50:45 -0000
@@ -200,7 +200,7 @@
{
/* FIXME: Is it ok to ignore exceptions here? */
}
- };
+ }
private static LogManager makeLogManager()
Index: java/util/logging/XMLFormatter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/XMLFormatter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 XMLFormatter.java
--- java/util/logging/XMLFormatter.java 21 Jun 2003 10:31:55 -0000 1.1
+++ java/util/logging/XMLFormatter.java 9 Jan 2004 08:50:45 -0000
@@ -195,7 +195,7 @@
long millis = record.getMillis();
Object[] params = record.getParameters();
ResourceBundle bundle = record.getResourceBundle();
- String key, message;
+ String message;
buf.append("");
buf.append(lineSep);