[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: various small cleanups
Kaffe CVS
cvs-commits at kaffe.org
Mon Oct 11 17:28:38 PDT 2004
PatchSet 5271
Date: 2004/10/12 00:24:55
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: various small cleanups
2004-10-11 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/security/IdentityScope.java:
Replaced by implementation from GNU Classpath.
* libraries/javalib/java/awt/Button.java,
libraries/javalib/java/awt/EventDispatchThread.java,
libraries/javalib/java/awt/Frame.java,
libraries/javalib/java/awt/Scrollbar.java,
libraries/javalib/java/awt/TextArea.java,
libraries/javalib/java/net/HttpURLConnection.java,
libraries/javalib/java/security/Policy.java,
libraries/javalib/java/util/Timer.java,
libraries/javalib/java/util/logging/LogRecord.java,
libraries/javalib/javax/naming/spi/NamingManager.java,
libraries/javalib/javax/swing/JDialog.java,
libraries/javalib/javax/swing/JFrame.java,
libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java,
libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:
Resynced with GNU Classpath.
2004-10-11 Jeroen Frijters <jeroen at frijters.net>
* java/awt/EventDispatchThread.java
(dispatchThreadNum): Removed initializer.
(EventDispatchThread): Pre-increment dispatchThreadNum.
* java/awt/Button.java
(next_button_number): Removed useless initializer.
* java/awt/Frame.java
(next_frame_number): Likewise.
* java/awt/Scrollbar.java
(next_scrollbar_number): Likewise.
* java/awt/TextArea.java
(next_text_number): Likewise.
* java/io/ObjectInputStream.java
(dump): Likewise.
* java/security/Policy.java
(currentPolicy): Likewise.
* java/util/Timer.java
(nr): Likewise.
* java/util/logging/LogRecord.java
(lastSeqNum): Likewise.
* javax/naming/spi/NamingManager.java
(icfb, ofb): Likewise.
* javax/swing/JDialog.java
(decorated): Likewise.
* javax/swing/JFrame.java
(defaultLookAndFeelDecorated): Likewise.
* javax/swing/plaf/basic/BasicToolBarUI.java
(offset, regular): Made final.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(DECREASE_HIGHLIGHT, INCREASE_HIGHLIGHT, NO_HIGHLIGHT,
POSITIVE_SCROLL, NEGATIVE_SCROLL): Made final.
* java/net/HttpURLConnection.java
(valid_methods): Made final.
Members:
ChangeLog:1.2823->1.2824
libraries/javalib/java/awt/Button.java:1.4->1.5
libraries/javalib/java/awt/EventDispatchThread.java:1.11->1.12
libraries/javalib/java/awt/Frame.java:1.20->1.21
libraries/javalib/java/awt/Scrollbar.java:1.4->1.5
libraries/javalib/java/awt/TextArea.java:1.3->1.4
libraries/javalib/java/net/HttpURLConnection.java:1.10->1.11
libraries/javalib/java/security/IdentityScope.java:1.2->1.3
libraries/javalib/java/security/Policy.java:1.2->1.3
libraries/javalib/java/util/Timer.java:1.6->1.7
libraries/javalib/java/util/logging/LogRecord.java:1.2->1.3
libraries/javalib/javax/naming/spi/NamingManager.java:1.8->1.9
libraries/javalib/javax/swing/JDialog.java:1.1->1.2
libraries/javalib/javax/swing/JFrame.java:1.3->1.4
libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.5->1.6
libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2823 kaffe/ChangeLog:1.2824
--- kaffe/ChangeLog:1.2823 Tue Oct 12 00:07:45 2004
+++ kaffe/ChangeLog Tue Oct 12 00:24:55 2004
@@ -1,5 +1,61 @@
2004-10-11 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/security/IdentityScope.java:
+ Replaced by implementation from GNU Classpath.
+
+ * libraries/javalib/java/awt/Button.java,
+ libraries/javalib/java/awt/EventDispatchThread.java,
+ libraries/javalib/java/awt/Frame.java,
+ libraries/javalib/java/awt/Scrollbar.java,
+ libraries/javalib/java/awt/TextArea.java,
+ libraries/javalib/java/net/HttpURLConnection.java,
+ libraries/javalib/java/security/Policy.java,
+ libraries/javalib/java/util/Timer.java,
+ libraries/javalib/java/util/logging/LogRecord.java,
+ libraries/javalib/javax/naming/spi/NamingManager.java,
+ libraries/javalib/javax/swing/JDialog.java,
+ libraries/javalib/javax/swing/JFrame.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java,
+ libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-11 Jeroen Frijters <jeroen at frijters.net>
+
+ * java/awt/EventDispatchThread.java
+ (dispatchThreadNum): Removed initializer.
+ (EventDispatchThread): Pre-increment dispatchThreadNum.
+ * java/awt/Button.java
+ (next_button_number): Removed useless initializer.
+ * java/awt/Frame.java
+ (next_frame_number): Likewise.
+ * java/awt/Scrollbar.java
+ (next_scrollbar_number): Likewise.
+ * java/awt/TextArea.java
+ (next_text_number): Likewise.
+ * java/io/ObjectInputStream.java
+ (dump): Likewise.
+ * java/security/Policy.java
+ (currentPolicy): Likewise.
+ * java/util/Timer.java
+ (nr): Likewise.
+ * java/util/logging/LogRecord.java
+ (lastSeqNum): Likewise.
+ * javax/naming/spi/NamingManager.java
+ (icfb, ofb): Likewise.
+ * javax/swing/JDialog.java
+ (decorated): Likewise.
+ * javax/swing/JFrame.java
+ (defaultLookAndFeelDecorated): Likewise.
+ * javax/swing/plaf/basic/BasicToolBarUI.java
+ (offset, regular): Made final.
+ * javax/swing/plaf/basic/BasicScrollBarUI.java
+ (DECREASE_HIGHLIGHT, INCREASE_HIGHLIGHT, NO_HIGHLIGHT,
+ POSITIVE_SCROLL, NEGATIVE_SCROLL): Made final.
+ * java/net/HttpURLConnection.java
+ (valid_methods): Made final.
+
+2004-10-11 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/io/DataInputStream.java,
libraries/javalib/java/io/DataOutputStream.java,
libraries/javalib/java/io/InputStreamReader.java,
Index: kaffe/libraries/javalib/java/awt/Button.java
diff -u kaffe/libraries/javalib/java/awt/Button.java:1.4 kaffe/libraries/javalib/java/awt/Button.java:1.5
--- kaffe/libraries/javalib/java/awt/Button.java:1.4 Mon Aug 9 13:44:17 2004
+++ kaffe/libraries/javalib/java/awt/Button.java Tue Oct 12 00:24:58 2004
@@ -84,7 +84,7 @@
/*
* The number used to generate the name returned by getName.
*/
- private static transient long next_button_number = 0;
+ private static transient long next_button_number;
/*************************************************************************/
Index: kaffe/libraries/javalib/java/awt/EventDispatchThread.java
diff -u kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.11 kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.12
--- kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.11 Mon Oct 4 09:01:29 2004
+++ kaffe/libraries/javalib/java/awt/EventDispatchThread.java Tue Oct 12 00:24:58 2004
@@ -43,14 +43,14 @@
*/
class EventDispatchThread extends Thread
{
- private static int dispatchThreadNum = 1;
+ private static int dispatchThreadNum;
private EventQueue queue;
EventDispatchThread(EventQueue queue)
{
super();
- setName("AWT-EventQueue-" + dispatchThreadNum++);
+ setName("AWT-EventQueue-" + ++dispatchThreadNum);
this.queue = queue;
setPriority(NORM_PRIORITY + 1);
start();
Index: kaffe/libraries/javalib/java/awt/Frame.java
diff -u kaffe/libraries/javalib/java/awt/Frame.java:1.20 kaffe/libraries/javalib/java/awt/Frame.java:1.21
--- kaffe/libraries/javalib/java/awt/Frame.java:1.20 Mon Oct 4 09:01:29 2004
+++ kaffe/libraries/javalib/java/awt/Frame.java Tue Oct 12 00:24:58 2004
@@ -199,7 +199,7 @@
/*
* The number used to generate the name returned by getName.
*/
- private static transient long next_frame_number = 0;
+ private static transient long next_frame_number;
/**
* Initializes a new instance of <code>Frame</code> that is not visible
Index: kaffe/libraries/javalib/java/awt/Scrollbar.java
diff -u kaffe/libraries/javalib/java/awt/Scrollbar.java:1.4 kaffe/libraries/javalib/java/awt/Scrollbar.java:1.5
--- kaffe/libraries/javalib/java/awt/Scrollbar.java:1.4 Mon Oct 4 09:01:32 2004
+++ kaffe/libraries/javalib/java/awt/Scrollbar.java Tue Oct 12 00:24:58 2004
@@ -125,7 +125,7 @@
/*
* The number used to generate the name returned by getName.
*/
- private static transient long next_scrollbar_number = 0;
+ private static transient long next_scrollbar_number;
/*************************************************************************/
Index: kaffe/libraries/javalib/java/awt/TextArea.java
diff -u kaffe/libraries/javalib/java/awt/TextArea.java:1.3 kaffe/libraries/javalib/java/awt/TextArea.java:1.4
--- kaffe/libraries/javalib/java/awt/TextArea.java:1.3 Mon Oct 4 09:01:33 2004
+++ kaffe/libraries/javalib/java/awt/TextArea.java Tue Oct 12 00:24:58 2004
@@ -101,7 +101,7 @@
/*
* The number used to generate the name returned by getName.
*/
- private static transient long next_text_number = 0;
+ private static transient long next_text_number;
/**
* Initialize a new instance of <code>TextArea</code> that is empty.
Index: kaffe/libraries/javalib/java/net/HttpURLConnection.java
diff -u kaffe/libraries/javalib/java/net/HttpURLConnection.java:1.10 kaffe/libraries/javalib/java/net/HttpURLConnection.java:1.11
--- kaffe/libraries/javalib/java/net/HttpURLConnection.java:1.10 Mon May 17 22:25:05 2004
+++ kaffe/libraries/javalib/java/net/HttpURLConnection.java Tue Oct 12 00:24:59 2004
@@ -291,7 +291,7 @@
/**
* This is a list of valid request methods, separated by "|" characters.
*/
- private static String valid_methods =
+ private static final String valid_methods =
"|GET|POST|HEAD|OPTIONS|PUT|DELETE|TRACE|";
// Instance Variables
Index: kaffe/libraries/javalib/java/security/IdentityScope.java
diff -u kaffe/libraries/javalib/java/security/IdentityScope.java:1.2 kaffe/libraries/javalib/java/security/IdentityScope.java:1.3
--- kaffe/libraries/javalib/java/security/IdentityScope.java:1.2 Thu Jul 4 10:27:32 2002
+++ kaffe/libraries/javalib/java/security/IdentityScope.java Tue Oct 12 00:24:59 2004
@@ -1,59 +1,226 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 2002
- * Dalibor Topic. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Dalibor Topic <robilad at yahoo.com>
- */
-
-package java.security;
-
-import java.util.Enumeration;
-
-/** @deprecated */
-public abstract class IdentityScope extends Identity {
- protected IdentityScope() {
- }
-
- public IdentityScope(String name) {
- super(name);
- }
-
- public IdentityScope(String name, IdentityScope scope) throws KeyManagementException {
- super(name, scope);
- }
+/* IdentityScope.java --- IdentityScope Class
+ Copyright (C) 1999, 2003, Free Software Foundation, Inc.
- public abstract void addIdentity(Identity identity) throws KeyManagementException;
+This file is part of GNU Classpath.
- public Identity getIdentity(Principal principal) {
- return getIdentity(principal.getName());
- }
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
- public abstract Identity getIdentity(PublicKey key);
-
- public abstract Identity getIdentity(String name);
-
- public static IdentityScope getSystemScope() {
- /* XXX FIXME: needs to be implemented */
- throw new kaffe.util.NotImplemented();
- }
-
- public abstract Enumeration identities();
-
- public abstract void removeIdentity(Identity identity) throws KeyManagementException;
-
- protected static void setSystemScope(IdentityScope scope) {
- /* XXX FIXME: needs to be implemented */
- throw new kaffe.util.NotImplemented();
- }
+package java.security;
- public abstract int size();
+import java.util.Enumeration;
- public String toString() {
- return "java.security.IdentityScope[name=" + getName() + ",scope=" + getScope() + "size=" + size() + ']';
- }
+/**
+ * <p>This class represents a scope for identities. It is an Identity itself,
+ * and therefore has a name and can have a scope. It can also optionally have a
+ * public key and associated certificates.</p>
+ *
+ * <p>An <code>IdentityScope</code> can contain {@link Identity} objects of all
+ * kinds, including {@link Signer}s. All types of <code>Identity</code> objects
+ * can be retrieved, added, and removed using the same methods. Note that it is
+ * possible, and in fact expected, that different types of identity scopes will
+ * apply different policies for their various operations on the various types of
+ * Identities.</p>
+ *
+ * <p>There is a one-to-one mapping between keys and identities, and there can
+ * only be one copy of one key per scope. For example, suppose Acme Software,
+ * Inc is a software publisher known to a user. Suppose it is an <i>Identity</i>,
+ * that is, it has a public key, and a set of associated certificates. It is
+ * named in the scope using the name "Acme Software". No other named <i>Identity
+ * </i> in the scope has the same public key. Of course, none has the same name
+ * as well.</p>
+ *
+ * @author Mark Benvenuto
+ * @see Identity
+ * @see Signer
+ * @see Principal
+ * @see Key
+ * @deprecated This class is no longer used. Its functionality has been replaced
+ * by <code>java.security.KeyStore</code>, the <code>java.security.cert</code>
+ * package, and <code>java.security.Principal</code>.
+ */
+public abstract class IdentityScope extends Identity
+{
+ private static final long serialVersionUID = -2337346281189773310L;
+ private static IdentityScope systemScope;
+
+ /**
+ * This constructor is used for serialization only and should not be used by
+ * subclasses.
+ */
+ protected IdentityScope()
+ {
+ super();
+ }
+
+ /**
+ * Constructs a new identity scope with the specified name.
+ *
+ * @param name the scope name.
+ */
+ public IdentityScope(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Constructs a new identity scope with the specified name and scope.
+ *
+ * @param name the scope name.
+ * @param scope the scope for the new identity scope.
+ * @throws KeyManagementException if there is already an identity with the
+ * same name in the scope.
+ */
+ public IdentityScope(String name, IdentityScope scope)
+ throws KeyManagementException
+ {
+ super(name, scope);
+ }
+
+ /**
+ * Returns the system's identity scope.
+ *
+ * @return the system's identity scope.
+ * @see #setSystemScope(IdentityScope)
+ */
+ public static IdentityScope getSystemScope()
+ {
+ if (systemScope == null)
+ {
+ //Load it
+ //systemScope;
+ }
+ return systemScope;
+ }
+
+ /**
+ * Sets the system's identity scope.
+ *
+ * <p>First, if there is a security manager, its <code>checkSecurityAccess()
+ * </code> method is called with <code>"setSystemScope"</code> as its argument
+ * to see if it's ok to set the identity scope.</p>
+ *
+ * @param scope the scope to set.
+ * @throws SecurityException if a security manager exists and its
+ * <code>checkSecurityAccess()</code> method doesn't allow setting the
+ * identity scope.
+ * @see #getSystemScope()
+ * @see SecurityManager#checkSecurityAccess(String)
+ */
+ protected static void setSystemScope(IdentityScope scope)
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkSecurityAccess("setSystemScope");
+
+ systemScope = scope;
+ }
+
+ /**
+ * Returns the number of identities within this identity scope.
+ *
+ * @return the number of identities within this identity scope.
+ */
+ public abstract int size();
+
+ /**
+ * Returns the identity in this scope with the specified name (if any).
+ *
+ * @param name the name of the identity to be retrieved.
+ * @return the identity named name, or <code>null</code> if there are no
+ * identities named name in this scope.
+ */
+ public abstract Identity getIdentity(String name);
+
+ /**
+ * Retrieves the identity whose name is the same as that of the specified
+ * principal. (Note: <code>Identity</code> implements <code>Principal</code>.)
+ *
+ * @param principal the principal corresponding to the identity to be
+ * retrieved.
+ * @return the identity whose name is the same as that of the principal, or
+ * <code>null</code> if there are no identities of the same name in this scope.
+ */
+ public Identity getIdentity(Principal principal)
+ {
+ return getIdentity(principal.getName());
+ }
+
+ /**
+ * Retrieves the identity with the specified public key.
+ *
+ * @param key the public key for the identity to be returned.
+ * @return the identity with the given key, or <code>null</code> if there are
+ * no identities in this scope with that key.
+ */
+ public abstract Identity getIdentity(PublicKey key);
+
+ /**
+ * Adds an identity to this identity scope.
+ *
+ * @param identity the identity to be added.
+ * @throws KeyManagementException if the identity is not valid, a name
+ * conflict occurs, another identity has the same public key as the identity
+ * being added, or another exception occurs.
+ */
+ public abstract void addIdentity(Identity identity)
+ throws KeyManagementException;
+
+ /**
+ * Removes an identity from this identity scope.
+ *
+ * @param identity the identity to be removed.
+ * @throws KeyManagementException if the identity is missing, or another
+ * exception occurs.
+ */
+ public abstract void removeIdentity(Identity identity)
+ throws KeyManagementException;
+
+ /**
+ * Returns an enumeration of all identities in this identity scope.
+ *
+ * @return an enumeration of all identities in this identity scope.
+ */
+ public abstract Enumeration identities();
+
+ /**
+ * Returns a string representation of this identity scope, including its name,
+ * its scope name, and the number of identities in this identity scope.
+ *
+ * @return a string representation of this identity scope.
+ * @see SecurityManager#checkSecurityAccess(String)
+ */
+ public String toString()
+ {
+ return (super.getName() + " " + super.getScope().getName() + " " + size());
+ }
}
Index: kaffe/libraries/javalib/java/security/Policy.java
diff -u kaffe/libraries/javalib/java/security/Policy.java:1.2 kaffe/libraries/javalib/java/security/Policy.java:1.3
--- kaffe/libraries/javalib/java/security/Policy.java:1.2 Tue Sep 16 12:35:54 2003
+++ kaffe/libraries/javalib/java/security/Policy.java Tue Oct 12 00:24:59 2004
@@ -95,7 +95,7 @@
*/
public abstract class Policy
{
- static private Policy currentPolicy = null;
+ static private Policy currentPolicy;
/** Map of ProtectionDomains to PermissionCollections for this instance. */
private Map pd2pc = null;
Index: kaffe/libraries/javalib/java/util/Timer.java
diff -u kaffe/libraries/javalib/java/util/Timer.java:1.6 kaffe/libraries/javalib/java/util/Timer.java:1.7
--- kaffe/libraries/javalib/java/util/Timer.java:1.6 Wed Mar 17 02:53:12 2004
+++ kaffe/libraries/javalib/java/util/Timer.java Tue Oct 12 00:24:59 2004
@@ -376,7 +376,7 @@
// Number of Timers created.
// Used for creating nice Thread names.
- private static int nr = 0;
+ private static int nr;
// The queue that all the tasks are put in.
// Given to the scheduler
Index: kaffe/libraries/javalib/java/util/logging/LogRecord.java
diff -u kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.2 kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.3
--- kaffe/libraries/javalib/java/util/logging/LogRecord.java:1.2 Wed May 14 23:20:10 2003
+++ kaffe/libraries/javalib/java/util/logging/LogRecord.java Tue Oct 12 00:25:00 2004
@@ -384,7 +384,7 @@
/**
* The last used sequence number for any LogRecord.
*/
- private static long lastSeqNum = 0;
+ private static long lastSeqNum;
/**
Index: kaffe/libraries/javalib/javax/naming/spi/NamingManager.java
diff -u kaffe/libraries/javalib/javax/naming/spi/NamingManager.java:1.8 kaffe/libraries/javalib/javax/naming/spi/NamingManager.java:1.9
--- kaffe/libraries/javalib/javax/naming/spi/NamingManager.java:1.8 Mon Apr 19 12:20:31 2004
+++ kaffe/libraries/javalib/javax/naming/spi/NamingManager.java Tue Oct 12 00:25:00 2004
@@ -55,10 +55,10 @@
{
public static final String CPE = "java.naming.spi.CannotProceedException";
- private static InitialContextFactoryBuilder icfb = null;
+ private static InitialContextFactoryBuilder icfb;
// Package private so DirectoryManager can access it.
- static ObjectFactoryBuilder ofb = null;
+ static ObjectFactoryBuilder ofb;
// This class cannot be instantiated.
NamingManager ()
Index: kaffe/libraries/javalib/javax/swing/JDialog.java
diff -u kaffe/libraries/javalib/javax/swing/JDialog.java:1.1 kaffe/libraries/javalib/javax/swing/JDialog.java:1.2
--- kaffe/libraries/javalib/javax/swing/JDialog.java:1.1 Thu Jul 22 19:37:20 2004
+++ kaffe/libraries/javalib/javax/swing/JDialog.java Tue Oct 12 00:25:01 2004
@@ -77,7 +77,7 @@
private int close_action = HIDE_ON_CLOSE;
/** Whether JDialogs are decorated by the Look and Feel. */
- private static boolean decorated = false;
+ private static boolean decorated;
/**
* Creates a new non-modal JDialog with no title
Index: kaffe/libraries/javalib/javax/swing/JFrame.java
diff -u kaffe/libraries/javalib/javax/swing/JFrame.java:1.3 kaffe/libraries/javalib/javax/swing/JFrame.java:1.4
--- kaffe/libraries/javalib/javax/swing/JFrame.java:1.3 Wed Sep 29 04:23:56 2004
+++ kaffe/libraries/javalib/javax/swing/JFrame.java Tue Oct 12 00:25:01 2004
@@ -60,7 +60,7 @@
implements WindowConstants, RootPaneContainer
{
private static final long serialVersionUID = -3362141868504252139L;
- private static boolean defaultLookAndFeelDecorated = false;
+ private static boolean defaultLookAndFeelDecorated;
private int close_action = HIDE_ON_CLOSE;
protected AccessibleContext accessibleContext;
protected JRootPane rootPane;
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.5 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.6
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.5 Wed Sep 29 04:23:58 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java Tue Oct 12 00:25:02 2004
@@ -435,19 +435,19 @@
protected Rectangle thumbRect;
/** Indicates that the decrease highlight should be painted. */
- protected static int DECREASE_HIGHLIGHT = 1;
+ protected static final int DECREASE_HIGHLIGHT = 1;
/** Indicates that the increase highlight should be painted. */
- protected static int INCREASE_HIGHLIGHT = 2;
+ protected static final int INCREASE_HIGHLIGHT = 2;
/** Indicates that no highlight should be painted. */
- protected static int NO_HIGHLIGHT = 0;
+ protected static final int NO_HIGHLIGHT = 0;
/** Indicates that the scrolling direction is positive. */
- private static int POSITIVE_SCROLL = 1;
+ private static final int POSITIVE_SCROLL = 1;
/** Indicates that the scrolling direction is negative. */
- private static int NEGATIVE_SCROLL = -1;
+ private static final int NEGATIVE_SCROLL = -1;
/** The cached preferred size for the scrollbar. */
private transient Dimension preferredSize;
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.4 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.5
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.4 Sun Sep 12 15:11:09 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java Tue Oct 12 00:25:02 2004
@@ -1331,10 +1331,10 @@
private static class ToolBarBorder implements Border
{
/** The size of the larger, draggable side of the border. */
- private static int offset = 10;
+ private static final int offset = 10;
/** The other sides. */
- private static int regular = 2;
+ private static final int regular = 2;
/**
* This method returns the border insets for the JToolBar.
More information about the kaffe
mailing list