pdb.setId(entry.getId());
pdb.setType(entry.getType());
- AppJMol jmol;
+ AppJmol jmol;
//This must have been loaded, is it still visible?
JInternalFrame[] frames = Desktop.desktop.getAllFrames();
for (int f = frames.length - 1; f > -1; f--)
{
- if (frames[f] instanceof AppJMol)
+ if (frames[f] instanceof AppJmol)
{
- jmol = (AppJMol) frames[f];
+ jmol = (AppJmol) frames[f];
if (!jmol.pdbentry.getId().equals(entry.getId()))
continue;
int width = ids[p].getStructureState(s).getWidth();
int height = ids[p].getStructureState(s).getHeight();
- java.awt.Component comp = Desktop.desktop.getComponentAt(x, y);
+ java.awt.Component comp = null;
+
+ JInternalFrame [] frames = Desktop.desktop.getAllFrames();
+ for(int f=0; f<frames.length; f++)
+ {
+ if(frames[f] instanceof AppJmol)
+ {
+ if (frames[f].getX() == x && frames[f].getY() == y
+ && frames[f].getHeight() == height
+ && frames[f].getWidth() == width)
+ {
+ comp = frames[f];
+ break;
+ }
+ }
+ }
+
+
+ Desktop.desktop.getComponentAt(x, y);
String pdbFile = loadPDBFile(file, ids[p].getId());
{
al.getSequenceAt(i)};
- if (comp == null ||
- (comp.getWidth() != width && comp.getHeight() != height))
+
+ if (comp == null)
{
String state = ids[p].getStructureState(s).getContent();
newFileLoc.append(state.substring(
state.indexOf("\"", state.indexOf("load \"") + 6)));
- new AppJMol(pdbFile,
+ new AppJmol(pdbFile,
ids[p].getId(),
seq,
af.alignPanel,
else if(comp!=null)
{
StructureSelectionManager.getStructureSelectionManager()
- .setMapping(seq, pdbFile,
+ .setMapping(seq, null, pdbFile,
jalview.io.AppletFormatAdapter.FILE);
- ( (AppJMol) comp).addSequence(seq);
+ ( (AppJmol) comp).addSequence(seq);
}
}
}