Changeset 8374 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-17T02:56:15+02:00 (10 years ago)

Author:

Don-vip

Message:

code style - Unnecessary Final Modifier

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• BugReportExceptionHandler.java (modified) (1 diff)
• I18n.java (modified) (8 diffs)
• date/DateUtils.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -282 +282 @@
      * @since 5849
      */
-    public static final UrlLabel getBugReportUrlLabel(String debugText) {
+    public static UrlLabel getBugReportUrlLabel(String debugText) {
         URL url = getBugReportUrl(debugText);
         if (url != null) {

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -197 +197 @@
      * @see #trnc
      */
-    public static final String tr(String text, Object... objects) {
+    public static String tr(String text, Object... objects) {
         if (text == null) return null;
         return MessageFormat.format(gettext(text, null), objects);
@@ -214 +214 @@
      * @see #trnc
      */
-    public static final String trc(String context, String text) {
+    public static String trc(String context, String text) {
         if (context == null)
             return tr(text);
@@ -222 +222 @@
     }
 
-    public static final String trc_lazy(String context, String text) {
+    public static String trc_lazy(String context, String text) {
         if (context == null)
             return tr(text);
@@ -240 +240 @@
      * @return {@code text} unmodified.
      */
-    public static final String marktr(String text) {
+    public static String marktr(String text) {
         return text;
     }
 
-    public static final String marktrc(String context, String text) {
+    public static String marktrc(String context, String text) {
         return text;
     }
@@ -271 +271 @@
      * @see #trnc
      */
-    public static final String trn(String singularText, String pluralText, long n, Object... objects) {
+    public static String trn(String singularText, String pluralText, long n, Object... objects) {
         return MessageFormat.format(gettextn(singularText, pluralText, null, n), objects);
     }
@@ -298 +298 @@
      * @see #trn
      */
-    public static final String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
+    public static String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
         return MessageFormat.format(gettextn(singularText, pluralText, context, n), objects);
     }
 
-    private static final String gettext(String text, String ctx, boolean lazy) {
+    private static String gettext(String text, String ctx, boolean lazy) {
         int i;
         if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
@@ -322 +322 @@
     }
 
-    private static final String gettext(String text, String ctx) {
+    private static String gettext(String text, String ctx) {
         return gettext(text, ctx, false);
     }
 
     /* try without context, when context try fails */
-    private static final String gettext_lazy(String text, String ctx) {
+    private static String gettext_lazy(String text, String ctx) {
         return gettext(text, ctx, true);
     }
 
-    private static final String gettextn(String text, String plural, String ctx, long num) {
+    private static String gettextn(String text, String plural, String ctx, long num) {
         int i;
         if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
@@ -360 +360 @@
      * @return an array of locale objects.
      */
-    public static final Locale[] getAvailableTranslations() {
+    public static Locale[] getAvailableTranslations() {
         Collection<Locale> v = new ArrayList<>(languages.size());
         if(getTranslationFile("en") != null) {

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -151 +151 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newIsoDateFormat() {
+    public static SimpleDateFormat newIsoDateFormat() {
         return new SimpleDateFormat("yyyy-MM-dd");
     }
@@ -160 +160 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newIsoDateTimeFormat() {
+    public static SimpleDateFormat newIsoDateTimeFormat() {
         return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
     }
@@ -169 +169 @@
      * @since 7299
      */
-    public static final SimpleDateFormat newOsmApiDateTimeFormat() {
+    public static SimpleDateFormat newOsmApiDateTimeFormat() {
         // Example: "2010-09-07 14:39:41 UTC".
         // Always parsed with US locale regardless of the current locale in JOSM
@@ -181 +181 @@
      * @since 7299
      */
-    public static final DateFormat getDateFormat(int dateStyle) {
+    public static DateFormat getDateFormat(int dateStyle) {
         if (PROP_ISO_DATES.get()) {
             return newIsoDateFormat();
@@ -196 +196 @@
      * @since 7299
      */
-    public static final String formatDate(Date date, int dateStyle) {
+    public static String formatDate(Date date, int dateStyle) {
         CheckParameterUtil.ensureParameterNotNull(date, "date");
         return getDateFormat(dateStyle).format(date);
@@ -207 +207 @@
      * @since 7299
      */
-    public static final DateFormat getTimeFormat(int timeStyle) {
+    public static DateFormat getTimeFormat(int timeStyle) {
         if (PROP_ISO_DATES.get()) {
             // This is not strictly conform to ISO 8601. We just want to avoid US-style times such as 3.30pm
@@ -222 +222 @@
      * @since 7299
      */
-    public static final String formatTime(Date time, int timeStyle) {
+    public static String formatTime(Date time, int timeStyle) {
         CheckParameterUtil.ensureParameterNotNull(time, "time");
         return getTimeFormat(timeStyle).format(time);
@@ -234 +234 @@
      * @since 7299
      */
-    public static final DateFormat getDateTimeFormat(int dateStyle, int timeStyle) {
+    public static DateFormat getDateTimeFormat(int dateStyle, int timeStyle) {
         if (PROP_ISO_DATES.get()) {
             // This is not strictly conform to ISO 8601. We just want to avoid US-style times such as 3.30pm
@@ -252 +252 @@
      * @since 7299
      */
-    public static final String formatDateTime(Date datetime, int dateStyle, int timeStyle) {
+    public static String formatDateTime(Date datetime, int dateStyle, int timeStyle) {
         CheckParameterUtil.ensureParameterNotNull(datetime, "datetime");
         return getDateTimeFormat(dateStyle, timeStyle).format(datetime);