git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2006cae
)
JAL-2295 improved integrity of 'isFinishedInit' flag
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 11 Nov 2016 13:40:57 +0000
(13:40 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 11 Nov 2016 13:40:57 +0000
(13:40 +0000)
src/jalview/gui/ChimeraViewFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/ChimeraViewFrame.java
b/src/jalview/gui/ChimeraViewFrame.java
index
1313476
..
d68cce8
100644
(file)
--- a/
src/jalview/gui/ChimeraViewFrame.java
+++ b/
src/jalview/gui/ChimeraViewFrame.java
@@
-432,7
+432,6
@@
public class ChimeraViewFrame extends StructureViewerBase
*/
void initChimera()
{
*/
void initChimera()
{
- jmb.setFinishedInit(false);
jalview.gui.Desktop.addInternalFrame(this,
jmb.getViewerTitle("Chimera", true), getBounds().width,
getBounds().height);
jalview.gui.Desktop.addInternalFrame(this,
jmb.getViewerTitle("Chimera", true), getBounds().width,
getBounds().height);
@@
-457,7
+456,6
@@
public class ChimeraViewFrame extends StructureViewerBase
+ chimeraSessionFile);
}
}
+ chimeraSessionFile);
}
}
- jmb.setFinishedInit(true);
jmb.startChimeraListener();
}
jmb.startChimeraListener();
}
@@
-663,6
+661,7
@@
public class ChimeraViewFrame extends StructureViewerBase
if (files.length() > 0)
{
if (files.length() > 0)
{
+ jmb.setFinishedInit(false);
if (!addingStructures)
{
try
if (!addingStructures)
{
try
@@
-674,7
+673,7
@@
public class ChimeraViewFrame extends StructureViewerBase
}
}
int num = -1;
}
}
int num = -1;
- jmb.setFinishedInit(false);
+
for (PDBEntry pe : filePDB)
{
num++;
for (PDBEntry pe : filePDB)
{
num++;
@@
-720,6
+719,7
@@
public class ChimeraViewFrame extends StructureViewerBase
}
}
}
}
}
}
+
jmb.setFinishedInit(true);
jmb.setLoadingFromArchive(false);
jmb.setFinishedInit(true);
jmb.setLoadingFromArchive(false);