VIVO-799: only display individuals with rdfs labels in custom form picklists

webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java

@@ -24,6 +24,7 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
      * one of the labels will be returned, which one is undefined.  
      */
     String getRdfsLabel();
+    void setRdfsLabel(String in);
 
     String getVClassURI();
     void setVClassURI(String in);

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java

@@ -345,6 +345,11 @@ public class IndividualFiltering implements Individual {
         _innerIndividual.setName(in);
     }
 
+    @Override
+    public void setRdfsLabel(String in) {
+        _innerIndividual.setRdfsLabel(in);
+    }
+
     @Override
     public void setNamespace(String namespace) {
         _innerIndividual.setNamespace(namespace);

webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java

@@ -278,6 +278,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
                 this.dwf, datasetMode, wadf, 
                 SKIP_INITIALIZATION);
         ent.setName(label);
+		ent.setRdfsLabel(label);
         return ent;
     }
 	

webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java

@@ -129,7 +129,11 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
         for (Individual ind : individuals) {
             String uri = ind.getURI();
             if (uri != null) {
-				String label = ind.getName().trim();
+                // The picklist should only display individuals with rdfs labels. 
+                // SO changing the following line  -- tlw72
+				// String label = ind.getName().trim();
+				String label = ind.getRdfsLabel();				
+				if ( label != null ) {
 					List<String> msTypes = ind.getMostSpecificTypeURIs();
 					if ( hasSubclasses && msTypes.size() > 0 ) {
 						label += " (" + getMsTypeLocalName(msTypes.get(0), wDaoFact) + ")";
@@ -138,6 +142,7 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
                 	++optionsCount;
 				}
             }
+        }
         return optionsMap;
     }