diff options
| -rw-r--r-- | libjava/ChangeLog | 21 | ||||
| -rw-r--r-- | libjava/java/awt/geom/PathIterator.java | 14 | ||||
| -rw-r--r-- | libjava/java/awt/image/SinglePixelPackedSampleModel.java | 2 | ||||
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/logging/Filter.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/logging/LogManager.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/logging/XMLFormatter.java | 2 |
7 files changed, 32 insertions, 13 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 94347341926..67f280367a1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,24 @@ +2004-01-09 Michael Koch <konqueror@gmx.de> + + * java/awt/geom/PathIterator.java + (WIND_EVEN_ODD): Removed redundant modifiers. + (WIND_NON_ZERO): Likewise. + (SEG_MOVETO): Likewise. + (SEG_LINETO): Likewise. + (SEG_QUADTO): Likewise. + (SEG_CUBICTO): Likewise. + (SEG_CLOSE): Likewise. + * java/awt/image/SinglePixelPackedSampleModel.java: + Removed redundant semicolon. + * java/io/ObjectInputStream.java + (inputGetObjectStreamClasses): Removed unused variable "ret_val". + * java/util/logging/Filter.java + (isLoggable): Removed redundant modifier. + * java/util/logging/LogManager.java: + Removed redundant semicolon. + * java/util/logging/XMLFormatter.java + (format): Removed unused variable "key". + 2004-01-08 Fernando Nasser <fnasser@redhat.com> * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (nativeSetFile): diff --git a/libjava/java/awt/geom/PathIterator.java b/libjava/java/awt/geom/PathIterator.java index 1d47431c30d..1fb0a46e0ff 100644 --- a/libjava/java/awt/geom/PathIterator.java +++ b/libjava/java/awt/geom/PathIterator.java @@ -59,24 +59,24 @@ public interface PathIterator * 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 @@ public interface PathIterator * = n! / (m! * (n-m)!) * </pre> */ - 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 @@ public interface PathIterator * = n! / (m! * (n-m)!) * </pre> */ - 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. diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.java b/libjava/java/awt/image/SinglePixelPackedSampleModel.java index e67353c4615..3affe055411 100644 --- a/libjava/java/awt/image/SinglePixelPackedSampleModel.java +++ b/libjava/java/awt/image/SinglePixelPackedSampleModel.java @@ -47,7 +47,7 @@ public class SinglePixelPackedSampleModel extends SampleModel 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) diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index c2ddbe077c6..a277691e976 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/libjava/java/io/ObjectInputStream.java @@ -657,8 +657,6 @@ public class ObjectInputStream extends InputStream { ObjectStreamClass osc = lookupClass(clazz); - ObjectStreamClass[] ret_val; - if (osc == null) return new ObjectStreamClass[0]; else diff --git a/libjava/java/util/logging/Filter.java b/libjava/java/util/logging/Filter.java index a25fd3d3814..fc46d0992db 100644 --- a/libjava/java/util/logging/Filter.java +++ b/libjava/java/util/logging/Filter.java @@ -64,5 +64,5 @@ public interface Filter * @return <code>true</code> if the record should be published, * <code>false</code> if it should be discarded. */ - public boolean isLoggable(LogRecord record); + boolean isLoggable(LogRecord record); } diff --git a/libjava/java/util/logging/LogManager.java b/libjava/java/util/logging/LogManager.java index 83379bb4942..36216bc408b 100644 --- a/libjava/java/util/logging/LogManager.java +++ b/libjava/java/util/logging/LogManager.java @@ -200,7 +200,7 @@ public class LogManager { /* FIXME: Is it ok to ignore exceptions here? */ } - }; + } private static LogManager makeLogManager() diff --git a/libjava/java/util/logging/XMLFormatter.java b/libjava/java/util/logging/XMLFormatter.java index fbaab1cde3f..2de6c73c8b0 100644 --- a/libjava/java/util/logging/XMLFormatter.java +++ b/libjava/java/util/logging/XMLFormatter.java @@ -195,7 +195,7 @@ public class XMLFormatter long millis = record.getMillis(); Object[] params = record.getParameters(); ResourceBundle bundle = record.getResourceBundle(); - String key, message; + String message; buf.append("<record>"); buf.append(lineSep); |