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-2446 merged to spike branch
[jalview.git]
/
src
/
jalview
/
io
/
StructureFile.java
diff --git
a/src/jalview/io/StructureFile.java
b/src/jalview/io/StructureFile.java
index
7fe17c8
..
ab220f0
100644
(file)
--- a/
src/jalview/io/StructureFile.java
+++ b/
src/jalview/io/StructureFile.java
@@
-406,7
+406,8
@@
public abstract class StructureFile extends AlignFile
* make a friendly ID string.
*
* @param dataName
* make a friendly ID string.
*
* @param dataName
- * @return truncated dataName to after last '/'
+ * @return truncated dataName to after last '/' and pruned .extension if
+ * present
*/
protected String safeName(String dataName)
{
*/
protected String safeName(String dataName)
{
@@
-415,6
+416,9
@@
public abstract class StructureFile extends AlignFile
{
dataName = dataName.substring(p + 1);
}
{
dataName = dataName.substring(p + 1);
}
+ if(dataName.indexOf(".") > -1){
+ dataName = dataName.substring(0, dataName.lastIndexOf("."));
+ }
return dataName;
}
return dataName;
}