git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3572 Added getdown Implementation-Version to getdown jars META-INF/MANIFEST.MF
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
7b4af56
..
ea7fb6b
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-57,7
+57,7
@@
public class AppJmol extends StructureViewerBase
private static final String SPACE = " ";
private static final String SPACE = " ";
- private static final String BACKSLASH = "\"";
+ private static final String QUOTE = "\"";
AppJmolBinding jmb;
AppJmolBinding jmb;
@@
-259,8
+259,6
@@
public class AppJmol extends StructureViewerBase
jmb.setFinishedInit(true);
}
jmb.setFinishedInit(true);
}
- boolean allChainsSelected = false;
-
@Override
void showSelectedChains()
{
@Override
void showSelectedChains()
{
@@
-327,8
+325,8
@@
public class AppJmol extends StructureViewerBase
StringBuilder fileList = new StringBuilder();
for (String s : files)
{
StringBuilder fileList = new StringBuilder();
for (String s : files)
{
- fileList.append(SPACE).append(BACKSLASH)
- .append(Platform.escapeString(s)).append(BACKSLASH);
+ fileList.append(SPACE).append(QUOTE)
+ .append(Platform.escapeBackslashes(s)).append(QUOTE);
}
String filesString = fileList.toString();
}
String filesString = fileList.toString();
@@
-466,6
+464,7
@@
public class AppJmol extends StructureViewerBase
String file = jmb.getPdbEntry(pi).getFile();
if (file == null)
{
String file = jmb.getPdbEntry(pi).getFile();
if (file == null)
{
+ // todo: extract block as method and pull up (also ChimeraViewFrame)
// retrieve the pdb and store it locally
AlignmentI pdbseq = null;
pdbid = jmb.getPdbEntry(pi).getId();
// retrieve the pdb and store it locally
AlignmentI pdbseq = null;
pdbid = jmb.getPdbEntry(pi).getId();
@@
-516,7
+515,7
@@
public class AppJmol extends StructureViewerBase
addingStructures = true; // already files loaded.
for (int c = 0; c < filesInViewer.length; c++)
{
addingStructures = true; // already files loaded.
for (int c = 0; c < filesInViewer.length; c++)
{
- if (filesInViewer[c].equals(file))
+ if (Platform.pathEquals(filesInViewer[c], file))
{
file = null;
break;
{
file = null;
break;