Code cleanup, fix unstable tests (using J8 time API to fix past tense)

nadiration · Dec 19, 2020 · aa50cd9 · aa50cd9
1 parent fd92041
commit aa50cd9
Show file tree

Hide file tree

Showing 36 changed files with 820 additions and 732 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ target/
 *.ipr
 *.swp
 bin/
+nlp/dependency-reduced-pom.xml
 /*/src/main/java/META-INF
 docs/reference/src/main/docbook/en-US/version_info.xml
 .idea
diff --git a/core/src/main/java/org/ocpsoft/prettytime/PrettyTime.java b/core/src/main/java/org/ocpsoft/prettytime/PrettyTime.java
diff --git a/core/src/main/java/org/ocpsoft/prettytime/i18n/Resources_cs.java b/core/src/main/java/org/ocpsoft/prettytime/i18n/Resources_cs.java
@@ -263,7 +263,7 @@ CsTimeFormat build(final ResourceBundle bundle)
 
    }
 
-   private static class CsTimeFormat extends SimpleTimeFormat implements TimeFormat
+   private static class CsTimeFormat extends SimpleTimeFormat
    {
 
       private final List<CsName> futureNames = new ArrayList<Resources_cs.CsName>();
@@ -283,19 +283,23 @@ public CsTimeFormat(String resourceKeyPrefix, ResourceBundle bundle, Collection<
          try {
             setFuturePluralName(bundle.getString(resourceKeyPrefix + "FuturePluralName"));
          }
-         catch (Exception e) {}
+         catch (Exception e) {
+         }
          try {
             setFutureSingularName((bundle.getString(resourceKeyPrefix + "FutureSingularName")));
          }
-         catch (Exception e) {}
+         catch (Exception e) {
+         }
          try {
             setPastPluralName((bundle.getString(resourceKeyPrefix + "PastPluralName")));
          }
-         catch (Exception e) {}
+         catch (Exception e) {
+         }
          try {
             setPastSingularName((bundle.getString(resourceKeyPrefix + "PastSingularName")));
          }
-         catch (Exception e) {}
+         catch (Exception e) {
+         }
 
          for (CsName name : names) {
             if (name.isFuture()) {

diff --git a/core/src/main/java/org/ocpsoft/prettytime/i18n/Resources_et.java b/core/src/main/java/org/ocpsoft/prettytime/i18n/Resources_et.java
@@ -15,18 +15,6 @@
  */
 package org.ocpsoft.prettytime.i18n;
 
-import java.util.ListResourceBundle;
-import java.util.ResourceBundle;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.ocpsoft.prettytime.Duration;
-import org.ocpsoft.prettytime.TimeFormat;
-import org.ocpsoft.prettytime.TimeUnit;
-import org.ocpsoft.prettytime.format.SimpleTimeFormat;
-import org.ocpsoft.prettytime.impl.TimeFormatProvider;
-import org.ocpsoft.prettytime.units.Day;
-
 public class Resources_et extends Resources_fi
 {
    private static final Object[][] OBJECTS = new Object[][] {