JAL-845 minor tidy / tests / javadoc tweaks

[jalview.git] / src / jalview / ws / jws2 / JPred301Client.java

diff --git a/src/jalview/ws/jws2/JPred301Client.java b/src/jalview/ws/jws2/JPred301Client.java
index 8328d45..41d8a7f 100644 (file)
--- a/src/jalview/ws/jws2/JPred301Client.java
+++ b/src/jalview/ws/jws2/JPred301Client.java
@@ -35,6 +35,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import compbio.data.sequence.FastaSequence;
 import compbio.data.sequence.JpredAlignment;
@@ -90,15 +92,18 @@ public class JPred301Client extends JabawsMsaInterfaceAlignCalcWorker
     return "calculating consensus secondary structure prediction using JPred service";
   }
 
-  private static HashMap<String, String[]> jpredRowLabels = new HashMap<String, String[]>();
+  private static Map<String, String[]> jpredRowLabels = new HashMap<String, String[]>();
 
-  private static HashSet<String> jpredRes_graph, jpredRes_ssonly;
+  private static final Set<String> jpredRes_graph;
+
+  private static final Set<String> jpredRes_ssonly;
+  static
   {
-    jpredRes_ssonly = new HashSet();
+    jpredRes_ssonly = new HashSet<String>();
     jpredRes_ssonly.add("jnetpred".toLowerCase());
     jpredRes_ssonly.add("jnetpssm".toLowerCase());
     jpredRes_ssonly.add("jnethmm".toLowerCase());
-    jpredRes_graph = new HashSet();
+    jpredRes_graph = new HashSet<String>();
     jpredRes_graph.add("jnetconf".toLowerCase());
     jpredRes_graph.add("jnet burial".toLowerCase());
   }