X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2FJPred301Client.java;h=db70fa01cf0c8662690146066c435180b75bfabc;hb=27f5f6fdfea52770ebd513c4607a6dde87821d48;hp=8328d458ceb85e1d4b6d6e26289c26476fade864;hpb=2ada5fb71ea7f372826f2f91cb4bfe33b4a4c660;p=jalview.git

diff --git a/src/jalview/ws/jws2/JPred301Client.java b/src/jalview/ws/jws2/JPred301Client.java
index 8328d45..db70fa0 100644
--- a/src/jalview/ws/jws2/JPred301Client.java
+++ b/src/jalview/ws/jws2/JPred301Client.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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());
   }