git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update author list in license for (JAL-826)
[jalview.git] / src / jalview / gui / SeqPanel.java
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 6a03b53..1903294 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -819,17 +819,20 @@ public class SeqPanel extends JPanel implements MouseListener,
                             .getType()))
             {
               tmpString = features[i].getDescription();
-              int startTag = tmpString.toUpperCase().indexOf("<HTML>");
+              String tmp2up=tmpString.toUpperCase();
+              int startTag = tmp2up.indexOf("<HTML>");
               if (startTag > -1)
               {
                 tmpString = tmpString.substring(startTag + 6);
+                tmp2up = tmp2up.substring(startTag+6);
               }
-              int endTag = tmpString.toUpperCase().indexOf("</BODY>");
+              int endTag = tmp2up.indexOf("</BODY>");
               if (endTag > -1)
               {
                 tmpString = tmpString.substring(0, endTag);
+                tmp2up = tmp2up.substring(0, endTag);
               }
-              endTag = tmpString.toUpperCase().indexOf("</HTML>");
+              endTag = tmp2up.indexOf("</HTML>");
               if (endTag > -1)
               {
                 tmpString = tmpString.substring(0, endTag);
@@ -1303,7 +1306,7 @@ public class SeqPanel extends JPanel implements MouseListener,
     else
     // ///Editing a single sequence///////////
     {
-      if (insertGap && !editSeq)
+      if (insertGap)
       {
         // dragging to the right
         if (fixedColumns && fixedRight != -1)
@@ -1312,17 +1315,13 @@ public class SeqPanel extends JPanel implements MouseListener,
           {
             insertChar(j, new SequenceI[]
             { seq }, fixedRight);
-               System.out.println("InsertGap1");
-
           }
         }
         else
         {
           editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[]
           { seq }, lastres, startres - lastres, av.alignment, true);
-          System.out.println("InsertGap2 - lastres: "+lastres+" startres: "+startres);
-
-        }
+         }
       }
       else
       {
@@ -1368,14 +1367,11 @@ public class SeqPanel extends JPanel implements MouseListener,
                 insertChar(j, new SequenceI[]
                 { seq }, fixedRight);
               }
-               System.out.println("EditSeq1");
-
-            }
+              }
             else
             {
               editCommand.appendEdit(EditCommand.INSERT_NUC, new SequenceI[]
               { seq }, lastres, startres - lastres, av.alignment, true);
-               System.out.println("EditSeq2");
              }
        }
       }