harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r1001745 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java: io/FilePermission.java util/Calendar.java util/PropertyPermission.java
Date Mon, 27 Sep 2010 13:57:46 GMT
Author: tellison
Date: Mon Sep 27 13:57:45 2010
New Revision: 1001745

URL: http://svn.apache.org/viewvc?rev=1001745&view=rev
Log:
Replace some NLS trailing comments with more readable suppress warnings annotation.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/FilePermission.java
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/Calendar.java
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/PropertyPermission.java

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/FilePermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/FilePermission.java?rev=1001745&r1=1001744&r2=1001745&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/FilePermission.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/io/FilePermission.java
Mon Sep 27 13:57:45 2010
@@ -55,8 +55,9 @@ public final class FilePermission extend
     private transient String canonPath;
 
     // list of actions permitted for socket permission in order
-    private static final String[] actionList = { "read", "write", "execute", //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
-            "delete" }; //$NON-NLS-1$
+    @SuppressWarnings("nls")
+    private static final String[] actionList = { "read", "write", "execute",
+            "delete" };
 
     // "canonicalized" action list
     private String actions;

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/Calendar.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/Calendar.java?rev=1001745&r1=1001744&r2=1001745&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/Calendar.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/Calendar.java
Mon Sep 27 13:57:45 2010
@@ -654,11 +654,12 @@ public abstract class Calendar implement
      */
     public static final int PM = 1;
 
-    private static String[] fieldNames = { "ERA=", "YEAR=", "MONTH=", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-            "WEEK_OF_YEAR=", "WEEK_OF_MONTH=", "DAY_OF_MONTH=", "DAY_OF_YEAR=", //$NON-NLS-1$//$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
-            "DAY_OF_WEEK=", "DAY_OF_WEEK_IN_MONTH=", "AM_PM=", "HOUR=", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
//$NON-NLS-4$
-            "HOUR_OF_DAY", "MINUTE=", "SECOND=", "MILLISECOND=", //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
-            "ZONE_OFFSET=", "DST_OFFSET=" }; //$NON-NLS-1$ //$NON-NLS-2$
+    @SuppressWarnings("nls")
+    private static String[] fieldNames = { "ERA=", "YEAR=", "MONTH=",
+            "WEEK_OF_YEAR=", "WEEK_OF_MONTH=", "DAY_OF_MONTH=", "DAY_OF_YEAR=",
+            "DAY_OF_WEEK=", "DAY_OF_WEEK_IN_MONTH=", "AM_PM=", "HOUR=",
+            "HOUR_OF_DAY", "MINUTE=", "SECOND=", "MILLISECOND=",
+            "ZONE_OFFSET=", "DST_OFFSET=" };
 
     /**
      * Constructs a {@code Calendar} instance using the default {@code TimeZone} and {@code
Locale}.

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/PropertyPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/PropertyPermission.java?rev=1001745&r1=1001744&r2=1001745&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/PropertyPermission.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/java/java/util/PropertyPermission.java
Mon Sep 27 13:57:45 2010
@@ -108,8 +108,9 @@ public final class PropertyPermission ex
      * @return the actions associated with the receiver.
      */
     @Override
+    @SuppressWarnings("nls")
     public String getActions() {
-        return read ? (write ? "read,write" : "read") : "write"; //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+        return read ? (write ? "read,write" : "read") : "write";
     }
 
     /**



Mime
View raw message