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:
58da45e
)
JAL-3389 add .py to restored Chimera session filename so it opens!
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 31 Jul 2019 11:59:39 +0000
(12:59 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 31 Jul 2019 11:59:39 +0000
(12:59 +0100)
src/jalview/project/Jalview2XML.java
patch
|
blob
|
history
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
0e17779
..
af48dba
100644
(file)
--- a/
src/jalview/project/Jalview2XML.java
+++ b/
src/jalview/project/Jalview2XML.java
@@
-3160,25
+3160,25
@@
public class Jalview2XML
* @param prefix
* a prefix for the temporary file name, must be at least three
* characters long
* @param prefix
* a prefix for the temporary file name, must be at least three
* characters long
- * @param origFile
+ * @param suffixModel
* null or original file - so new file can be given the same suffix
* as the old one
* @return
*/
protected String copyJarEntry(jarInputStreamProvider jprovider,
* null or original file - so new file can be given the same suffix
* as the old one
* @return
*/
protected String copyJarEntry(jarInputStreamProvider jprovider,
- String jarEntryName, String prefix, String origFile)
+ String jarEntryName, String prefix, String suffixModel)
{
BufferedReader in = null;
PrintWriter out = null;
String suffix = ".tmp";
{
BufferedReader in = null;
PrintWriter out = null;
String suffix = ".tmp";
- if (origFile == null)
+ if (suffixModel == null)
{
{
- origFile = jarEntryName;
+ suffixModel = jarEntryName;
}
}
- int sfpos = origFile.lastIndexOf(".");
- if (sfpos > -1 && sfpos < (origFile.length() - 3))
+ int sfpos = suffixModel.lastIndexOf(".");
+ if (sfpos > -1 && sfpos < (suffixModel.length() - 1))
{
{
- suffix = "." + origFile.substring(sfpos + 1);
+ suffix = "." + suffixModel.substring(sfpos + 1);
}
try
{
}
try
{
@@
-4444,7
+4444,7
@@
public class Jalview2XML
*/
String viewerJarEntryName = getViewerJarEntryName(data.getViewId());
chimeraSessionFile = copyJarEntry(jprovider, viewerJarEntryName,
*/
String viewerJarEntryName = getViewerJarEntryName(data.getViewId());
chimeraSessionFile = copyJarEntry(jprovider, viewerJarEntryName,
- "chimera", null);
+ "chimera", ".py");
Set<Entry<File, StructureData>> fileData = data.getFileData()
.entrySet();
Set<Entry<File, StructureData>> fileData = data.getFileData()
.entrySet();