/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
import jalview.datamodel.SequenceI;
import jalview.io.AppletFormatAdapter;
import jalview.io.FileParse;
+import jalview.io.StructureFile;
import jalview.schemes.BuriedColourScheme;
import jalview.schemes.HelixColourScheme;
import jalview.schemes.HydrophobicColourScheme;
import java.awt.MenuBar;
import java.awt.MenuItem;
import java.awt.Panel;
-import java.awt.Rectangle;
import java.awt.TextArea;
import java.awt.TextField;
import java.awt.event.ActionEvent;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
import java.util.Vector;
public class AppletJmol extends EmbmenuFrame implements
AlignmentPanel ap;
- ArrayList _aps = new ArrayList();
+ List<AlignmentPanel> _aps = new ArrayList<AlignmentPanel>(); // remove? never
+ // added to
String fileLoadingError;
{
this.ap = ap;
jmb = new AppletJmolBinding(this, ap.getStructureSelectionManager(),
- new PDBEntry[]
- { pdbentry }, new SequenceI[][]
- { seq }, new String[][]
- { chains }, protocol);
+ new PDBEntry[] { pdbentry }, new SequenceI[][] { seq },
+ new String[][] { chains }, protocol);
jmb.setColourBySequence(true);
if (pdbentry.getId() == null || pdbentry.getId().length() < 1)
{
String alreadyMapped = StructureSelectionManager
.getStructureSelectionManager(ap.av.applet)
.alreadyMappedToFile(pdbentry.getId());
- MCview.PDBfile reader = null;
+ StructureFile reader = null;
if (alreadyMapped != null)
{
reader = StructureSelectionManager.getStructureSelectionManager(
dispose();
return;
}
- jmb.newJmolPopup(true, "Jmol", true);
+ // jmb.newJmolPopup(true, "Jmol", true);
this.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent evt)
{
closeViewer();
}
if (freader == null)
{
- throw new Exception(MessageManager.getString("exception.invalid_datasource_couldnt_obtain_reader"));
+ throw new Exception(
+ MessageManager
+ .getString("exception.invalid_datasource_couldnt_obtain_reader"));
}
jmb.viewer.openReader(pdbentry.getFile(), pdbentry.getId(),
freader);
jmb.loadInline(string);
}
- void setChainMenuItems(Vector chains)
+ void setChainMenuItems(Vector<String> chains)
{
chainMenu.removeAll();
chainMenu.add(menuItem);
CheckboxMenuItem menuItemCB;
- for (int c = 0; c < chains.size(); c++)
+ for (String ch : chains)
{
- menuItemCB = new CheckboxMenuItem(chains.elementAt(c).toString(),
- true);
+ menuItemCB = new CheckboxMenuItem(ch, true);
menuItemCB.addItemListener(this);
chainMenu.add(menuItemCB);
}
void centerViewer()
{
- Vector toshow = new Vector();
- String lbl;
- int mlength, p, mnum;
+ Vector<String> toshow = new Vector<String>();
for (int i = 0; i < chainMenu.getItemCount(); i++)
{
if (chainMenu.getItem(i) instanceof CheckboxMenuItem)
this.setVisible(false);
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == mappingMenuItem)
StringBuffer sb = new StringBuffer();
try
{
- for (int s = 0; s < jmb.getPdbCount(); s++)
- {
- sb.append(jmb.printMapping(jmb.getPdbEntry(s).getFile()));
- sb.append("\n");
- }
- cap.setText(sb.toString());
+ cap.setText(jmb.printMappings());
} catch (OutOfMemoryError ex)
{
frame.dispose();
jmb.setColourBySequence(itm == seqColour);
}
+ @Override
public void itemStateChanged(ItemEvent evt)
{
if (evt.getSource() == jmolColour)
else if (evt.getSource() == seqColour)
{
setEnabled(seqColour);
- jmb.colourBySequence(ap.av.isShowSequenceFeatures(), ap);
+ jmb.colourBySequence(ap);
}
else if (!allChainsSelected)
{
}
}
+ @Override
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_ENTER && scriptWindow.isVisible())
{
jmb.eval(inputLine.getText());
- history.append("\n$ " + inputLine.getText());
+ addToHistory("$ " + inputLine.getText());
inputLine.setText("");
}
}
+ @Override
public void keyTyped(KeyEvent evt)
{
}
+ @Override
public void keyReleased(KeyEvent evt)
{
}
public void updateColours(Object source)
{
- AlignmentPanel ap = (AlignmentPanel) source;
- jmb.colourBySequence(ap.av.isShowSequenceFeatures(), ap);
+ AlignmentPanel panel = (AlignmentPanel) source;
+ jmb.colourBySequence(panel);
}
public void updateTitleAndMenus()
return;
}
setChainMenuItems(jmb.chainNames);
- jmb.colourBySequence(ap.av.isShowSequenceFeatures(), ap);
+ jmb.colourBySequence(ap);
setTitle(jmb.getViewerTitle());
}
{
Dimension currentSize = new Dimension();
- Rectangle rectClip = new Rectangle();
-
+ @Override
public void update(Graphics g)
{
paint(g);
}
+ @Override
public void paint(Graphics g)
{
currentSize = this.getSize();
- rectClip = g.getClipBounds();
if (jmb.viewer == null)
{
}
else
{
- jmb.viewer.renderScreenImage(g, currentSize, rectClip);
+ jmb.viewer.renderScreenImage(g, currentSize.width,
+ currentSize.height);
}
}
}
{
for (int i = 0; i < _aps.size(); i++)
{
- if (((AlignmentPanel) _aps.get(i)).av.getAlignment() == alignment)
+ if (_aps.get(i).av.getAlignment() == alignment)
{
- return ((AlignmentPanel) _aps.get(i));
+ return (_aps.get(i));
}
}
return ap;
}
+
+ /**
+ * Append the given text to the history object
+ *
+ * @param text
+ */
+ public void addToHistory(String text)
+ {
+ // actually currently never initialised
+ if (history != null)
+ {
+ history.append("\n" + text);
+ }
+ }
}