[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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a866b44247312a8627f6acb29bc50dc5656c181c..c91cb9b385a836336fea0e953446c098076c5cc3 100644 (file)
--- 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 1d1861d2491194a3ace15c2b3f0440013052be3e..b87bd8068b548f49b51a33e2d1da540b42366a82 100644 (file)
--- 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 9e0ac310ef1ecb18e264dcb2c78366db1ea95153..201a671bc155f7cbc12212b254db01fc4a41ed8b 100644 (file)
--- 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;