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
/
structure
/
StructureImportSettings.java
diff --git
a/src/jalview/structure/StructureImportSettings.java
b/src/jalview/structure/StructureImportSettings.java
index
6254b43
..
9662fee
100644
(file)
--- a/
src/jalview/structure/StructureImportSettings.java
+++ b/
src/jalview/structure/StructureImportSettings.java
@@
-121,9
+121,9
@@
public class StructureImportSettings
StructureImportSettings.showSeqFeatures = showSeqFeatures;
}
StructureImportSettings.showSeqFeatures = showSeqFeatures;
}
- public static String getDefaultStructureFileFormat()
+ public static PDBEntry.Type getDefaultStructureFileFormat()
{
{
- return defaultStructureFileFormat.toString();
+ return defaultStructureFileFormat;
}
public static void setDefaultStructureFileFormat(
}
public static void setDefaultStructureFileFormat(