Merge from 1.5-maint
This commit is contained in:
parent
fddf1d2af9
commit
367225de91
1 changed files with 6 additions and 10 deletions
|
@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.dwr;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ListIterator;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
@ -42,15 +42,11 @@ public class VClassDWR {
|
||||||
VitroRequest vreq = new VitroRequest(req);
|
VitroRequest vreq = new VitroRequest(req);
|
||||||
|
|
||||||
vclasses = vreq.getWebappDaoFactory().getVClassDao().getVClassesForProperty(vclassURI, propertyURI);
|
vclasses = vreq.getWebappDaoFactory().getVClassDao().getVClassesForProperty(vclassURI, propertyURI);
|
||||||
// if( vclasses != null && filterOutUninstanciated ){
|
|
||||||
// ListIterator<VClass> it = vclasses.listIterator();
|
//it seems that filterOutUninstanciated was removed in the RDFService conversion.
|
||||||
// while(it.hasNext()){
|
|
||||||
// VClass clazz = it.next();
|
Collections.sort(vclasses); //sort vClasses NIHVIVO-3963
|
||||||
// if( clazz.getEntityCount() == 0 )
|
|
||||||
// it.remove();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
return vclasses;
|
return vclasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue