pes = sq.getDatasetSequence().getPDBId();
+ if (pes != null && pes.size() > 0)
+ {
+ reppdb.put(pes.get(0).getId(), pes.get(0));
+ for (PDBEntry pe : pes)
+ {
+ pdbe.put(pe.getId(), pe);
+ if (sqass == null)
+ {
+ sqass = sq;
+ }
+ }
+ }
+ }
+ if (pdbe.size() > 0)
+ {
+ final PDBEntry[] pe = pdbe.values().toArray(
+ new PDBEntry[pdbe.size()]), pr = reppdb.values().toArray(
+ new PDBEntry[reppdb.size()]);
+ final JMenuItem gpdbview, rpdbview;
+ if (pdbe.size() == 1)
+ {
+ structureMenu.add(gpdbview = new JMenuItem(MessageManager
+ .formatMessage("label.view_structure_for", new String[]
+ { sqass.getDisplayId(false) })));
+ }
+ else
+ {
+ structureMenu.add(gpdbview = new JMenuItem(MessageManager
+ .formatMessage("label.view_all_structures", new String[]
+ { new Integer(pdbe.size()).toString() })));
+ }
+ gpdbview.setToolTipText(MessageManager
+ .getString("label.open_new_jmol_view_with_all_structures_associated_current_selection_superimpose_using_alignment"));
+ gpdbview.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ new StructureViewer(ap.getStructureSelectionManager())
+ .viewStructures(ap, pe, ap.av.collateForPDB(pe));
+ }
+ });
+ if (reppdb.size() > 1 && reppdb.size() < pdbe.size())
+ {
+ structureMenu.add(rpdbview = new JMenuItem(MessageManager
+ .formatMessage(
+ "label.view_all_representative_structures",
+ new String[]
+ { new Integer(reppdb.size()).toString() })));
+ rpdbview.setToolTipText(MessageManager
+ .getString("label.open_new_jmol_view_with_all_representative_structures_associated_current_selection_superimpose_using_alignment"));
+ rpdbview.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ new StructureViewer(ap.getStructureSelectionManager())
+ .viewStructures(ap, pr, ap.av.collateForPDB(pr));
+ }
+ });
+ }
+ }
}
else
{
@@ -409,9 +680,17 @@ public class PopupMenu extends JPopupMenu
editMenu.setVisible(false);
}
- if (!ap.av.alignment.getGroups().contains(sg))
+ if (!isDefinedGroup)
{
+ createGroupMenuItem.setVisible(true);
unGroupMenuItem.setVisible(false);
+ jMenu1.setText(MessageManager.getString("action.edit_new_group"));
+ }
+ else
+ {
+ createGroupMenuItem.setVisible(false);
+ unGroupMenuItem.setVisible(true);
+ jMenu1.setText(MessageManager.getString("action.edit_group"));
}
if (seq == null)
@@ -422,8 +701,8 @@ public class PopupMenu extends JPopupMenu
if (links != null && links.size() > 0)
{
-
- JMenu linkMenu = new JMenu("Link");
+
+ JMenu linkMenu = new JMenu(MessageManager.getString("action.link"));
Vector linkset = new Vector();
for (int i = 0; i < links.size(); i++)
{
@@ -445,17 +724,17 @@ public class PopupMenu extends JPopupMenu
continue;
}
final String label = urlLink.getLabel();
- if (urlLink.isDynamic())
+ if (seq != null && urlLink.isDynamic())
{
// collect matching db-refs
- DBRefEntry[] dbr = jalview.util.DBRefUtils.selectRefs(seq
- .getDBRef(), new String[]
- { urlLink.getTarget() });
+ DBRefEntry[] dbr = jalview.util.DBRefUtils.selectRefs(
+ seq.getDBRef(), new String[]
+ { urlLink.getTarget() });
// collect id string too
String id = seq.getName();
String descr = seq.getDescription();
- if (descr!=null && descr.length()<1)
+ if (descr != null && descr.length() < 1)
{
descr = null;
}
@@ -477,10 +756,11 @@ public class PopupMenu extends JPopupMenu
{
for (int u = 0; u < urls.length; u += 2)
{
- if (!linkset.contains(urls[u]+"|"+urls[u+1]))
+ if (!linkset.contains(urls[u] + "|" + urls[u + 1]))
{
- linkset.addElement(urls[u]+"|"+urls[u+1]);
- addshowLink(linkMenu, label + "|" + urls[u], urls[u + 1]);
+ linkset.addElement(urls[u] + "|" + urls[u + 1]);
+ addshowLink(linkMenu, label + "|" + urls[u],
+ urls[u + 1]);
}
}
}
@@ -494,16 +774,17 @@ public class PopupMenu extends JPopupMenu
{
for (int u = 0; u < urls.length; u += 2)
{
- if (!linkset.contains(urls[u]+"|"+urls[u+1]))
+ if (!linkset.contains(urls[u] + "|" + urls[u + 1]))
{
- linkset.addElement(urls[u]+"|"+urls[u+1]);
+ linkset.addElement(urls[u] + "|" + urls[u + 1]);
addshowLink(linkMenu, label, urls[u + 1]);
}
}
}
}
- // Create urls from description but only for URL links which are regex links
- if (descr != null && urlLink.getRegexReplace()!=null)
+ // Create urls from description but only for URL links which are regex
+ // links
+ if (descr != null && urlLink.getRegexReplace() != null)
{
// create link for this URL from description where regex matches
String[] urls = urlLink.makeUrls(descr, true);
@@ -511,9 +792,9 @@ public class PopupMenu extends JPopupMenu
{
for (int u = 0; u < urls.length; u += 2)
{
- if (!linkset.contains(urls[u]+"|"+urls[u+1]))
+ if (!linkset.contains(urls[u] + "|" + urls[u + 1]))
{
- linkset.addElement(urls[u]+"|"+urls[u+1]);
+ linkset.addElement(urls[u] + "|" + urls[u + 1]);
addshowLink(linkMenu, label, urls[u + 1]);
}
}
@@ -522,9 +803,9 @@ public class PopupMenu extends JPopupMenu
}
else
{
- if (!linkset.contains(label+"|"+urlLink.getUrl_prefix()))
+ if (!linkset.contains(label + "|" + urlLink.getUrl_prefix()))
{
- linkset.addElement(label+"|"+urlLink.getUrl_prefix());
+ linkset.addElement(label + "|" + urlLink.getUrl_prefix());
// Add a non-dynamic link
addshowLink(linkMenu, label, urlLink.getUrl_prefix());
}
@@ -540,119 +821,314 @@ public class PopupMenu extends JPopupMenu
}
}
}
-
+
+ /**
+ * Add annotation types to 'Show annotations' and/or 'Hide annotations' menus.
+ * "All" is added first, followed by a separator. Then add any annotation
+ * types associated with the current selection. Separate menus are built for
+ * the selected sequence group (if any), and the selected sequence.
+ *
+ * Some annotation rows are always rendered together - these can be identified
+ * by a common graphGroup property > -1. Only one of each group will be marked
+ * as visible (to avoid duplication of the display). For such groups we add a
+ * composite type name, e.g.
+ *
+ * IUPredWS (Long), IUPredWS (Short)
+ *
+ * @param seq
+ */
+ protected void buildAnnotationTypesMenus(JMenu showMenu, JMenu hideMenu,
+ List forSequences)
+ {
+ showMenu.removeAll();
+ hideMenu.removeAll();
+
+ final List all = Arrays.asList(ALL_ANNOTATIONS);
+ addAnnotationTypeToShowHide(showMenu, forSequences, "", all, true, true);
+ addAnnotationTypeToShowHide(hideMenu, forSequences, "", all, true,
+ false);
+ showMenu.addSeparator();
+ hideMenu.addSeparator();
+
+ final AlignmentAnnotation[] annotations = ap.getAlignment()
+ .getAlignmentAnnotation();
+
+ /*
+ * Find shown/hidden annotations types, distinguished by source (calcId),
+ * and grouped by graphGroup. Using LinkedHashMap means we will retrieve in
+ * the insertion order, which is the order of the annotations on the
+ * alignment.
+ */
+ Map>> shownTypes = new LinkedHashMap>>();
+ Map>> hiddenTypes = new LinkedHashMap>>();
+ AlignmentAnnotationUtils.getShownHiddenTypes(shownTypes,
+ hiddenTypes,
+ AlignmentAnnotationUtils.asList(annotations),
+ forSequences);
+
+ for (String calcId : hiddenTypes.keySet())
+ {
+ for (List type : hiddenTypes.get(calcId))
+ {
+ addAnnotationTypeToShowHide(showMenu, forSequences,
+ calcId, type, false, true);
+ }
+ }
+ // grey out 'show annotations' if none are hidden
+ showMenu.setEnabled(!hiddenTypes.isEmpty());
+
+ for (String calcId : shownTypes.keySet())
+ {
+ for (List type : shownTypes.get(calcId))
+ {
+ addAnnotationTypeToShowHide(hideMenu, forSequences,
+ calcId, type, false, false);
+ }
+ }
+ // grey out 'hide annotations' if none are shown
+ hideMenu.setEnabled(!shownTypes.isEmpty());
+ }
+
+ /**
+ * Returns a list of sequences - either the current selection group (if there
+ * is one), else the specified single sequence.
+ *
+ * @param seq
+ * @return
+ */
+ protected List getSequenceScope(SequenceI seq)
+ {
+ List forSequences = null;
+ final SequenceGroup selectionGroup = ap.av.getSelectionGroup();
+ if (selectionGroup != null && selectionGroup.getSize() > 0)
+ {
+ forSequences = selectionGroup.getSequences();
+ }
+ else
+ {
+ forSequences = seq == null ? Collections. emptyList()
+ : Arrays.asList(seq);
+ }
+ return forSequences;
+ }
+
+ /**
+ * Add one annotation type to the 'Show Annotations' or 'Hide Annotations'
+ * menus.
+ *
+ * @param showOrHideMenu
+ * the menu to add to
+ * @param forSequences
+ * the sequences whose annotations may be shown or hidden
+ * @param calcId
+ * @param types
+ * the label to add
+ * @param allTypes
+ * if true this is a special label meaning 'All'
+ * @param actionIsShow
+ * if true, the select menu item action is to show the annotation
+ * type, else hide
+ */
+ protected void addAnnotationTypeToShowHide(JMenu showOrHideMenu,
+ final List forSequences, String calcId,
+ final List types, final boolean allTypes,
+ final boolean actionIsShow)
+ {
+ String label = types.toString(); // [a, b, c]
+ label = label.substring(1, label.length() - 1);
+ final JMenuItem item = new JMenuItem(label);
+ item.setToolTipText(calcId);
+ item.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ showHideAnnotation_actionPerformed(types, forSequences, allTypes,
+ actionIsShow);
+ }
+ });
+ showOrHideMenu.add(item);
+ }
+
+ /**
+ * Action on selecting a list of annotation type (or the 'all types' values)
+ * to show or hide for the specified sequences.
+ *
+ * @param types
+ * @param forSequences
+ * @param anyType
+ * @param doShow
+ */
+ protected void showHideAnnotation_actionPerformed(
+ Collection types, List forSequences,
+ boolean anyType, boolean doShow)
+ {
+ for (AlignmentAnnotation aa : ap.getAlignment()
+ .getAlignmentAnnotation())
+ {
+ if (anyType || types.contains(aa.label))
+ {
+ if ((aa.sequenceRef != null)
+ && forSequences.contains(aa.sequenceRef))
+ {
+ aa.visible = doShow;
+ }
+ }
+ }
+ refresh();
+ }
+
private void buildGroupURLMenu(SequenceGroup sg, Vector groupLinks)
{
-
- // TODO: usability: thread off the generation of group url content so root menu appears asap
+
+ // TODO: usability: thread off the generation of group url content so root
+ // menu appears asap
// sequence only URLs
// ID/regex match URLs
- groupLinksMenu = new JMenu("Group Link");
- JMenu[] linkMenus = new JMenu[] { null, new JMenu("IDS"), new JMenu("Sequences"), new JMenu("IDS and Sequences")}; // three types of url that might be created.
- SequenceI[] seqs = ap.av.getSelectionAsNewSequence();
+ groupLinksMenu = new JMenu(
+ MessageManager.getString("action.group_link"));
+ 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
+ // of url
+ // that
+ // might
+ // be
+ // created.
+ SequenceI[] seqs = ap.av.getSelectionAsNewSequence();
String[][] idandseqs = GroupUrlLink.formStrings(seqs);
Hashtable commonDbrefs = new Hashtable();
- for (int sq = 0; sq0)
+ if (dbr != null && dbr.length > 0)
{
- for (int d=0;d0)
+ if (linkMenus[m] != null
+ && linkMenus[m].getMenuComponentCount() > 0)
{
groupLinksMenu.add(linkMenus[m]);
}
}
-
+
groupMenu.add(groupLinksMenu);
}
}
@@ -661,22 +1137,26 @@ public class PopupMenu extends JPopupMenu
* add a show URL menu item to the given linkMenu
*
* @param linkMenu
- * @param label -
- * menu label string
- * @param url -
- * url to open
+ * @param label
+ * - menu label string
+ * @param url
+ * - url to open
*/
private void addshowLink(JMenu linkMenu, String label, final String url)
{
JMenuItem item = new JMenuItem(label);
- item.setToolTipText("open URL: " + url);
+ item.setToolTipText(MessageManager.formatMessage(
+ "label.open_url_param", new String[]
+ { url }));
item.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
new Thread(new Runnable()
{
+ @Override
public void run()
{
showLink(url);
@@ -690,205 +1170,373 @@ public class PopupMenu extends JPopupMenu
}
/**
+ * add a late bound groupURL item to the given linkMenu
+ *
+ * @param linkMenu
+ * @param label
+ * - menu label string
+ * @param urlgenerator
+ * GroupURLLink used to generate URL
+ * @param urlstub
+ * Object array returned from the makeUrlStubs function.
+ */
+ private void addshowLink(JMenu linkMenu, String label,
+ final GroupUrlLink urlgenerator, final Object[] urlstub)
+ {
+ JMenuItem item = new JMenuItem(label);
+ item.setToolTipText(MessageManager.formatMessage(
+ "label.open_url_seqs_param",
+ new Object[]
+ { urlgenerator.getUrl_prefix(),
+ urlgenerator.getNumberInvolved(urlstub) }));
+ // TODO: put in info about what is being sent.
+ item.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ new Thread(new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ showLink(urlgenerator.constructFrom(urlstub));
+ } catch (UrlStringTooLongException e)
+ {
+ }
+ }
+
+ }).start();
+ }
+ });
+
+ linkMenu.add(item);
+ }
+
+ /**
* DOCUMENT ME!
*
* @throws Exception
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
private void jbInit() throws Exception
{
- groupMenu.setText("Group");
- groupMenu.setText("Selection");
- groupName.setText("Name");
+ groupMenu.setText(MessageManager.getString("label.group"));
+ groupMenu.setText(MessageManager.getString("label.selection"));
+ groupName.setText(MessageManager.getString("label.name"));
groupName.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
groupName_actionPerformed();
}
});
- sequenceMenu.setText("Sequence");
- sequenceName.setText("Edit Name/Description");
+ sequenceMenu.setText(MessageManager.getString("label.sequence"));
+ sequenceName.setText(MessageManager
+ .getString("label.edit_name_description"));
sequenceName.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
sequenceName_actionPerformed();
}
});
+ chooseAnnotations.setText(MessageManager
+ .getString("label.choose_annotations") + "...");
+ chooseAnnotations.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ chooseAnnotations_actionPerformed(e);
+ }
+ });
+ sequenceDetails.setText(MessageManager
+ .getString("label.sequence_details") + "...");
+ sequenceDetails.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ sequenceDetails_actionPerformed();
+ }
+ });
+ sequenceSelDetails.setText(MessageManager
+ .getString("label.sequence_details") + "...");
+ sequenceSelDetails
+ .addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ sequenceSelectionDetails_actionPerformed();
+ }
+ });
PIDColour.setFocusPainted(false);
- unGroupMenuItem.setText("Remove Group");
+ unGroupMenuItem
+ .setText(MessageManager.getString("action.remove_group"));
unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
unGroupMenuItem_actionPerformed();
}
});
+ createGroupMenuItem.setText(MessageManager
+ .getString("action.create_group"));
+ createGroupMenuItem
+ .addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ createGroupMenuItem_actionPerformed();
+ }
+ });
- outline.setText("Border colour");
+ outline.setText(MessageManager.getString("action.border_colour"));
outline.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
outline_actionPerformed();
}
});
- nucleotideMenuItem.setText("Nucleotide");
+ nucleotideMenuItem
+ .setText(MessageManager.getString("label.nucleotide"));
nucleotideMenuItem.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
nucleotideMenuItem_actionPerformed();
}
});
- colourMenu.setText("Group Colour");
- showBoxes.setText("Boxes");
+ colourMenu.setText(MessageManager.getString("label.group_colour"));
+ showBoxes.setText(MessageManager.getString("action.boxes"));
showBoxes.setState(true);
showBoxes.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
showBoxes_actionPerformed();
}
});
- showText.setText("Text");
+ showText.setText(MessageManager.getString("action.text"));
showText.setState(true);
showText.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
showText_actionPerformed();
}
});
- showColourText.setText("Colour Text");
+ showColourText.setText(MessageManager.getString("label.colour_text"));
showColourText.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
showColourText_actionPerformed();
}
});
- displayNonconserved.setText("Show Nonconserved");
+ displayNonconserved.setText(MessageManager
+ .getString("label.show_non_conversed"));
displayNonconserved.setState(true);
displayNonconserved.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
showNonconserved_actionPerformed();
}
});
- editMenu.setText("Edit");
- cut.setText("Cut");
+ editMenu.setText(MessageManager.getString("action.edit"));
+ cut.setText(MessageManager.getString("action.cut"));
cut.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
cut_actionPerformed();
}
});
- upperCase.setText("To Upper Case");
+ upperCase.setText(MessageManager.getString("label.to_upper_case"));
upperCase.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
changeCase(e);
}
});
- copy.setText("Copy");
+ copy.setText(MessageManager.getString("action.copy"));
copy.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
copy_actionPerformed();
}
});
- lowerCase.setText("To Lower Case");
+ lowerCase.setText(MessageManager.getString("label.to_lower_case"));
lowerCase.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
changeCase(e);
}
});
- toggle.setText("Toggle Case");
+ toggle.setText(MessageManager.getString("label.toggle_case"));
toggle.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
changeCase(e);
}
});
- pdbMenu.setText("Associate Structure with Sequence");
- pdbFromFile.setText("From File");
+ pdbMenu.setText(MessageManager
+ .getString("label.associate_structure_with_sequence"));
+ pdbFromFile.setText(MessageManager.getString("label.from_file"));
pdbFromFile.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
pdbFromFile_actionPerformed();
}
});
- enterPDB.setText("Enter PDB Id");
+ // RNAFold.setText("From RNA Fold with predict2D");
+ // RNAFold.addActionListener(new ActionListener()
+ // {
+ // public void actionPerformed(ActionEvent e)
+ // {
+ // try {
+ // RNAFold_actionPerformed();
+ // } catch (Exception e1) {
+ // // TODO Auto-generated catch block
+ // e1.printStackTrace();
+ // }
+ // }
+ // });
+ // ContraFold.setText("From Contra Fold with predict2D");
+ // ContraFold.addActionListener(new ActionListener()
+ // {
+ // public void actionPerformed(ActionEvent e)
+ // {
+ // try {
+ // ContraFold_actionPerformed();
+ // } catch (Exception e1) {
+ // // TODO Auto-generated catch block
+ // e1.printStackTrace();
+ // }
+ // }
+ // });
+ enterPDB.setText(MessageManager.getString("label.enter_pdb_id"));
enterPDB.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
enterPDB_actionPerformed();
}
});
- discoverPDB.setText("Discover PDB ids");
+ discoverPDB.setText(MessageManager.getString("label.discover_pdb_ids"));
discoverPDB.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
discoverPDB_actionPerformed();
}
});
- outputMenu.setText("Output to Textbox...");
- sequenceFeature.setText("Create Sequence Feature");
+ outputMenu.setText(MessageManager.getString("label.out_to_textbox")
+ + "...");
+ seqShowAnnotationsMenu.setText(MessageManager
+ .getString("label.show_annotations"));
+ seqHideAnnotationsMenu.setText(MessageManager
+ .getString("label.hide_annotations"));
+ groupShowAnnotationsMenu.setText(MessageManager
+ .getString("label.show_annotations"));
+ groupHideAnnotationsMenu.setText(MessageManager
+ .getString("label.hide_annotations"));
+ sequenceFeature.setText(MessageManager
+ .getString("label.create_sequence_feature"));
sequenceFeature.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
sequenceFeature_actionPerformed();
}
});
- textColour.setText("Text Colour");
+ textColour.setText(MessageManager.getString("label.text_colour"));
textColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
textColour_actionPerformed();
}
});
- jMenu1.setText("Group");
- structureMenu.setText("Structure");
- viewStructureMenu.setText("View Structure");
+ jMenu1.setText(MessageManager.getString("label.group"));
+ structureMenu.setText(MessageManager.getString("label.structure"));
+ viewStructureMenu.setText(MessageManager
+ .getString("label.view_structure"));
// colStructureMenu.setText("Colour By Structure");
- editSequence.setText("Edit Sequence...");
+ editSequence.setText(MessageManager.getString("label.edit_sequence")
+ + "...");
editSequence.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
editSequence_actionPerformed(actionEvent);
}
});
+
/*
* annotationMenuItem.setText("By Annotation");
* annotationMenuItem.addActionListener(new ActionListener() { public void
* actionPerformed(ActionEvent actionEvent) {
* annotationMenuItem_actionPerformed(actionEvent); } });
*/
-
+ groupMenu.add(sequenceSelDetails);
add(groupMenu);
-
add(sequenceMenu);
this.add(structureMenu);
+ // annotations configuration panel suppressed for now
+ // groupMenu.add(chooseAnnotations);
+
+ /*
+ * Add show/hide annotations to the Sequence menu, and to the Selection menu
+ * (if a selection group is in force).
+ */
+ sequenceMenu.add(seqShowAnnotationsMenu);
+ sequenceMenu.add(seqHideAnnotationsMenu);
+ sequenceMenu.add(seqAddReferenceAnnotations);
+ groupMenu.add(groupShowAnnotationsMenu);
+ groupMenu.add(groupHideAnnotationsMenu);
+ groupMenu.add(groupAddReferenceAnnotations);
groupMenu.add(editMenu);
groupMenu.add(outputMenu);
groupMenu.add(sequenceFeature);
+ groupMenu.add(createGroupMenuItem);
+ groupMenu.add(unGroupMenuItem);
groupMenu.add(jMenu1);
sequenceMenu.add(sequenceName);
+ sequenceMenu.add(sequenceDetails);
colourMenu.add(textColour);
colourMenu.add(noColourmenuItem);
colourMenu.add(clustalColour);
@@ -902,6 +1550,13 @@ public class PopupMenu extends JPopupMenu
colourMenu.add(turnColour);
colourMenu.add(buriedColour);
colourMenu.add(nucleotideMenuItem);
+ if (ap.getAlignment().isNucleotide())
+ {
+ // JBPNote - commented since the colourscheme isn't functional
+ // colourMenu.add(RNAInteractionColour);
+ colourMenu.add(purinePyrimidineColour);
+ }
+ // colourMenu.add(covariationColour);
colourMenu.add(userDefinedColour);
if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null)
@@ -914,6 +1569,7 @@ public class PopupMenu extends JPopupMenu
JMenuItem item = new JMenuItem(userColours.nextElement().toString());
item.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent evt)
{
userDefinedColour_actionPerformed(evt);
@@ -934,10 +1590,13 @@ public class PopupMenu extends JPopupMenu
editMenu.add(lowerCase);
editMenu.add(toggle);
pdbMenu.add(pdbFromFile);
+ // JBPNote: These shouldn't be added here - should appear in a generic
+ // 'apply web service to this sequence menu'
+ // pdbMenu.add(RNAFold);
+ // pdbMenu.add(ContraFold);
pdbMenu.add(enterPDB);
pdbMenu.add(discoverPDB);
jMenu1.add(groupName);
- jMenu1.add(unGroupMenuItem);
jMenu1.add(colourMenu);
jMenu1.add(showBoxes);
jMenu1.add(showText);
@@ -947,116 +1606,155 @@ public class PopupMenu extends JPopupMenu
structureMenu.add(pdbMenu);
structureMenu.add(viewStructureMenu);
// structureMenu.add(colStructureMenu);
- noColourmenuItem.setText("None");
+ noColourmenuItem.setText(MessageManager.getString("label.none"));
noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
noColourmenuItem_actionPerformed();
}
});
- clustalColour.setText("Clustalx colours");
+ clustalColour.setText(MessageManager
+ .getString("label.clustalx_colours"));
clustalColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
clustalColour_actionPerformed();
}
});
- zappoColour.setText("Zappo");
+ zappoColour.setText(MessageManager.getString("label.zappo"));
zappoColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
zappoColour_actionPerformed();
}
});
- taylorColour.setText("Taylor");
+ taylorColour.setText(MessageManager.getString("label.taylor"));
taylorColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
taylorColour_actionPerformed();
}
});
- hydrophobicityColour.setText("Hydrophobicity");
+ hydrophobicityColour.setText(MessageManager
+ .getString("label.hydrophobicity"));
hydrophobicityColour
.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
hydrophobicityColour_actionPerformed();
}
});
- helixColour.setText("Helix propensity");
+ helixColour.setText(MessageManager.getString("label.helix_propensity"));
helixColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
helixColour_actionPerformed();
}
});
- strandColour.setText("Strand propensity");
+ strandColour.setText(MessageManager
+ .getString("label.strand_propensity"));
strandColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
strandColour_actionPerformed();
}
});
- turnColour.setText("Turn propensity");
+ turnColour.setText(MessageManager.getString("label.turn_propensity"));
turnColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
turnColour_actionPerformed();
}
});
- buriedColour.setText("Buried Index");
+ buriedColour.setText(MessageManager.getString("label.buried_index"));
buriedColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
buriedColour_actionPerformed();
}
});
- abovePIDColour.setText("Above % Identity");
+ abovePIDColour.setText(MessageManager
+ .getString("label.above_identity_percentage"));
abovePIDColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
abovePIDColour_actionPerformed();
}
});
- userDefinedColour.setText("User Defined...");
+ userDefinedColour.setText(MessageManager
+ .getString("action.user_defined"));
userDefinedColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
userDefinedColour_actionPerformed(e);
}
});
- PIDColour.setText("Percentage Identity");
+ PIDColour
+ .setText(MessageManager.getString("label.percentage_identity"));
PIDColour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
PIDColour_actionPerformed();
}
});
- BLOSUM62Colour.setText("BLOSUM62");
+ BLOSUM62Colour.setText(MessageManager.getString("label.blosum62"));
BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
BLOSUM62Colour_actionPerformed();
}
});
- conservationMenuItem.setText("Conservation");
+ purinePyrimidineColour.setText(MessageManager
+ .getString("label.purine_pyrimidine"));
+ purinePyrimidineColour
+ .addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ purinePyrimidineColour_actionPerformed();
+ }
+ });
+
+ /*
+ * covariationColour.addActionListener(new java.awt.event.ActionListener() {
+ * public void actionPerformed(ActionEvent e) {
+ * covariationColour_actionPerformed(); } });
+ */
+
+ conservationMenuItem.setText(MessageManager
+ .getString("label.conservation"));
conservationMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
conservationMenuItem_actionPerformed();
@@ -1064,9 +1762,193 @@ public class PopupMenu extends JPopupMenu
});
}
+ /**
+ * Check for any annotations on the underlying dataset sequences (for the
+ * current selection group) which are not on the alignment annotations for the
+ * sequence. If any are found, enable the option to add them to the alignment.
+ * The criteria for 'on the alignment' is finding an alignment annotation on
+ * the sequence, that matches on calcId and label. A tooltip is also
+ * constructed that displays the source (calcId) and type (label) of the
+ * annotations that can be added.
+ *
+ * @param menuItem
+ * @param forSequences
+ */
+ protected void configureReferenceAnnotationsMenu(
+ JMenuItem menuItem, List forSequences)
+ {
+ menuItem.setText(MessageManager
+ .getString("label.add_reference_annotations"));
+ menuItem.setEnabled(false);
+ if (forSequences == null)
+ {
+ return;
+ }
+
+ /*
+ * Temporary store to hold distinct calcId / type pairs for the tooltip.
+ * Using TreeMap means calcIds are shown in alphabetical order.
+ */
+ Map tipEntries = new TreeMap();
+ StringBuilder tooltip = new StringBuilder(64);
+ tooltip.append(MessageManager.getString("label.add_annotations_for"));
+
+ /*
+ * For each sequence selected in the alignment, make a list of any
+ * annotations on the underlying dataset sequence which are not already on
+ * the sequence in the alignment.
+ *
+ * Build a map of { alignmentSequence, }
+ */
+ final Map> candidates = new LinkedHashMap>();
+ for (SequenceI seq : forSequences)
+ {
+ SequenceI dataset = seq.getDatasetSequence();
+ if (dataset == null)
+ {
+ continue;
+ }
+ AlignmentAnnotation[] datasetAnnotations = dataset.getAnnotation();
+ if (datasetAnnotations == null)
+ {
+ continue;
+ }
+ final List result = new ArrayList();
+ for (AlignmentAnnotation dsann : datasetAnnotations)
+ {
+ /*
+ * If the sequence has no annotation that matches this one, then add
+ * this one to the results list.
+ */
+ if (seq.getAlignmentAnnotations(dsann.getCalcId(), dsann.label)
+ .isEmpty())
+ {
+ result.add(dsann);
+ tipEntries.put(dsann.getCalcId(), dsann.label);
+ }
+ }
+ /*
+ * Save any addable annotations for this sequence
+ */
+ if (!result.isEmpty())
+ {
+ candidates.put(seq, result);
+ }
+ }
+ if (!candidates.isEmpty())
+ {
+ /*
+ * Found annotations that could be added. Enable the menu item, and
+ * configure its tooltip and action.
+ */
+ menuItem.setEnabled(true);
+ for (String calcId : tipEntries.keySet())
+ {
+ tooltip.append("
" + calcId + "/" + tipEntries.get(calcId));
+ }
+ String tooltipText = JvSwingUtils.wrapTooltip(true,
+ tooltip.toString());
+ menuItem.setToolTipText(tooltipText);
+
+ menuItem.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ addReferenceAnnotations_actionPerformed(candidates);
+ }
+ });
+ }
+ }
+
+ /**
+ * Add annotations to the sequences and to the alignment.
+ *
+ * @param candidates
+ * a map whose keys are sequences on the alignment, and values a list
+ * of annotations to add to each sequence
+ */
+ protected void addReferenceAnnotations_actionPerformed(
+ Map> candidates)
+ {
+ /*
+ * Add annotations at the top of the annotation, in the same order as their
+ * related sequences.
+ */
+ for (SequenceI seq : candidates.keySet())
+ {
+ for (AlignmentAnnotation ann : candidates.get(seq))
+ {
+ AlignmentAnnotation copyAnn = new AlignmentAnnotation(ann);
+ int startRes = 0;
+ int endRes = ann.annotations.length;
+ final SequenceGroup selectionGroup = this.ap.av.getSelectionGroup();
+ if (selectionGroup != null)
+ {
+ startRes = selectionGroup.getStartRes();
+ endRes = selectionGroup.getEndRes();
+ }
+ copyAnn.restrict(startRes, endRes);
+
+ // add to the sequence (sets copyAnn.datasetSequence)
+ seq.addAlignmentAnnotation(copyAnn);
+ // adjust for gaps
+ copyAnn.adjustForAlignment();
+ // add to the alignment and set visible
+ this.ap.getAlignment().addAnnotation(copyAnn);
+ copyAnn.visible = true;
+ }
+ }
+ refresh();
+ }
+
+ protected void sequenceSelectionDetails_actionPerformed()
+ {
+ createSequenceDetailsReport(ap.av.getSequenceSelection());
+ }
+
+ protected void sequenceDetails_actionPerformed()
+ {
+ createSequenceDetailsReport(new SequenceI[]
+ { sequence });
+ }
+
+ public void createSequenceDetailsReport(SequenceI[] sequences)
+ {
+ CutAndPasteHtmlTransfer cap = new CutAndPasteHtmlTransfer();
+ StringBuffer contents = new StringBuffer();
+ for (SequenceI seq : sequences)
+ {
+ contents.append(""
+ + MessageManager
+ .formatMessage(
+ "label.create_sequence_details_report_annotation_for",
+ new String[]
+ { seq.getDisplayId(true) }) + "
");
+ new SequenceAnnotationReport(null)
+ .createSequenceAnnotationReport(
+ contents,
+ seq,
+ true,
+ true,
+ false,
+ (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.minmax
+ : null);
+ contents.append("
");
+ }
+ cap.setText("" + contents.toString() + "");
+
+ Desktop.instance.addInternalFrame(cap, MessageManager.formatMessage(
+ "label.sequece_details_for",
+ (sequences.length == 1 ? new String[]
+ { sequences[0].getDisplayId(true) } : new String[]
+ { MessageManager.getString("label.selection") })), 500, 400);
+
+ }
+
protected void showNonconserved_actionPerformed()
{
- getGroup().setShowunconserved(displayNonconserved.isSelected());
+ getGroup().setShowNonconserved(displayNonconserved.isSelected());
refresh();
}
@@ -1085,14 +1967,12 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void clustalColour_actionPerformed()
{
SequenceGroup sg = getGroup();
- sg.cs = new ClustalxColourScheme(sg
- .getSequences(ap.av.hiddenRepSequences), ap.av.alignment
- .getWidth());
+ sg.cs = new ClustalxColourScheme(sg, ap.av.getHiddenRepSequences());
refresh();
}
@@ -1100,7 +1980,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void zappoColour_actionPerformed()
{
@@ -1112,7 +1992,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void taylorColour_actionPerformed()
{
@@ -1124,7 +2004,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void hydrophobicityColour_actionPerformed()
{
@@ -1136,7 +2016,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void helixColour_actionPerformed()
{
@@ -1148,7 +2028,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void strandColour_actionPerformed()
{
@@ -1160,7 +2040,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void turnColour_actionPerformed()
{
@@ -1172,7 +2052,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void buriedColour_actionPerformed()
{
@@ -1184,7 +2064,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void nucleotideMenuItem_actionPerformed()
{
@@ -1192,11 +2072,21 @@ public class PopupMenu extends JPopupMenu
refresh();
}
+ protected void purinePyrimidineColour_actionPerformed()
+ {
+ getGroup().cs = new PurinePyrimidineColourScheme();
+ refresh();
+ }
+
+ /*
+ * protected void covariationColour_actionPerformed() { getGroup().cs = new
+ * CovariationColourScheme(sequence.getAnnotation()[0]); refresh(); }
+ */
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void abovePIDColour_actionPerformed()
{
@@ -1208,9 +2098,9 @@ public class PopupMenu extends JPopupMenu
if (abovePIDColour.isSelected())
{
- sg.cs.setConsensus(AAFrequency.calculate(sg
- .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg
- .getEndRes() + 1));
+ sg.cs.setConsensus(AAFrequency.calculate(
+ sg.getSequences(ap.av.getHiddenRepSequences()),
+ sg.getStartRes(), sg.getEndRes() + 1));
int threshold = SliderPanel.setPIDSliderSource(ap, sg.cs, getGroup()
.getName());
@@ -1232,13 +2122,13 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void userDefinedColour_actionPerformed(ActionEvent e)
{
SequenceGroup sg = getGroup();
- if (e.getActionCommand().equals("User Defined..."))
+ if (e.getSource().equals(userDefinedColour))
{
new UserDefinedColours(ap, sg);
}
@@ -1253,18 +2143,30 @@ public class PopupMenu extends JPopupMenu
}
/**
+ * Open a panel where the user can choose which types of sequence annotation
+ * to show or hide.
+ *
+ * @param e
+ */
+ protected void chooseAnnotations_actionPerformed(ActionEvent e)
+ {
+ // todo correct way to guard against opening a duplicate panel?
+ new AnnotationChooser(ap);
+ }
+
+ /**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void PIDColour_actionPerformed()
{
SequenceGroup sg = getGroup();
sg.cs = new PIDColourScheme();
- sg.cs.setConsensus(AAFrequency.calculate(sg
- .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg
- .getEndRes() + 1));
+ sg.cs.setConsensus(AAFrequency.calculate(
+ sg.getSequences(ap.av.getHiddenRepSequences()),
+ sg.getStartRes(), sg.getEndRes() + 1));
refresh();
}
@@ -1272,7 +2174,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void BLOSUM62Colour_actionPerformed()
{
@@ -1280,9 +2182,9 @@ public class PopupMenu extends JPopupMenu
sg.cs = new Blosum62ColourScheme();
- sg.cs.setConsensus(AAFrequency.calculate(sg
- .getSequences(ap.av.hiddenRepSequences), sg.getStartRes(), sg
- .getEndRes() + 1));
+ sg.cs.setConsensus(AAFrequency.calculate(
+ sg.getSequences(ap.av.getHiddenRepSequences()),
+ sg.getStartRes(), sg.getEndRes() + 1));
refresh();
}
@@ -1291,7 +2193,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void noColourmenuItem_actionPerformed()
{
@@ -1303,7 +2205,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void conservationMenuItem_actionPerformed()
{
@@ -1315,13 +2217,14 @@ public class PopupMenu extends JPopupMenu
if (conservationMenuItem.isSelected())
{
+ // JBPNote: Conservation name shouldn't be i18n translated
Conservation c = new Conservation("Group",
- ResidueProperties.propHash, 3, sg
- .getSequences(ap.av.hiddenRepSequences), sg
- .getStartRes(), sg.getEndRes() + 1);
+ ResidueProperties.propHash, 3, sg.getSequences(ap.av
+ .getHiddenRepSequences()), sg.getStartRes(),
+ sg.getEndRes() + 1);
c.calculate();
- c.verdict(false, ap.av.ConsPercGaps);
+ c.verdict(false, ap.av.getConsPercGaps());
sg.cs.setConservation(c);
@@ -1345,11 +2248,11 @@ public class PopupMenu extends JPopupMenu
return;
}
- AnnotationColourGradient acg = new AnnotationColourGradient(sequence
- .getAnnotation()[0], null,
+ AnnotationColourGradient acg = new AnnotationColourGradient(
+ sequence.getAnnotation()[0], null,
AnnotationColourGradient.NO_THRESHOLD);
- acg.predefinedColours = true;
+ acg.setPredefinedColours(true);
sg.cs = acg;
refresh();
@@ -1359,15 +2262,18 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void groupName_actionPerformed()
{
SequenceGroup sg = getGroup();
- EditNameDialog dialog = new EditNameDialog(sg.getName(), sg
- .getDescription(), " Group Name ", "Group Description ",
- "Edit Group Name/Description");
+ EditNameDialog dialog = new EditNameDialog(sg.getName(),
+ sg.getDescription(), " "
+ + MessageManager.getString("label.group_name") + " ",
+ MessageManager.getString("label.group_description") + " ",
+ MessageManager.getString("label.edit_group_name_description"),
+ ap.alignFrame);
if (!dialog.accept)
{
@@ -1376,12 +2282,13 @@ public class PopupMenu extends JPopupMenu
sg.setName(dialog.getName());
sg.setDescription(dialog.getDescription());
+ refresh();
}
/**
- * DOCUMENT ME!
+ * Get selection group - adding it to the alignment if necessary.
*
- * @return DOCUMENT ME!
+ * @return sequence group to operate on
*/
SequenceGroup getGroup()
{
@@ -1389,7 +2296,7 @@ public class PopupMenu extends JPopupMenu
// this method won't add a new group if it already exists
if (sg != null)
{
- ap.av.alignment.addGroup(sg);
+ ap.av.getAlignment().addGroup(sg);
}
return sg;
@@ -1399,13 +2306,18 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
void sequenceName_actionPerformed()
{
- EditNameDialog dialog = new EditNameDialog(sequence.getName(), sequence
- .getDescription(), " Sequence Name ",
- "Sequence Description ", "Edit Sequence Name/Description");
+ EditNameDialog dialog = new EditNameDialog(sequence.getName(),
+ sequence.getDescription(),
+ " " + MessageManager.getString("label.sequence_name")
+ + " ",
+ MessageManager.getString("label.sequence_description") + " ",
+ MessageManager
+ .getString("label.edit_sequence_name_description"),
+ ap.alignFrame);
if (!dialog.accept)
{
@@ -1416,10 +2328,14 @@ public class PopupMenu extends JPopupMenu
{
if (dialog.getName().indexOf(" ") > -1)
{
- JOptionPane.showMessageDialog(ap,
- "Spaces have been converted to \"_\"",
- "No spaces allowed in Sequence Name",
- JOptionPane.WARNING_MESSAGE);
+ JOptionPane
+ .showMessageDialog(
+ ap,
+ MessageManager
+ .getString("label.spaces_converted_to_backslashes"),
+ MessageManager
+ .getString("label.no_spaces_allowed_sequence_name"),
+ JOptionPane.WARNING_MESSAGE);
}
sequence.setName(dialog.getName().replace(' ', '_'));
@@ -1437,26 +2353,34 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
void unGroupMenuItem_actionPerformed()
{
SequenceGroup sg = ap.av.getSelectionGroup();
- ap.av.alignment.deleteGroup(sg);
+ ap.av.getAlignment().deleteGroup(sg);
ap.av.setSelectionGroup(null);
refresh();
}
+ void createGroupMenuItem_actionPerformed()
+ {
+ getGroup(); // implicitly creates group - note - should apply defaults / use
+ // standard alignment window logic for this
+ refresh();
+ }
+
/**
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
protected void outline_actionPerformed()
{
SequenceGroup sg = getGroup();
- Color col = JColorChooser.showDialog(this, "Select Outline Colour",
+ Color col = JColorChooser.showDialog(this,
+ MessageManager.getString("label.select_outline_colour"),
Color.BLUE);
if (col != null)
@@ -1471,7 +2395,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void showBoxes_actionPerformed()
{
@@ -1483,7 +2407,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void showText_actionPerformed()
{
@@ -1495,7 +2419,7 @@ public class PopupMenu extends JPopupMenu
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void showColourText_actionPerformed()
{
@@ -1510,12 +2434,10 @@ public class PopupMenu extends JPopupMenu
jalview.util.BrowserLauncher.openURL(url);
} catch (Exception ex)
{
- JOptionPane
- .showInternalMessageDialog(
- Desktop.desktop,
- "Unixers: Couldn't find default web browser."
- + "\nAdd the full path to your browser in Preferences.",
- "Web browser not found", JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ MessageManager.getString("label.web_browser_not_found_unix"),
+ MessageManager.getString("label.web_browser_not_found"),
+ JOptionPane.WARNING_MESSAGE);
ex.printStackTrace();
}
@@ -1552,6 +2474,7 @@ public class PopupMenu extends JPopupMenu
}
ap.av.hideSequence(hseqs);
+ // refresh(); TODO: ? needed ?
ap.av.sendSelection();
}
@@ -1580,23 +2503,23 @@ public class PopupMenu extends JPopupMenu
if (source == toggle)
{
- description = "Toggle Case";
+ description = MessageManager.getString("label.toggle_case");
caseChange = ChangeCaseCommand.TOGGLE_CASE;
}
else if (source == upperCase)
{
- description = "To Upper Case";
+ description = MessageManager.getString("label.to_upper_case");
caseChange = ChangeCaseCommand.TO_UPPER;
}
else
{
- description = "To Lower Case";
+ description = MessageManager.getString("label.to_lower_case");
caseChange = ChangeCaseCommand.TO_LOWER;
}
- ChangeCaseCommand caseCommand = new ChangeCaseCommand(description, sg
- .getSequencesAsArray(ap.av.hiddenRepSequences), startEnd,
- caseChange);
+ ChangeCaseCommand caseCommand = new ChangeCaseCommand(description,
+ sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),
+ startEnd, caseChange);
ap.alignFrame.addHistoryItem(caseCommand);
@@ -1610,27 +2533,18 @@ public class PopupMenu extends JPopupMenu
{
CutAndPasteTransfer cap = new CutAndPasteTransfer();
cap.setForInput(null);
- Desktop.addInternalFrame(cap, "Alignment output - "
- + e.getActionCommand(), 600, 500);
+ Desktop.addInternalFrame(cap, MessageManager.formatMessage(
+ "label.alignment_output_command", new String[]
+ { e.getActionCommand() }), 600, 500);
String[] omitHidden = null;
System.out.println("PROMPT USER HERE"); // TODO: decide if a prompt happens
- // or we simply trust the user wants
- // wysiwig behaviour
- SequenceGroup sg = ap.av.getSelectionGroup();
- ColumnSelection csel = new ColumnSelection(ap.av.getColumnSelection());
- omitHidden = ap.av.getViewAsString(true);
- Alignment oal = new Alignment(ap.av.getSequenceSelection());
- AlignmentAnnotation[] nala = ap.av.alignment.getAlignmentAnnotation();
- for (int i = 0; i < nala.length; i++)
- {
- AlignmentAnnotation na = nala[i];
- oal.addAnnotation(na);
- }
+ // or we simply trust the user wants
+ // wysiwig behaviour
+
cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
- oal, omitHidden, csel, sg));
- oal = null;
+ ap.av, true));
}
public void pdbFromFile_actionPerformed()
@@ -1638,55 +2552,44 @@ public class PopupMenu extends JPopupMenu
jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new jalview.io.JalviewFileView());
- chooser.setDialogTitle("Select a PDB file");
- chooser.setToolTipText("Load a PDB file");
+ chooser.setDialogTitle(MessageManager.formatMessage(
+ "label.select_pdb_file_for", new String[]
+ { sequence.getDisplayId(false) }));
+ chooser.setToolTipText(MessageManager.formatMessage(
+ "label.load_pdb_file_associate_with_sequence", new String[]
+ { sequence.getDisplayId(false) }));
int value = chooser.showOpenDialog(null);
if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
{
- PDBEntry entry = new PDBEntry();
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
- try
- {
- MCview.PDBfile pdbfile = new MCview.PDBfile(choice,
- jalview.io.AppletFormatAdapter.FILE);
-
- if (pdbfile.id == null)
- {
- String reply = JOptionPane
- .showInternalInputDialog(
- Desktop.desktop,
- "Couldn't find a PDB id in the file supplied."
- + "Please enter an Id to identify this structure.",
- "No PDB Id in File", JOptionPane.QUESTION_MESSAGE);
- if (reply == null)
- {
- return;
- }
-
- entry.setId(reply);
- }
- else
- {
- entry.setId(pdbfile.id);
- }
- } catch (java.io.IOException ex)
- {
- ex.printStackTrace();
- }
-
- entry.setFile(choice);
- sequence.getDatasetSequence().addPDBId(entry);
+ new AssociatePdbFileWithSeq().associatePdbWithSeq(choice,
+ jalview.io.AppletFormatAdapter.FILE, sequence, true,
+ Desktop.instance);
}
}
+ // JBNote: commented out - these won't be instantiated here...!
+ // public void RNAFold_actionPerformed() throws Exception
+ // {
+ // Predict2D P2D = new Predict2D();
+ // P2D.getStructure2DFromRNAFold("toto");
+ // }
+ //
+ // public void ContraFold_actionPerformed() throws Exception
+ // {
+ // Predict2D P2D = new Predict2D();
+ // P2D.getStructure2DFromContraFold("toto");
+ // }
public void enterPDB_actionPerformed()
{
String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
- "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
+ MessageManager.getString("label.enter_pdb_id"),
+ MessageManager.getString("label.enter_pdb_id"),
+ JOptionPane.QUESTION_MESSAGE);
if (id != null && id.length() > 0)
{
@@ -1699,11 +2602,12 @@ public class PopupMenu extends JPopupMenu
public void discoverPDB_actionPerformed()
{
- final SequenceI[] sequences = ((ap.av.selectionGroup == null) ? new Sequence[]
+ final SequenceI[] sequences = ((ap.av.getSelectionGroup() == null) ? new SequenceI[]
{ sequence }
- : ap.av.selectionGroup.getSequencesInOrder(ap.av.alignment));
+ : ap.av.getSequenceSelection());
Thread discpdb = new Thread(new Runnable()
{
+ @Override
public void run()
{
@@ -1723,25 +2627,25 @@ public class PopupMenu extends JPopupMenu
return;
}
- int rsize=0,gSize = sg.getSize();
- SequenceI[] rseqs,seqs = new SequenceI[gSize];
- SequenceFeature[] tfeatures,features = new SequenceFeature[gSize];
-
+ int rsize = 0, gSize = sg.getSize();
+ SequenceI[] rseqs, seqs = new SequenceI[gSize];
+ SequenceFeature[] tfeatures, features = new SequenceFeature[gSize];
+
for (int i = 0; i < gSize; i++)
{
int start = sg.getSequenceAt(i).findPosition(sg.getStartRes());
int end = sg.findEndRes(sg.getSequenceAt(i));
- if (start<=end)
+ if (start <= end)
{
seqs[rsize] = sg.getSequenceAt(i).getDatasetSequence();
features[rsize] = new SequenceFeature(null, null, null, start, end,
- "Jalview");
+ "Jalview");
rsize++;
}
}
rseqs = new SequenceI[rsize];
tfeatures = new SequenceFeature[rsize];
- System.arraycopy(seqs,0,rseqs, 0, rsize);
+ System.arraycopy(seqs, 0, rseqs, 0, rsize);
System.arraycopy(features, 0, tfeatures, 0, rsize);
features = tfeatures;
seqs = rseqs;
@@ -1764,17 +2668,16 @@ public class PopupMenu extends JPopupMenu
public void colourByStructure(String pdbid)
{
- Annotation[] anots = jalview.structure.StructureSelectionManager
- .getStructureSelectionManager().colourSequenceFromStructure(
- sequence, pdbid);
+ Annotation[] anots = ap.av.getStructureSelectionManager()
+ .colourSequenceFromStructure(sequence, pdbid);
AlignmentAnnotation an = new AlignmentAnnotation("Structure",
"Coloured by " + pdbid, anots);
- ap.av.alignment.addAnnotation(an);
+ ap.av.getAlignment().addAnnotation(an);
an.createSequenceMapping(sequence, 0, true);
// an.adjustForAlignment();
- ap.av.alignment.setAnnotationIndex(an, 0);
+ ap.av.getAlignment().setAnnotationIndex(an, 0);
ap.adjustAnnotationHeight();
@@ -1789,19 +2692,25 @@ public class PopupMenu extends JPopupMenu
if (sg != null)
{
if (sequence == null)
- sequence = (Sequence) sg.getSequenceAt(0);
+ {
+ sequence = sg.getSequenceAt(0);
+ }
- EditNameDialog dialog = new EditNameDialog(sequence
- .getSequenceAsString(sg.getStartRes(), sg.getEndRes() + 1),
- null, "Edit Sequence ", null, "Edit Sequence");
+ EditNameDialog dialog = new EditNameDialog(
+ sequence.getSequenceAsString(sg.getStartRes(),
+ sg.getEndRes() + 1), null,
+ MessageManager.getString("label.edit_sequence"), null,
+ MessageManager.getString("label.edit_sequence"),
+ ap.alignFrame);
if (dialog.accept)
{
- EditCommand editCommand = new EditCommand("Edit Sequences",
+ EditCommand editCommand = new EditCommand(
+ MessageManager.getString("label.edit_sequences"),
EditCommand.REPLACE, dialog.getName().replace(' ',
- ap.av.getGapCharacter()), sg
- .getSequencesAsArray(ap.av.hiddenRepSequences), sg
- .getStartRes(), sg.getEndRes() + 1, ap.av.alignment);
+ ap.av.getGapCharacter()),
+ sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),
+ sg.getStartRes(), sg.getEndRes() + 1, ap.av.getAlignment());
ap.alignFrame.addHistoryItem(editCommand);