VIVO-376 picklist sorting

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java

@@ -70,7 +70,7 @@ public class DatapropEditController extends BaseEditController {
 
         RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
 
-        results.add(dp.getLocalNameWithPrefix()); // column 1
+        results.add(dp.getPickListName()); // column 1
         results.add(dp.getPublicName() == null ? "(no public label)" : dp.getPublicName()); // column 2
         
         if (dp.getGroupURI() != null) {

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java

@@ -96,6 +96,7 @@ public class EntityEditController extends BaseEditController {
         
         String classStr = "";
         List<VClass> classList = inferredEnt.getVClasses(false);
+        sortForPickList(classList, vreq);
         if (classList != null) {
 	        for (Iterator<VClass> classIt = classList.iterator(); classIt.hasNext();) {
 	        	VClass vc = classIt.next();
@@ -103,7 +104,7 @@ public class EntityEditController extends BaseEditController {
 	            try {
 	                rClassName = "<a href=\"vclassEdit?uri=" +
 	                		URLEncoder.encode(vc.getURI(),"UTF-8")+"\">" + 
-	                		vc.getLocalNameWithPrefix()+"</a>";
+	                		vc.getPickListName()+"</a>";
 	            } catch (Exception e) {
 	                rClassName = vc.getLocalNameWithPrefix();
 	            }
@@ -131,7 +132,9 @@ public class EntityEditController extends BaseEditController {
         FormObject foo = new FormObject();
         HashMap<String, List<Option>> OptionMap = new HashMap<String, List<Option>>();
         
-        request.setAttribute("types",ent.getVClasses(false)); // we're displaying all assertions, including indirect types
+        List<VClass> types = ent.getVClasses(false);
+        sortForPickList(types, vreq);
+        request.setAttribute("types", types); // we're displaying all assertions, including indirect types
         
         try {
             List<Option> externalIdOptionList = new LinkedList<Option>();

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java

@@ -65,27 +65,26 @@ public class IndividualTypeRetryController extends BaseEditController {
         
 		List<VClass> allVClasses = vcDao.getAllVclasses();
 	    sortForPickList(allVClasses, vreq);
-		Set<String> allClassURISet = new HashSet<String>();
-		Map<String,String> classNameMap = new HashMap<String,String>();
-		for (Iterator allClassIt = allVClasses.iterator(); allClassIt.hasNext(); ) {
-			VClass vc = (VClass) allClassIt.next();
-			classNameMap.put(vc.getURI(),vc.getPickListName());
-			allClassURISet.add(vc.getURI());
-		}
-
-		allVClasses = null;
 			
+		Set<String> prohibitedURIset = new HashSet<String>();
 		for (Iterator<VClass> indClassIt = ind.getVClasses(false).iterator(); indClassIt.hasNext(); ) {
 			VClass vc = indClassIt.next();
-			allClassURISet.remove(vc.getURI());
+			if(vc.isAnonymous()) {
+			    continue;
+			}
+			prohibitedURIset.add(vc.getURI());
 			for (Iterator<String> djURIIt = vcDao.getDisjointWithClassURIs(vc.getURI()).iterator(); djURIIt.hasNext(); ) {
 				String djURI = djURIIt.next();
-				allClassURISet.remove(djURI);
+	            prohibitedURIset.add(djURI);
 			}
 		}
 		
-		List<String> classURIList = new LinkedList<String>();
+		List<VClass> eligibleVClasses = new ArrayList<VClass>();
-		classURIList.addAll(allClassURISet);
+		for (VClass vc : allVClasses) {
+		    if(vc.getURI() != null && !(prohibitedURIset.contains(vc.getURI()))) {
+		        eligibleVClasses.add(vc);
+		    }
+		}
 		
 		FormObject foo = new FormObject();
 		epo.setFormObject(foo);
@@ -93,9 +92,8 @@ public class IndividualTypeRetryController extends BaseEditController {
 		foo.setOptionLists(optionMap);
 
 		List<Option> typeOptionList = new ArrayList<Option>(); 
-		for (Iterator<String> classURIIt = classURIList.iterator(); classURIIt.hasNext();) {
+		for (VClass vc : eligibleVClasses) {
-			String classURI = classURIIt.next();
+			Option opt = new Option(vc.getURI(), vc.getPickListName());
-			Option opt = new Option(classURI,classNameMap.get(classURI));
 			typeOptionList.add(opt);
 		}
 		

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java

@@ -79,7 +79,7 @@ public class PropertyEditController extends BaseEditController {
         results.add("sort direction");        // column 23
         results.add("URI");                   // column 24
 
-        results.add(p.getLocalNameWithPrefix()); // column 1
+        results.add(p.getPickListName()); // column 1
         
         String parentPropertyStr = "";
         if (p.getParentURI() != null) {

webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java

@@ -116,7 +116,7 @@ public class VclassEditController extends BaseEditController {
         
         String uri = (vcl.getURI() == null) ? "" : vcl.getURI();
         
-        results.add(vcl.getLocalNameWithPrefix());                                // 1
+        results.add(vcl.getPickListName());                                // 1
         results.add(vcl.getName() == null ? "(no public label)" : vcl.getName()); // 2
         results.add(groupName);                                                   // 3
         results.add(ontologyName==null ? "(not identified)" : ontologyName);      // 4

webapp/web/templates/edit/specific/ents_edit.jsp

@@ -127,7 +127,7 @@
 				<c:url var="typeURL" value="/vclassEdit">
 					<c:param name="uri" value="${type.URI}"/>
 				</c:url>
-				<li><input type="checkbox" name="TypeURI" value="${type.URI}" class="form-item"/><a href="${typeURL}"> ${type.localNameWithPrefix} </a></li>
+				<li><input type="checkbox" name="TypeURI" value="${type.URI}" class="form-item"/><a href="${typeURL}"> ${type.pickListName} </a></li>
 			</c:forEach>	
 			</ul>
 			<input type="hidden" name="individualURI" value="${individual.URI}"/>