/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*/
package jalview.gui;
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JColorChooser;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButtonMenuItem;
-
import jalview.analysis.AAFrequency;
import jalview.analysis.AlignmentAnnotationUtils;
import jalview.analysis.AlignmentUtils;
import jalview.util.MessageManager;
import jalview.util.UrlLink;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.Vector;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JColorChooser;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+
/**
* DOCUMENT ME!
*
JMenuItem sequenceDetails = new JMenuItem();
JMenuItem sequenceSelDetails = new JMenuItem();
-
+
JMenuItem makeReferenceSeq = new JMenuItem();
JMenuItem chooseAnnotations = new JMenuItem();
JMenu jMenu1 = new JMenu();
- JMenuItem proteinStructureMenu = new JMenuItem();
+ JMenuItem pdbStructureDialog = new JMenuItem();
JMenu rnaStructureMenu = new JMenu();
sequenceMenu.setText(sequence.getName());
if (seq == ap.av.getAlignment().getSeqrep())
{
- makeReferenceSeq.setText("Unmark representative");
- } else {
- makeReferenceSeq.setText("Mark as representative");
+ makeReferenceSeq.setText(MessageManager
+ .getString("action.unmark_as_reference"));
+ }
+ else
+ {
+ makeReferenceSeq.setText(MessageManager
+ .getString("action.set_as_reference"));
}
if (!ap.av.getAlignment().isNucleotide())
}
else
{
+ int origCount = rnaStructureMenu.getItemCount();
/*
* add menu items to 2D-render any alignment or sequence secondary
* structure annotation
/*
* valid alignment RNA secondary structure annotation
*/
- final String structureLine = aa.label + " (alignment)";
menuItem = new JMenuItem();
menuItem.setText(MessageManager.formatMessage(
- "label.2d_rna_structure_line", new Object[]
- { structureLine }));
+ "label.2d_rna_structure_line",
+ new Object[] { aa.label }));
menuItem.addActionListener(new java.awt.event.ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- new AppVarna(structureLine, seq, aa, ap);
+ new AppVarna(seq, aa, ap);
}
});
rnaStructureMenu.add(menuItem);
}
}
-
if (seq.getAnnotation() != null)
{
AlignmentAnnotation seqAnns[] = seq.getAnnotation();
// TODO: make rnastrucF a bit more nice
menuItem = new JMenuItem();
menuItem.setText(MessageManager.formatMessage(
- "label.2d_rna_sequence_name", new Object[]
- { seq.getName() }));
+ "label.2d_rna_sequence_name",
+ new Object[] { seq.getName() }));
menuItem.addActionListener(new java.awt.event.ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
// TODO: VARNA does'nt print gaps in the sequence
-
- new AppVarna(seq.getName() + " structure", seq, aa,
- ap);
+ new AppVarna(seq, aa, ap);
}
});
rnaStructureMenu.add(menuItem);
}
}
}
+ if (rnaStructureMenu.getItemCount() == origCount)
+ {
+ remove(rnaStructureMenu);
+ }
}
menuItem = new JMenuItem(
&& ap.av.getSelectionGroup().getSize() > 1)
{
menuItem = new JMenuItem(MessageManager.formatMessage(
- "label.represent_group_with", new Object[]
- { seq.getName() }));
+ "label.represent_group_with",
+ new Object[] { seq.getName() }));
menuItem.addActionListener(new java.awt.event.ActionListener()
{
@Override
if (sg != null && sg.getSize() > 0)
{
groupName.setText(MessageManager.formatMessage("label.name_param",
- new Object[]
- { sg.getName() }));
+ new Object[] { sg.getName() }));
groupName.setText(MessageManager
.getString("label.edit_name_and_description_current_group"));
SequenceI sqass = null;
for (SequenceI sq : ap.av.getSequenceSelection())
{
- Vector<PDBEntry> pes = sq.getDatasetSequence().getPDBId();
+ Vector<PDBEntry> pes = sq.getDatasetSequence().getAllPDBEntries();
if (pes != null && pes.size() > 0)
{
reppdb.put(pes.get(0).getId(), pes.get(0));
if (seq == null)
{
sequenceMenu.setVisible(false);
- proteinStructureMenu.setVisible(false);
+ pdbStructureDialog.setVisible(false);
rnaStructureMenu.setVisible(false);
}
// collect matching db-refs
DBRefEntry[] dbr = jalview.util.DBRefUtils.selectRefs(
- seq.getDBRef(), new String[]
- { urlLink.getTarget() });
+ seq.getDBRef(), new String[] { urlLink.getTarget() });
// collect id string too
String id = seq.getName();
String descr = seq.getDescription();
*/
Map<String, List<List<String>>> shownTypes = new LinkedHashMap<String, List<List<String>>>();
Map<String, List<List<String>>> hiddenTypes = new LinkedHashMap<String, List<List<String>>>();
- AlignmentAnnotationUtils.getShownHiddenTypes(shownTypes,
- hiddenTypes,
- AlignmentAnnotationUtils.asList(annotations),
- forSequences);
+ AlignmentAnnotationUtils.getShownHiddenTypes(shownTypes, hiddenTypes,
+ AlignmentAnnotationUtils.asList(annotations), forSequences);
for (String calcId : hiddenTypes.keySet())
{
for (List<String> type : hiddenTypes.get(calcId))
{
- addAnnotationTypeToShowHide(showMenu, forSequences,
- calcId, type, false, true);
+ addAnnotationTypeToShowHide(showMenu, forSequences, calcId, type,
+ false, true);
}
}
// grey out 'show annotations' if none are hidden
{
for (List<String> type : shownTypes.get(calcId))
{
- addAnnotationTypeToShowHide(hideMenu, forSequences,
- calcId, type, false, false);
+ addAnnotationTypeToShowHide(hideMenu, forSequences, calcId, type,
+ false, false);
}
}
// grey out 'hide annotations' if none are shown
@Override
public void actionPerformed(ActionEvent e)
{
- AlignmentUtils.showOrHideSequenceAnnotations(ap.getAlignment(), types,
- forSequences, allTypes, actionIsShow);
+ AlignmentUtils.showOrHideSequenceAnnotations(ap.getAlignment(),
+ types, forSequences, allTypes, actionIsShow);
refresh();
}
});
// ID/regex match URLs
groupLinksMenu = new JMenu(
MessageManager.getString("action.group_link"));
- JMenu[] linkMenus = new JMenu[]
- { null, new JMenu(MessageManager.getString("action.ids")),
+ JMenu[] linkMenus = new JMenu[] { null,
+ new JMenu(MessageManager.getString("action.ids")),
new JMenu(MessageManager.getString("action.sequences")),
new JMenu(MessageManager.getString("action.ids_sequences")) }; // three
// types
if (sarray == null)
{
sarray = new Object[2];
- sarray[0] = new int[]
- { 0 };
+ sarray[0] = new int[] { 0 };
sarray[1] = new String[seqs.length];
commonDbrefs.put(src, sarray);
{
JMenuItem item = new JMenuItem(label);
item.setToolTipText(MessageManager.formatMessage(
- "label.open_url_param", new Object[]
- { url }));
+ "label.open_url_param", new Object[] { url }));
item.addActionListener(new java.awt.event.ActionListener()
{
@Override
JMenuItem item = new JMenuItem(label);
item.setToolTipText(MessageManager.formatMessage(
"label.open_url_seqs_param",
- new Object[]
- { urlgenerator.getUrl_prefix(),
+ new Object[] { urlgenerator.getUrl_prefix(),
urlgenerator.getNumberInvolved(urlstub) }));
// TODO: put in info about what is being sent.
item.addActionListener(new java.awt.event.ActionListener()
}
});
chooseAnnotations.setText(MessageManager
- .getString("label.choose_annotations") + "...");
+ .getString("action.choose_annotations"));
chooseAnnotations.addActionListener(new java.awt.event.ActionListener()
{
@Override
}
});
sequenceDetails.setText(MessageManager
- .getString("label.sequence_details") + "...");
+ .getString("label.sequence_details"));
sequenceDetails.addActionListener(new java.awt.event.ActionListener()
{
@Override
}
});
sequenceSelDetails.setText(MessageManager
- .getString("label.sequence_details") + "...");
+ .getString("label.sequence_details"));
sequenceSelDetails
.addActionListener(new java.awt.event.ActionListener()
{
}
});
jMenu1.setText(MessageManager.getString("label.group"));
- proteinStructureMenu.setText(MessageManager
- .getString("label.view_protein_structure"));
- proteinStructureMenu.addActionListener(new ActionListener()
+ pdbStructureDialog.setText(MessageManager
+ .getString("label.show_pdbstruct_dialog"));
+ pdbStructureDialog.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- SequenceI[] selectedSeqs = new SequenceI[]
- { sequence };
+ SequenceI[] selectedSeqs = new SequenceI[] { sequence };
if (ap.av.getSelectionGroup() != null)
{
selectedSeqs = ap.av.getSequenceSelection();
.getString("label.mark_as_representative"));
makeReferenceSeq.addActionListener(new ActionListener()
{
-
+
@Override
public void actionPerformed(ActionEvent actionEvent)
{
makeReferenceSeq_actionPerformed(actionEvent);
-
+
}
});
- hideInsertions.setText(MessageManager.getString("label.hide_insertions"));
+ hideInsertions.setText(MessageManager
+ .getString("label.hide_insertions"));
hideInsertions.addActionListener(new ActionListener()
{
add(groupMenu);
add(sequenceMenu);
add(rnaStructureMenu);
- add(proteinStructureMenu);
- if (sequence!=null)
+ add(pdbStructureDialog);
+ if (sequence != null)
{
add(hideInsertions);
}
* @param menuItem
* @param forSequences
*/
- protected void configureReferenceAnnotationsMenu(
- JMenuItem menuItem, List<SequenceI> forSequences)
+ protected void configureReferenceAnnotationsMenu(JMenuItem menuItem,
+ List<SequenceI> forSequences)
{
menuItem.setEnabled(false);
}
refresh();
}
+
protected void sequenceSelectionDetails_actionPerformed()
{
createSequenceDetailsReport(ap.av.getSequenceSelection());
protected void sequenceDetails_actionPerformed()
{
- createSequenceDetailsReport(new SequenceI[]
- { sequence });
+ createSequenceDetailsReport(new SequenceI[] { sequence });
}
public void createSequenceDetailsReport(SequenceI[] sequences)
+ MessageManager
.formatMessage(
"label.create_sequence_details_report_annotation_for",
- new Object[]
- { seq.getDisplayId(true) }) + "</h2></p><p>");
+ new Object[] { seq.getDisplayId(true) })
+ + "</h2></p><p>");
new SequenceAnnotationReport(null)
.createSequenceAnnotationReport(
contents,
true,
false,
(ap.getSeqPanel().seqCanvas.fr != null) ? ap
- .getSeqPanel().seqCanvas.fr
- .getMinMax()
+ .getSeqPanel().seqCanvas.fr.getMinMax()
: null);
contents.append("</p>");
}
Desktop.addInternalFrame(cap, MessageManager.formatMessage(
"label.sequence_details_for",
- (sequences.length == 1 ? new Object[]
- { sequences[0].getDisplayId(true) } : new Object[]
- { MessageManager.getString("label.selection") })), 500, 400);
+ (sequences.length == 1 ? new Object[] { sequences[0]
+ .getDisplayId(true) } : new Object[] { MessageManager
+ .getString("label.selection") })), 500, 400);
}
SequenceGroup sg = ap.av.getSelectionGroup();
if (sg == null || sg.getSize() < 1)
{
- ap.av.hideSequence(new SequenceI[]
- { sequence });
+ ap.av.hideSequence(new SequenceI[] { sequence });
return;
}
if (sg != null)
{
List<int[]> startEnd = ap.av.getVisibleRegionBoundaries(
- sg.getStartRes(),
- sg.getEndRes() + 1);
+ sg.getStartRes(), sg.getEndRes() + 1);
String description;
int caseChange;
CutAndPasteTransfer cap = new CutAndPasteTransfer();
cap.setForInput(null);
Desktop.addInternalFrame(cap, MessageManager.formatMessage(
- "label.alignment_output_command", new Object[]
- { e.getActionCommand() }), 600, 500);
+ "label.alignment_output_command",
+ new Object[] { e.getActionCommand() }), 600, 500);
String[] omitHidden = null;
// or we simply trust the user wants
// wysiwig behaviour
- cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
- ap.av, true));
+ cap.setText(new FormatAdapter(ap).formatSequences(e.getActionCommand(),
+ ap, true));
}
public void pdbFromFile_actionPerformed()
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new jalview.io.JalviewFileView());
chooser.setDialogTitle(MessageManager.formatMessage(
- "label.select_pdb_file_for", new Object[]
- { sequence.getDisplayId(false) }));
+ "label.select_pdb_file_for",
+ new Object[] { sequence.getDisplayId(false) }));
chooser.setToolTipText(MessageManager.formatMessage(
- "label.load_pdb_file_associate_with_sequence", new Object[]
- { sequence.getDisplayId(false) }));
+ "label.load_pdb_file_associate_with_sequence",
+ new Object[] { sequence.getDisplayId(false) }));
int value = chooser.showOpenDialog(null);
}
-
public void enterPDB_actionPerformed()
{
String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
git://source.jalview.org / jalview.git / blobdiff