JAL-3121 round trip GFF attributes including map-valued attributes

[jalview.git] / src / jalview / io / gff / SequenceOntologyFactory.java

diff --git a/src/jalview/io/gff/SequenceOntologyFactory.java b/src/jalview/io/gff/SequenceOntologyFactory.java
index acf90e7..90cae7a 100644 (file)
--- a/src/jalview/io/gff/SequenceOntologyFactory.java
+++ b/src/jalview/io/gff/SequenceOntologyFactory.java
@@ -1,14 +1,29 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.io.gff;
 
-import jalview.bin.Cache;
-import jalview.ext.so.SequenceOntology;
-
 /**
- * A factory class that returns a model of the Sequence Ontology. If the user's
- * Jalview properties file has the line <br>
- * USE_SO_LITE = true <br>
- * then a hard-coded subset will be used, otherwise the full ontology (as
- * downloaded at a point in time).
+ * A factory class that returns a model of the Sequence Ontology. By default a
+ * hard-coded subset is used (for the applet, or testing), or setInstance() can
+ * be used to set full Ontology data.
  * 
  * @author gmcarstairs
  *
@@ -21,14 +36,7 @@ public class SequenceOntologyFactory
   {
     if (instance == null)
     {
-      if (Cache.getDefault("USE_SO_LITE", false))
-      {
-        instance = new SequenceOntologyLite();
-      }
-      else
-      {
-        instance = new SequenceOntology();
-      }
+      instance = new SequenceOntologyLite();
     }
     return instance;
   }