java 1.1 patches

diff --git a/src/jalview/datamodel/AlignmentView.java b/src/jalview/datamodel/AlignmentView.java
index 325fc45..e0d8d44 100644 (file)
--- a/src/jalview/datamodel/AlignmentView.java
+++ b/src/jalview/datamodel/AlignmentView.java
@@ -134,7 +134,7 @@ public class AlignmentView
         // visible and selected region\r
         int ssel = selection.getStartRes(), esel = selection.getEndRes();\r
         Vector isg = new Vector();\r
-        Enumeration<?> en = grps.elements();\r
+        Enumeration en = grps.elements();\r
         while (en.hasMoreElements())\r
         {\r
           sg = (SequenceGroup) en.nextElement();\r
@@ -332,7 +332,7 @@ public class AlignmentView
        * prune any groups to the visible coordinates of the alignment.\r
        */\r
       {\r
-        int nvg = scGroups != null ? scGroups.size() : 0;\r
+        int nvg = (scGroups != null) ? scGroups.size() : 0;\r
         if (nvg > 0)\r
         {\r
           SequenceGroup[] nsg = new SequenceGroup[nvg];\r