From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 7 Jul 2006 13:02:20 +0000 (+0000)
Subject: Make 1.1 compatible
X-Git-Tag: Release_2_1~308
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2bb1ec443f93d558beeca5174023e2b9833243fc;p=jalview.git

Make 1.1 compatible
---

diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java
index 0ee41b8..0734ccd 100755
--- a/src/jalview/io/JPredFile.java
+++ b/src/jalview/io/JPredFile.java
@@ -197,8 +197,8 @@ public class JPredFile extends AlignFile
 
                     for (int j = 0; j < i; j++)
                     {
-                        scores.set(j,
-                            (Object) ((Float) scores.get(j)).toString());
+                        scores.setElementAt(
+                            (Object) ((Float) scores.elementAt(j)).toString(), j);
                     }
 
                     scores.addElement((Object) ascore);
@@ -220,7 +220,7 @@ public class JPredFile extends AlignFile
 
                 for (int i = 0; i < numSymbols; i++)
                 {
-                    conf.set(i, (Object) symbols.nextToken());
+                    conf.setElementAt( symbols.nextToken(), i);
                 }
             }
             else
@@ -351,19 +351,19 @@ public class JPredFile extends AlignFile
     int i=0;
     int j=seqs.size();
     for (; i<QuerySeqPosition; i++)
-        annotSeqs.add(seqs.get(i));
+        annotSeqs.addElement(seqs.elementAt(i));
       // check that no stray annotations have been added at the end.
       {
-        SequenceI sq = (SequenceI) seqs.get(j-1);
+        SequenceI sq = (SequenceI) seqs.elementAt(j-1);
         if (sq.getName().toUpperCase().startsWith("JPRED")) {
-          annotSeqs.add(sq);
-          seqs.remove(--j);
+          annotSeqs.addElement(sq);
+          seqs.removeElementAt(--j);
         }
       }
     for (; i<j; i++)
-        newseqs.add(seqs.get(i));
+        newseqs.addElement(seqs.elementAt(i));
 
-    seqs.clear();
+    seqs.removeAllElements();
     seqs = newseqs;
   }
 }
diff --git a/src/jalview/io/JnetAnnotationMaker.java b/src/jalview/io/JnetAnnotationMaker.java
index 17b4d68..60c0a68 100755
--- a/src/jalview/io/JnetAnnotationMaker.java
+++ b/src/jalview/io/JnetAnnotationMaker.java
@@ -63,8 +63,8 @@ public class JnetAnnotationMaker
         {
           for (int j = 0; j < width; j++)
           {
-            float value = Float.parseFloat(preds[i].getCharAt(
-                j) + "");
+            float value = new Float(preds[i].getCharAt(
+                j) + "").floatValue();
             annotations[gapmap[j]] = new Annotation(preds[i].getCharAt(
                 j) + "", "", preds[i].getCharAt(j),
                 value);