From d060a30bf8d33c6ee8b4ffb545c2d1d7792ed4f5 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Sun, 7 Nov 2004 13:05:53 +0000
Subject: [PATCH] [multiple changes]

2004-11-07  Michael Koch  <konqueror@gmx.de>

       * java/lang/Process.java:
       Import cleanups.

2004-11-07  Jeroen Frijters  <jeroen@frijters.net>

       * java/util/zip/ZipEntry.java
       (KNOWN_SIZE, KNOWN_CSIZE, KNOWN_CRC, KNOWN_TIME): Made final.

From-SVN: r90231
---
 libjava/ChangeLog                   | 10 ++++++++++
 libjava/java/lang/Process.java      |  5 +++--
 libjava/java/util/zip/ZipEntry.java |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a866b442473..c91cb9b385a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-07  Michael Koch  <konqueror@gmx.de>
+
+	* java/lang/Process.java:
+	Import cleanups.
+
+2004-11-07  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/util/zip/ZipEntry.java
+	(KNOWN_SIZE, KNOWN_CSIZE, KNOWN_CRC, KNOWN_TIME): Made final.
+
 2004-11-07  Robert Schuster  <theBohemian@gmx.net>
 
 	Fixes bug #10908
diff --git a/libjava/java/lang/Process.java b/libjava/java/lang/Process.java
index 1d1861d2491..b87bd8068b5 100644
--- a/libjava/java/lang/Process.java
+++ b/libjava/java/lang/Process.java
@@ -1,5 +1,6 @@
 /* Process.java - Represent spawned system process
-   Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +39,8 @@ exception statement from your version. */
 
 package java.lang;
 
-import java.io.OutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * An instance of a subclass of <code>Process</code> is created by the
diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java
index 9e0ac310ef1..201a671bc15 100644
--- a/libjava/java/util/zip/ZipEntry.java
+++ b/libjava/java/util/zip/ZipEntry.java
@@ -51,10 +51,10 @@ import java.util.Date;
  */
 public class ZipEntry implements ZipConstants, Cloneable
 {
-  private static int KNOWN_SIZE   = 1;
-  private static int KNOWN_CSIZE  = 2;
-  private static int KNOWN_CRC    = 4;
-  private static int KNOWN_TIME   = 8;
+  private static final int KNOWN_SIZE   = 1;
+  private static final int KNOWN_CSIZE  = 2;
+  private static final int KNOWN_CRC    = 4;
+  private static final int KNOWN_TIME   = 8;
 
   private static Calendar cal;