X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=4f331ab21ac5a04eec84a170d72a6dbaeb292be7;hb=341e759bcdf94d50e58217f55a87f25a44eeef54;hp=c71b1548354afb9a626ba18d0444181ade16288a;hpb=452e24303ecf7861ff827c19fcd0fdaa1d288ea1;p=jalview.git
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index c71b154..4f331ab 100644
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1,38 +1,58 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
-
package jalview.gui;
-import java.util.*;
-import java.util.List;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
-import jalview.commands.*;
-import jalview.datamodel.*;
+import jalview.commands.EditCommand;
+import jalview.commands.EditCommand.Action;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
import jalview.io.SequenceAnnotationReport;
-import jalview.schemes.*;
-import jalview.structure.*;
+import jalview.schemes.ResidueProperties;
+import jalview.structure.SelectionListener;
+import jalview.structure.SelectionSource;
+import jalview.structure.SequenceListener;
+import jalview.structure.StructureSelectionManager;
import jalview.util.MessageManager;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.ToolTipManager;
+
/**
* DOCUMENT ME!
*
@@ -231,8 +251,9 @@ public class SeqPanel extends JPanel implements MouseListener,
{
for (int i = 0; i < features.length; i++)
{
- if (av.featuresDisplayed == null
- || !av.featuresDisplayed.containsKey(features[i].getType()))
+ if (av.getFeaturesDisplayed() == null
+ || !av.getFeaturesDisplayed().containsKey(
+ features[i].getType()))
{
continue;
}
@@ -243,7 +264,9 @@ public class SeqPanel extends JPanel implements MouseListener,
.containsKey(features[i].featureGroup)
&& !((Boolean) seqCanvas.fr.featureGroups
.get(features[i].featureGroup)).booleanValue())
+ {
continue;
+ }
if ((features[i].getBegin() <= res)
&& (features[i].getEnd() >= res))
@@ -518,29 +541,34 @@ public class SeqPanel extends JPanel implements MouseListener,
int getKeyboardNo1()
{
- try {
- if (keyboardNo1 != null)
+ try
{
- int value = Integer.parseInt(keyboardNo1.toString());
- keyboardNo1 = null;
- return value;
- }
+ if (keyboardNo1 != null)
+ {
+ int value = Integer.parseInt(keyboardNo1.toString());
+ keyboardNo1 = null;
+ return value;
+ }
} catch (Exception x)
- {}
+ {
+ }
keyboardNo1 = null;
return 1;
}
int getKeyboardNo2()
{
- try {
- if (keyboardNo2!=null){
- int value = Integer.parseInt(keyboardNo2.toString());
- keyboardNo2 = null;
- return value;
- }
+ try
+ {
+ if (keyboardNo2 != null)
+ {
+ int value = Integer.parseInt(keyboardNo2.toString());
+ keyboardNo2 = null;
+ return value;
+ }
} catch (Exception x)
- {}
+ {
+ }
keyboardNo2 = null;
return 1;
}
@@ -688,7 +716,9 @@ public class SeqPanel extends JPanel implements MouseListener,
pos = setStatusMessage(sequence, res, seq);
if (ssm != null && pos > -1)
+ {
mouseOverSequence(sequence, res, pos);
+ }
tooltipText.setLength(6); // Cuts the buffer back to
@@ -739,7 +769,8 @@ public class SeqPanel extends JPanel implements MouseListener,
if (lastTooltip == null
|| !lastTooltip.equals(tooltipText.toString()))
{
- setToolTipText(tooltipText.toString());
+ setToolTipText(JvSwingUtils.wrapTooltip(true,
+ tooltipText.toString()));
lastTooltip = tooltipText.toString();
}
@@ -942,7 +973,7 @@ public class SeqPanel extends JPanel implements MouseListener,
message.append("Edit group:");
if (editCommand == null)
{
- editCommand = new EditCommand("Edit Group");
+ editCommand = new EditCommand(MessageManager.getString("action.edit_group"));
}
}
else
@@ -955,7 +986,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
if (editCommand == null)
{
- editCommand = new EditCommand("Edit " + label);
+ editCommand = new EditCommand(MessageManager.formatMessage("label.edit_params", new String[]{label}));
}
}
@@ -1161,7 +1192,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
else
{
- editCommand.appendEdit(EditCommand.INSERT_GAP, groupSeqs,
+ editCommand.appendEdit(Action.INSERT_GAP, groupSeqs,
startres, startres - lastres, av.getAlignment(), true);
}
}
@@ -1177,7 +1208,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
else
{
- editCommand.appendEdit(EditCommand.DELETE_GAP, groupSeqs,
+ editCommand.appendEdit(Action.DELETE_GAP, groupSeqs,
startres, lastres - startres, av.getAlignment(), true);
}
@@ -1199,7 +1230,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
else
{
- editCommand.appendEdit(EditCommand.INSERT_GAP, new SequenceI[]
+ editCommand.appendEdit(Action.INSERT_GAP, new SequenceI[]
{ seq }, lastres, startres - lastres, av.getAlignment(), true);
}
}
@@ -1236,7 +1267,7 @@ public class SeqPanel extends JPanel implements MouseListener,
if (max > 0)
{
- editCommand.appendEdit(EditCommand.DELETE_GAP,
+ editCommand.appendEdit(Action.DELETE_GAP,
new SequenceI[]
{ seq }, startres, max, av.getAlignment(), true);
}
@@ -1254,7 +1285,7 @@ public class SeqPanel extends JPanel implements MouseListener,
}
else
{
- editCommand.appendEdit(EditCommand.INSERT_NUC, new SequenceI[]
+ editCommand.appendEdit(Action.INSERT_NUC, new SequenceI[]
{ seq }, lastres, startres - lastres, av.getAlignment(), true);
}
}
@@ -1290,10 +1321,10 @@ public class SeqPanel extends JPanel implements MouseListener,
}
}
- editCommand.appendEdit(EditCommand.DELETE_GAP, seq, blankColumn, 1,
+ editCommand.appendEdit(Action.DELETE_GAP, seq, blankColumn, 1,
av.getAlignment(), true);
- editCommand.appendEdit(EditCommand.INSERT_GAP, seq, j, 1,
+ editCommand.appendEdit(Action.INSERT_GAP, seq, j, 1,
av.getAlignment(), true);
}
@@ -1301,10 +1332,10 @@ public class SeqPanel extends JPanel implements MouseListener,
void deleteChar(int j, SequenceI[] seq, int fixedColumn)
{
- editCommand.appendEdit(EditCommand.DELETE_GAP, seq, j, 1,
+ editCommand.appendEdit(Action.DELETE_GAP, seq, j, 1,
av.getAlignment(), true);
- editCommand.appendEdit(EditCommand.INSERT_GAP, seq, fixedColumn, 1,
+ editCommand.appendEdit(Action.INSERT_GAP, seq, fixedColumn, 1,
av.getAlignment(), true);
}
@@ -1430,9 +1461,10 @@ public class SeqPanel extends JPanel implements MouseListener,
if (av.wrapAlignment && seq > av.getAlignment().getHeight())
{
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- MessageManager.getString("label.cannot_edit_annotations_in_wrapped_view"),
- MessageManager.getString("label.wrapped_view_no_edit"), JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager
+ .getString("label.cannot_edit_annotations_in_wrapped_view"),
+ MessageManager.getString("label.wrapped_view_no_edit"),
+ JOptionPane.WARNING_MESSAGE);
return;
}