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-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
datamodel
/
features
/
FeatureAttributes.java
diff --git
a/src/jalview/datamodel/features/FeatureAttributes.java
b/src/jalview/datamodel/features/FeatureAttributes.java
index
7acebee
..
f51fe48
100644
(file)
--- a/
src/jalview/datamodel/features/FeatureAttributes.java
+++ b/
src/jalview/datamodel/features/FeatureAttributes.java
@@
-1,5
+1,8
@@
package jalview.datamodel.features;
package jalview.datamodel.features;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@
-12,14
+15,23
@@
import java.util.TreeMap;
/**
* A singleton class to hold the set of attributes known for each feature type
*/
/**
* A singleton class to hold the set of attributes known for each feature type
*/
-public class FeatureAttributes
+public class FeatureAttributes implements ApplicationSingletonI
{
public enum Datatype
{
Character, Number, Mixed
}
{
public enum Datatype
{
Character, Number, Mixed
}
- private static FeatureAttributes instance = new FeatureAttributes();
+ public static FeatureAttributes getInstance()
+ {
+ return (FeatureAttributes) ApplicationSingletonProvider
+ .getInstance(FeatureAttributes.class);
+ }
+
+ private FeatureAttributes()
+ {
+ attributes = new HashMap<>();
+ }
/*
* map, by feature type, of a map, by attribute name, of
/*
* map, by feature type, of a map, by attribute name, of
@@
-173,21
+185,6
@@
public class FeatureAttributes
}
/**
}
/**
- * Answers the singleton instance of this class
- *
- * @return
- */
- public static FeatureAttributes getInstance()
- {
- return instance;
- }
-
- private FeatureAttributes()
- {
- attributes = new HashMap<>();
- }
-
- /**
* Answers the attribute names known for the given feature type, in
* alphabetical order (not case sensitive), or an empty set if no attributes
* are known. An attribute name is typically 'simple' e.g. "AC", but may be
* Answers the attribute names known for the given feature type, in
* alphabetical order (not case sensitive), or an empty set if no attributes
* are known. An attribute name is typically 'simple' e.g. "AC", but may be