JAL-722 updated from 2.11.2 develop branch - needs further work before release

[jalview.git] / src / jalview / datamodel / Alignment.java

diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index c4098e2..310847b 100755 (executable)
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -32,8 +32,8 @@ import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -67,7 +67,7 @@ public class Alignment implements AlignmentI, AutoCloseable
 
   HiddenColumns hiddenCols;
 
-  public Hashtable alignmentProperties;
+  public Map<Object, Object> alignmentProperties;
 
   private List<AlignedCodonFrame> codonFrameList;
 
@@ -1371,7 +1371,7 @@ public class Alignment implements AlignmentI, AutoCloseable
   {
     if (alignmentProperties == null)
     {
-      alignmentProperties = new Hashtable();
+      alignmentProperties = new HashMap<>();
     }
 
     alignmentProperties.put(key, value);
@@ -1391,7 +1391,7 @@ public class Alignment implements AlignmentI, AutoCloseable
   }
 
   @Override
-  public Hashtable getProperties()
+  public Map<Object, Object> getProperties()
   {
     return alignmentProperties;
   }
@@ -1559,10 +1559,10 @@ public class Alignment implements AlignmentI, AutoCloseable
     {
       // we really can't do very much here - just try to concatenate strings
       // where property collisions occur.
-      Enumeration key = toappend.getProperties().keys();
-      while (key.hasMoreElements())
+      Iterator<Object> key = toappend.getProperties().keySet().iterator();
+      while (key.hasNext())
       {
-        Object k = key.nextElement();
+        Object k = key.next();
         Object ourval = this.getProperty(k);
         Object toapprop = toappend.getProperty(k);
         if (ourval != null)