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-1926 JAL-2106 use enum for ‘DEFAULT_STRUCTURE_FORMAT’ property values
[jalview.git]
/
src
/
jalview
/
structure
/
StructureImportSettings.java
diff --git
a/src/jalview/structure/StructureImportSettings.java
b/src/jalview/structure/StructureImportSettings.java
index
b23fd53
..
8a321ce
100644
(file)
--- a/
src/jalview/structure/StructureImportSettings.java
+++ b/
src/jalview/structure/StructureImportSettings.java
@@
-27,6
+27,12
@@
public class StructureImportSettings
private static boolean processHETATMs = false;
private static String currentDefaultFormat = DBRefSource.PDB;
private static boolean processHETATMs = false;
private static String currentDefaultFormat = DBRefSource.PDB;
+ public enum StructureFormat
+ {
+ PDB, MMCIF
+ };
+
+ private static StructureFormat currentDefaultFormat = StructureFormat.PDB;
public static void addSettings(boolean addAlignmentAnnotations,
boolean predictSecStr, boolean externalSecStr)
public static void addSettings(boolean addAlignmentAnnotations,
boolean predictSecStr, boolean externalSecStr)
@@
-82,12
+88,13
@@
public class StructureImportSettings
public static String getCurrentDefaultFormat()
{
public static String getCurrentDefaultFormat()
{
- return currentDefaultFormat;
+ return currentDefaultFormat.toString();
}
public static void setCurrentDefaultFormat(String currentDefaultFormat)
{
}
public static void setCurrentDefaultFormat(String currentDefaultFormat)
{
- StructureImportSettings.currentDefaultFormat = currentDefaultFormat;
+ StructureImportSettings.currentDefaultFormat = StructureFormat
+ .valueOf(currentDefaultFormat);
}
public static boolean isProcessHETATMs()
}
public static boolean isProcessHETATMs()