Do not default on local name or URL when no label is found

Author: arteymix

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

@@ -65,12 +65,6 @@ public String getLabel() {
         if ( label == null ) {
             label = res.getLabel( null );
         }
-        if ( label == null ) {
-            label = res.getLocalName();
-        }
-        if ( label == null ) {
-            label = res.getURI();
-        }
         return label;
     }
 
@@ -113,6 +107,12 @@ public int hashCode() {
     @Override
     public String toString() {
         String s = getLabel();
+        if ( s == null ) {
+            s = res.getLocalName();
+        }
+        if ( s == null ) {
+            s = res.getURI();
+        }
         if ( s == null ) {
             s = res.toString();
         }

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

@@ -28,11 +28,13 @@ public interface OntologyResource extends Comparable<OntologyResource> {
     /**
      * A label, if known, otherwise null.
      */
+    @Nullable
     String getLabel();
 
     /**
      * A URI if known, otherwise null.
      */
+    @Nullable
     String getUri();
 
     /**