harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r453991 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java: io/EmulatedFieldsForDumping.java lang/Character.java util/Locale.java
Date Sat, 07 Oct 2006 19:27:31 GMT
Author: ndbeyer
Date: Sat Oct  7 12:27:30 2006
New Revision: 453991

URL: http://svn.apache.org/viewvc?view=rev&rev=453991
Log:
Cleanup compiler warnings.

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java?view=diff&rev=453991&r1=453990&r2=453991
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/EmulatedFieldsForDumping.java
Sat Oct  7 12:27:30 2006
@@ -201,6 +201,8 @@
 	 *             If an IO exception happened when writing the field values.
 	 */
 	@Override
+    @Deprecated
+    @SuppressWarnings("deprecation")
     public void write(ObjectOutput output) throws IOException {
 		EmulatedFields.ObjectSlot[] slots = emulatedFields.slots();
 		for (int i = 0; i < slots.length; i++) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java?view=diff&rev=453991&r1=453990&r2=453991
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Character.java
Sat Oct  7 12:27:30 2006
@@ -2597,9 +2597,8 @@
         // the spec says.RI's Character type values skip the value 17.
         if (type <= Character.FORMAT) {
             return type;
-        } else {
-            return (type + 1);
         }
+        return (type + 1);
     }
 
     /**
@@ -2637,9 +2636,8 @@
         byte UCDirectionality = UCharacter.getDirectionality(codePoint);       
         if (UCDirectionality == -1) {
             return -1;
-        } else {
-            return DIRECTIONALITY[UCDirectionality];
         }
+        return DIRECTIONALITY[UCDirectionality];
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java?view=diff&rev=453991&r1=453990&r2=453991
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
Sat Oct  7 12:27:30 2006
@@ -17,9 +17,7 @@
 
 package java.util;
 
-
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -32,7 +30,6 @@
 
 import org.apache.harmony.luni.internal.locale.Country;
 import org.apache.harmony.luni.internal.locale.Language;
-
 import org.apache.harmony.luni.util.PriviAction;
 
 /**
@@ -48,8 +45,6 @@
 	
 	private static final long serialVersionUID = 9149081749638150636L;
 
-	transient private String countryCode, languageCode, variantCode;
-
 	private static Locale[] availableLocales;
 
 	// Initialize a default which is used during static
@@ -173,6 +168,10 @@
 				.doPrivileged(new PriviAction<String>("user.variant", "")); //$NON-NLS-1$ //$NON-NLS-2$
 		defaultLocale = new Locale(language, region, variant);
 	}
+    
+    private transient String countryCode;
+    private transient String languageCode;
+    private transient String variantCode;
 
 	/**
 	 * Constructs a default which is used during static initialization of the



Mime
View raw message