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-2148 Bugfix in structureImportSettings string-to-enum conversion and further...
[jalview.git]
/
src
/
jalview
/
structure
/
StructureImportSettings.java
diff --git
a/src/jalview/structure/StructureImportSettings.java
b/src/jalview/structure/StructureImportSettings.java
index
388ccbd
..
3d41a83
100644
(file)
--- a/
src/jalview/structure/StructureImportSettings.java
+++ b/
src/jalview/structure/StructureImportSettings.java
@@
-31,8
+31,6
@@
public class StructureImportSettings
private static boolean showSeqFeatures = true;
private static boolean showSeqFeatures = true;
- private static boolean processHETATMs = false;
-
public enum StructureParser
{
JMOL_PARSER, JALVIEW_PARSER
public enum StructureParser
{
JMOL_PARSER, JALVIEW_PARSER
@@
-111,17
+109,7
@@
public class StructureImportSettings
String defaultStructureFileFormat)
{
StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
String defaultStructureFileFormat)
{
StructureImportSettings.defaultStructureFileFormat = PDBEntry.Type
- .valueOf(defaultStructureFileFormat);
- }
-
- public static boolean isProcessHETATMs()
- {
- return processHETATMs;
- }
-
- public static void setProcessHETATMs(boolean processHETATMs)
- {
- StructureImportSettings.processHETATMs = processHETATMs;
+ .valueOf(defaultStructureFileFormat.toUpperCase());
}
public static String getDefaultPDBFileParser()
}
public static String getDefaultPDBFileParser()
@@
-138,7
+126,7
@@
public class StructureImportSettings
public static void setDefaultPDBFileParser(String defaultPDBFileParser)
{
StructureImportSettings.defaultPDBFileParser = StructureParser
public static void setDefaultPDBFileParser(String defaultPDBFileParser)
{
StructureImportSettings.defaultPDBFileParser = StructureParser
- .valueOf(defaultPDBFileParser);
+ .valueOf(defaultPDBFileParser.toUpperCase());
}
}
}
}