Merge from 1.5-maint

This commit is contained in:
briancaruso 2012-09-21 18:28:21 +00:00
parent fddf1d2af9
commit 367225de91

View file

@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.dwr;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
import javax.servlet.http.HttpServletRequest;
@ -42,14 +42,10 @@ public class VClassDWR {
VitroRequest vreq = new VitroRequest(req);
vclasses = vreq.getWebappDaoFactory().getVClassDao().getVClassesForProperty(vclassURI, propertyURI);
// if( vclasses != null && filterOutUninstanciated ){
// ListIterator<VClass> it = vclasses.listIterator();
// while(it.hasNext()){
// VClass clazz = it.next();
// if( clazz.getEntityCount() == 0 )
// it.remove();
// }
// }
//it seems that filterOutUninstanciated was removed in the RDFService conversion.
Collections.sort(vclasses); //sort vClasses NIHVIVO-3963
return vclasses;
}