Fix some quality flaws

diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
index b8231cc91e329008a83fe25cb8433ee5c6de718b..01946f0ddd5836dcc818514a6b9a089686c72f67 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
+++ b/sonar-core/src/main/java/org/sonar/core/i18n/DurationLabel.java
@@ -24,19 +24,6 @@ import javax.annotation.Nullable;
 
 class DurationLabel {
 
-  private static String durationPrefix = "duration.";
-  private static String seconds = "seconds";
-  private static String minute = "minute";
-  private static String minutes = "minutes";
-  private static String hour = "hour";
-  private static String hours = "hours";
-  private static String day = "day";
-  private static String days = "days";
-  private static String month = "month";
-  private static String months = "months";
-  private static String year = "year";
-  private static String years = "years";
-
   private DurationLabel() {
     // Utility class
   }
@@ -53,27 +40,27 @@ class DurationLabel {
 
   private static Result getMessage(double nbSeconds, double nbMinutes, double nbHours, double nbDays, double nbYears) {
     if (nbSeconds < 45) {
-      return message(DurationLabel.seconds);
+      return message("seconds");
     } else if (nbSeconds < 90) {
-      return message(DurationLabel.minute);
+      return message("minute");
     } else if (nbMinutes < 45) {
-      return message(DurationLabel.minutes, Math.round(nbMinutes));
+      return message("minutes", Math.round(nbMinutes));
     } else if (nbMinutes < 90) {
-      return message(DurationLabel.hour);
+      return message("hour");
     } else if (nbHours < 24) {
-      return message(DurationLabel.hours, Math.round(nbHours));
+      return message("hours", Math.round(nbHours));
     } else if (nbHours < 48) {
-      return message(DurationLabel.day);
+      return message("day");
     } else if (nbDays < 30) {
-      return message(DurationLabel.days, Double.valueOf(Math.floor(nbDays)).longValue());
+      return message("days", Double.valueOf(Math.floor(nbDays)).longValue());
     } else if (nbDays < 60) {
-      return message(DurationLabel.month);
+      return message( "month");
     } else if (nbDays < 365) {
-      return message(DurationLabel.months, Double.valueOf(Math.floor(nbDays / 30)).longValue());
+      return message("months", Double.valueOf(Math.floor(nbDays / 30)).longValue());
     } else if (nbYears < 2) {
-      return message(DurationLabel.year);
+      return message("year");
     }
-    return message(DurationLabel.years, Double.valueOf(Math.floor(nbYears)).longValue());
+    return message("years", Double.valueOf(Math.floor(nbYears)).longValue());
   }
 
   private static Result message(String key) {
@@ -81,6 +68,7 @@ class DurationLabel {
   }
 
   private static Result message(String key, @Nullable Long value) {
+    String durationPrefix = "duration.";
     return new Result(durationPrefix + key, value);
   }
 

diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
index 3c5bc0d6d48510e1780b66322e59372397d5a1ce..dc3d4db88ccee645660f22463ec5e9696adaa938 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/i18n/DefaultI18nTest.java
@@ -170,7 +170,7 @@ public class DefaultI18nTest {
 
   @Test
   public void get_age_with_duration() {
-    assertThat(manager.age(Locale.ENGLISH, 10)).isEqualTo("less than a minute");
+    assertThat(manager.age(Locale.ENGLISH, 130000)).isEqualTo("less than a minute");
   }
 
   @Test