X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPopupMenu.java;h=4f2326a1b955a1f65b3cc60377b3a6b395d7a28c;hb=b67b5e0fb0aa385f944431a402efcc05051a0127;hp=311421140d1a0dfce80dd3c4b09162f813b7fa7d;hpb=0201d2b630e06a75fd9522f24863e9cecf8810fd;p=jalview.git diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 3114211..4f2326a 100755 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -111,28 +111,58 @@ public class PopupMenu extends JPopupMenu } - if ((seq != null) - && seq.getDatasetSequence().getPDBId() != null) + if (seq != null) { - java.util.Enumeration e = seq.getDatasetSequence().getPDBId().elements(); - while(e.hasMoreElements()) + JMenuItem menuItem; + if( seq.getDatasetSequence().getPDBId() != null) { - final PDBEntry pdb = (PDBEntry)e.nextElement(); - - JMenuItem pdbMenuItem = new JMenuItem(); - pdbMenuItem.setText("View PDB entry: "+pdb.getId()); - pdbMenuItem.addActionListener(new java.awt.event.ActionListener() + java.util.Enumeration e = seq.getDatasetSequence().getPDBId(). + elements(); + while (e.hasMoreElements()) { + final PDBEntry pdb = (PDBEntry) e.nextElement(); + + menuItem = new JMenuItem(); + menuItem.setText("View PDB entry: " + pdb.getId()); + menuItem.addActionListener(new java.awt.event.ActionListener() + { public void actionPerformed(ActionEvent e) { new PDBViewer(pdb, sequence, ap.seqPanel.seqCanvas); } - }); - sequenceMenu.add(pdbMenuItem); + }); + sequenceMenu.add(menuItem); + } } + /* menuItem = new JMenuItem("Hide Sequences"); + menuItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + hideSequences(false); + } + }); + sequenceMenu.add(menuItem); + + if(ap.av.getSelectionGroup() !=null && ap.av.getSelectionGroup().getSize()>1) + { + menuItem = new JMenuItem("Represent Group with " + seq.getName()); + menuItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + hideSequences(true); + } + }); + sequenceMenu.add(menuItem); + }*/ + + } + + SequenceGroup sg = ap.av.getSelectionGroup(); if (sg != null) @@ -245,6 +275,7 @@ public class PopupMenu extends JPopupMenu } } + /** * DOCUMENT ME! * @@ -263,7 +294,7 @@ public class PopupMenu extends JPopupMenu } }); sequenceMenu.setText("Sequence"); - sequenceName.setText("Edit Name/Desciption"); + sequenceName.setText("Edit Name/Description"); sequenceName.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -928,4 +959,33 @@ public class PopupMenu extends JPopupMenu ex.printStackTrace(); } } + + void hideSequences(boolean representGroup) + { + SequenceGroup sg = ap.av.getSelectionGroup(); + if(sg==null || sg.getSize()<1) + { + ap.av.hideSequence(sequence); + return; + } + + int index = 0; + while(index < sg.sequences.size()) + { + if(representGroup && sg.getSequenceAt(index)!=sequence) + { + sequence.addHiddenSequence(sg.getSequenceAt(index)); + ap.av.hideSequence(sg.getSequenceAt(index)); + } + else if(!representGroup) + { + ap.av.hideSequence(sg.getSequenceAt(index)); + } + index ++; + } + + ap.av.setSelectionGroup(null); + refresh(); + } + }