Deprecate getTerm() in OntologyTerm in favour of getLabel()

Author: arteymix

src/ubic/basecode/ontology/jena/OntologyTermImpl.java

@@ -194,16 +194,8 @@ public Collection<OntologyRestriction> getRestrictions() {
      */
     @Override
     public String getTerm() {
-        String res;
-        String label = getLabel();
-        String localName = getLocalName();
-        if ( label != null ) {
-            res = label;
-        } else if ( localName != null ) {
-            res = localName;
-        } else if ( this.getUri() != null ) {
-            res = this.getUri();
-        } else {
+        String res = getLabel();
+        if ( res == null ) {
             res = ontResource.toString();
         }
         return res;

src/ubic/basecode/ontology/model/OntologyResource.java

@@ -25,8 +25,14 @@
  */
 public interface OntologyResource extends Serializable, Comparable<OntologyResource> {
 
+    /**
+     * A label, if known, otherwise null.
+     */
     String getLabel();
 
+    /**
+     * A URI if known, otherwise null.
+     */
     String getUri();
 
     /**

src/ubic/basecode/ontology/model/OntologyTerm.java

@@ -80,6 +80,10 @@ default Collection<OntologyTerm> getParents( boolean direct, boolean includeAddi
 
     Collection<OntologyRestriction> getRestrictions();
 
+    /**
+     * @deprecated use {@link #getLabel()} instead.
+     */
+    @Deprecated
     String getTerm();
 
     boolean isRoot();

src/ubic/basecode/ontology/model/OntologyTermSimple.java

@@ -74,12 +74,12 @@ public Collection<OntologyIndividual> getIndividuals( boolean direct ) {
 
     @Override
     public String getLabel() {
-        return this.getTerm();
+        return term;
     }
 
     @Override
     public String getLocalName() {
-        return this.getTerm();
+        return term;
     }
 
     @Override