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
Merge branch 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
6c934c8
..
ea7fb6b
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-326,7
+326,7
@@
public class AppJmol extends StructureViewerBase
for (String s : files)
{
fileList.append(SPACE).append(QUOTE)
for (String s : files)
{
fileList.append(SPACE).append(QUOTE)
- .append(Platform.escapeString(s)).append(QUOTE);
+ .append(Platform.escapeBackslashes(s)).append(QUOTE);
}
String filesString = fileList.toString();
}
String filesString = fileList.toString();
@@
-515,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;