Merge branch 'master' into develop

Author: dmsmith

README.md

@@ -1,5 +1,4 @@
 # JSword - Free Bible Study Software
-# JSword
 
 [![Build Status](https://github.com/crosswire/jsword/workflows/Java%20CI%20with%20Gradle/badge.svg)](https://github.com/crosswire/jsword/actions)
 [![JitPack](https://jitpack.io/v/crosswire/jsword.svg)](https://jitpack.io/#crosswire/jsword)

src/main/java/org/crosswire/common/activate/Activator.java

@@ -87,7 +87,7 @@ public static void deactivateAll() {
     /**
      * The list of things that we have activated
      */
-    private static Set<Activatable> activated = new HashSet<Activatable>();
+    private static Set<Activatable> activated = new HashSet<>();
 
     /**
      * The object we use to prevent others from

src/main/java/org/crosswire/common/config/ChoiceFactory.java

@@ -84,7 +84,7 @@ public static Map<String, Object> getDataMap() {
     /**
      * Storage of various registered objects
      */
-    private static Map<String, Object> datamap = new HashMap<String, Object>();
+    private static Map<String, Object> datamap = new HashMap<>();
 
     /**
      * Store of the known ChoiceTypes

src/main/java/org/crosswire/common/config/Config.java

@@ -86,10 +86,10 @@ public class Config implements Iterable<Choice> {
      */
     public Config(String title) {
         this.title = title;
-        keys = new ArrayList<String>();
-        models = new ArrayList<Choice>();
+        keys = new ArrayList<>();
+        models = new ArrayList<>();
         local = new PropertyMap();
-        listeners = new CopyOnWriteArrayList<ConfigListener>();
+        listeners = new CopyOnWriteArrayList<>();
     }
 
     /**
@@ -492,12 +492,12 @@ protected void fireChoiceRemoved(String key, Choice model) {
     /**
      * The array that stores the keys
      */
-    protected List<String> keys = new ArrayList<String>();
+    protected List<String> keys = new ArrayList<>();
 
     /**
      * The array that stores the models
      */
-    protected List<Choice> models = new ArrayList<Choice>();
+    protected List<Choice> models = new ArrayList<>();
 
     /**
      * The set of local values

src/main/java/org/crosswire/common/config/IntOptionsChoice.java

@@ -47,7 +47,7 @@ public void init(Element option, ResourceBundle configResources) throws StartupE
 
         String prefix = getKey() + ".alternative.";
 
-        options = new TreeMap<Integer, String>();
+        options = new TreeMap<>();
         Iterator<Element> iter = option.getChildren("alternative").iterator();
         while (iter.hasNext()) {
             Element alternative = iter.next();
@@ -63,7 +63,7 @@ public void init(Element option, ResourceBundle configResources) throws StartupE
      * @see org.crosswire.common.config.MappedChoice#getOptions()
      */
     public Map<Integer, String> getOptions() {
-        return new TreeMap<Integer, String>(options);
+        return new TreeMap<>(options);
     }
 
     /*

src/main/java/org/crosswire/common/config/MappedOptionsChoice.java

@@ -57,7 +57,7 @@ public void init(Element option, ResourceBundle configResources) throws StartupE
         if (map instanceof Map<?, ?>) {
             options = (Map<?, ?>) map;
         } else {
-            options = new TreeMap<Object, Object>();
+            options = new TreeMap<>();
         }
     }
 
@@ -67,7 +67,7 @@ public void init(Element option, ResourceBundle configResources) throws StartupE
      * @see org.crosswire.common.config.MappedChoice#getOptions()
      */
     public Map<Object, Object> getOptions() {
-        return new TreeMap<Object, Object>(options);
+        return new TreeMap<>(options);
     }
 
     /*

src/main/java/org/crosswire/common/diff/Bitap.java

@@ -47,7 +47,7 @@ public Bitap(String text, String pattern, int loc) {
         this.text = text;
         this.pattern = pattern;
         this.loc = loc;
-        alphabet = new HashMap<Character, Integer>();
+        alphabet = new HashMap<>();
     }
 
     /*

src/main/java/org/crosswire/common/diff/Diff.java

@@ -76,7 +76,7 @@ public List<Difference> compare() {
         // Check for equality (speedup)
         List<Difference> diffs;
         if (source.equals(target)) {
-            diffs = new ArrayList<Difference>();
+            diffs = new ArrayList<>();
             diffs.add(new Difference(EditType.EQUAL, source));
             return diffs;
         }
@@ -116,7 +116,7 @@ public List<Difference> compare() {
      * @return List of Difference objects
      */
     private List<Difference> compute() {
-        List<Difference> diffs = new ArrayList<Difference>();
+        List<Difference> diffs = new ArrayList<>();
 
         if ("".equals(source)) {
             // Just add some text (speedup)
@@ -173,7 +173,7 @@ private List<Difference> compute() {
 
         if (diffs == null) {
             // No acceptable result.
-            diffs = new ArrayList<Difference>();
+            diffs = new ArrayList<>();
             diffs.add(new Difference(EditType.DELETE, source));
             diffs.add(new Difference(EditType.INSERT, target));
         }

src/main/java/org/crosswire/common/diff/DiffCleanup.java

@@ -48,7 +48,7 @@ private DiffCleanup() {
      */
     public static void cleanupSemantic(final List<Difference> diffs) {
         boolean changes = false;
-        Stack<Difference> equalities = new Stack<Difference>(); // Stack of indices where equalities are
+        Stack<Difference> equalities = new Stack<>(); // Stack of indices where equalities are
         // found.
         String lastEquality = null; // Always equal to
         // equalities.lastElement().getText()
@@ -130,7 +130,7 @@ public static void cleanupEfficiency(final List<Difference> diffs) {
         }
 
         boolean changes = false;
-        Stack<Difference> equalities = new Stack<Difference>(); // Stack of indices where equalities are
+        Stack<Difference> equalities = new Stack<>(); // Stack of indices where equalities are
         // found.
         String lastEquality = null; // Always equal to
         // equalities.lastElement().getText();

src/main/java/org/crosswire/common/diff/DifferenceEngine.java

@@ -69,16 +69,16 @@ public DifferenceEngine(final String source, final String target) {
     public List<Difference> generate() {
         long msEnd = System.currentTimeMillis() + (long) (timeout * 1000);
         int maxD = (this.sourceLength + this.targetLength) / 2;
-        List<Set<String>> vMap1 = new ArrayList<Set<String>>();
-        List<Set<String>> vMap2 = new ArrayList<Set<String>>();
-        Map<Integer, Integer> v1 = new HashMap<Integer, Integer>();
-        Map<Integer, Integer> v2 = new HashMap<Integer, Integer>();
+        List<Set<String>> vMap1 = new ArrayList<>();
+        List<Set<String>> vMap2 = new ArrayList<>();
+        Map<Integer, Integer> v1 = new HashMap<>();
+        Map<Integer, Integer> v2 = new HashMap<>();
         v1.put(Integer.valueOf(1), Integer.valueOf(0));
         v2.put(Integer.valueOf(1), Integer.valueOf(0));
         int x;
         int y;
         String footstep; // Used to track overlapping paths.
-        Map<String, Integer> footsteps = new HashMap<String, Integer>();
+        Map<String, Integer> footsteps = new HashMap<>();
         boolean done = false;
         // If the total number of characters is odd, then the front path will
         // collide with the reverse path.
@@ -90,7 +90,7 @@ public List<Difference> generate() {
             }
 
             // Walk the front path one step.
-            vMap1.add(new HashSet<String>()); // Adds at index 'd'.
+            vMap1.add(new HashSet<>()); // Adds at index 'd'.
             for (int k = -d; k <= d; k += 2) {
                 Integer kPlus1Key = Integer.valueOf(k + 1);
                 Integer kPlus1Value = v1.get(kPlus1Key);
@@ -134,7 +134,7 @@ public List<Difference> generate() {
             }
 
             // Walk the reverse path one step.
-            vMap2.add(new HashSet<String>()); // Adds at index 'd'.
+            vMap2.add(new HashSet<>()); // Adds at index 'd'.
             for (int k = -d; k <= d; k += 2) {
                 Integer kPlus1Key = Integer.valueOf(k + 1);
                 Integer kPlus1Value = v2.get(kPlus1Key);
@@ -195,7 +195,7 @@ public List<Difference> generate() {
      * @return List of Difference objects
      */
     protected List<Difference> path1(final List<Set<String>> vMap, final String newSource, final String newTarget) {
-        List<Difference> path = new ArrayList<Difference>();
+        List<Difference> path = new ArrayList<>();
         int x = newSource.length();
         int y = newTarget.length();
         EditType lastEditType = null;
@@ -251,7 +251,7 @@ protected List<Difference> path1(final List<Set<String>> vMap, final String newS
      * @return List of Difference objects
      */
     protected List<Difference> path2(final List<Set<String>> vMap, final String newSource, final String newTarget) {
-        List<Difference> path = new ArrayList<Difference>();
+        List<Difference> path = new ArrayList<>();
 
         //cached versions of length from immutable strings
         final int cachedNewSourceLength = newSource.length();