diff options
Diffstat (limited to 'annotation/src/main/java')
3 files changed, 23 insertions, 3 deletions
diff --git a/annotation/src/main/java/java/lang/annotation/Inherited.java b/annotation/src/main/java/java/lang/annotation/Inherited.java index b0b2695..cf16928 100644 --- a/annotation/src/main/java/java/lang/annotation/Inherited.java +++ b/annotation/src/main/java/java/lang/annotation/Inherited.java @@ -18,8 +18,8 @@ package java.lang.annotation; /** - * Defines a meta-annotation for indicating indicating that an annotation is - * automatically inherited. + * Defines a meta-annotation for indicating that an annotation is automatically + * inherited. * * @since Android 1.0 */ diff --git a/annotation/src/main/java/java/lang/annotation/Retention.java b/annotation/src/main/java/java/lang/annotation/Retention.java index 257877a..1c440ae 100644 --- a/annotation/src/main/java/java/lang/annotation/Retention.java +++ b/annotation/src/main/java/java/lang/annotation/Retention.java @@ -18,7 +18,7 @@ package java.lang.annotation; // BEGIN android-note -// Un-linked RetentionPolicy#RUNTIME due to droiddoc problem (it doesn't +// Un-linked RetentionPolicy#RUNTIME due to clearjavadoc problem (it doesn't // yet deal with links to enums). // END android-note diff --git a/annotation/src/main/java/org/apache/harmony/annotation/internal/nls/Messages.java b/annotation/src/main/java/org/apache/harmony/annotation/internal/nls/Messages.java index 2182ae0..91f3548 100644 --- a/annotation/src/main/java/org/apache/harmony/annotation/internal/nls/Messages.java +++ b/annotation/src/main/java/org/apache/harmony/annotation/internal/nls/Messages.java @@ -20,12 +20,22 @@ * if this tool runs again. Better make changes in the template file. */ +// BEGIN android-note +// Redundant code has been removed and is now called from MsgHelp. +// END android-note + package org.apache.harmony.annotation.internal.nls; + +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; +// BEGIN android-changed import org.apache.harmony.luni.util.MsgHelp; +// END android-changed /** * This class retrieves strings from a resource bundle and returns them, @@ -43,8 +53,10 @@ import org.apache.harmony.luni.util.MsgHelp; */ public class Messages { + // BEGIN android-changed private static final String sResource = "org.apache.harmony.annotation.internal.nls.messages"; + // END android-changed /** * Retrieves a message which has no arguments. @@ -54,7 +66,9 @@ public class Messages { * @return String the message for that key in the system message bundle. */ static public String getString(String msg) { + // BEGIN android-changed return MsgHelp.getString(sResource, msg); + // END android-changed } /** @@ -121,6 +135,12 @@ public class Messages { * @return String the message for that key in the system message bundle. */ static public String getString(String msg, Object[] args) { + // BEGIN android-changed return MsgHelp.getString(sResource, msg, args); + // END android-changed } + + // BEGIN android-note + // Duplicate code was dropped in favor of using MsgHelp. + // END android-note } |