You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/11/07 18:38:57 UTC
svn commit: r472177 - in /incubator/harmony/enhanced/classlib/trunk/modules:
luni/src/main/java/java/net/SocketOptions.java
sql/src/main/java/java/sql/ResultSetMetaData.java
text/src/main/java/java/text/CharacterIterator.java
Author: tellison
Date: Tue Nov 7 09:38:52 2006
New Revision: 472177
URL: http://svn.apache.org/viewvc?view=rev&rev=472177
Log:
Apply patch HARMONY-2079 ([classlib] Incorrect field declarations)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketOptions.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java
incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/CharacterIterator.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketOptions.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketOptions.java?view=diff&rev=472177&r1=472176&r2=472177
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketOptions.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketOptions.java Tue Nov 7 09:38:52 2006
@@ -23,31 +23,31 @@
*/
public interface SocketOptions {
- public static int SO_LINGER = 128;
+ public static final int SO_LINGER = 128;
- public static int SO_TIMEOUT = 4102;
+ public static final int SO_TIMEOUT = 4102;
- public static int TCP_NODELAY = 1;
+ public static final int TCP_NODELAY = 1;
// For 5 and 6 see MulticastSocket
// For 7 see PlainDatagramSocketImpl
- public static int IP_MULTICAST_IF = 16;
+ public static final int IP_MULTICAST_IF = 16;
- public static int SO_BINDADDR = 15;
+ public static final int SO_BINDADDR = 15;
- public static int SO_REUSEADDR = 4;
+ public static final int SO_REUSEADDR = 4;
// 10 not currently used
- public static int SO_SNDBUF = 4097;
+ public static final int SO_SNDBUF = 4097;
- public static int SO_RCVBUF = 4098;
+ public static final int SO_RCVBUF = 4098;
// For 13, see DatagramSocket
- public static int SO_KEEPALIVE = 8;
+ public static final int SO_KEEPALIVE = 8;
public static final int IP_TOS = 3;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java?view=diff&rev=472177&r1=472176&r2=472177
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java Tue Nov 7 09:38:52 2006
@@ -25,17 +25,17 @@
/**
* Indicates that a column cannot contain NULL values
*/
- public static int columnNoNulls = 0;
+ public static final int columnNoNulls = 0;
/**
* Indicates that a column can contain NULL values
*/
- public static int columnNullable = 1;
+ public static final int columnNullable = 1;
/**
* Indicates that it is unknown whether a column can contain NULLs or not
*/
- public static int columnNullableUnknown = 2;
+ public static final int columnNullableUnknown = 2;
/**
* Returns the title of indexed columns catalog
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/CharacterIterator.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/CharacterIterator.java?view=diff&rev=472177&r1=472176&r2=472177
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/CharacterIterator.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/CharacterIterator.java Tue Nov 7 09:38:52 2006
@@ -27,7 +27,7 @@
/**
* A constant which indicates there is no character.
*/
- public static char DONE = '\uffff';
+ public static final char DONE = '\uffff';
/**
* Answers a new CharacterIterator with the same properties.