litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-961 Merge 5443 from the branch

Browse source
This commit is contained in:
jeb228 2010-07-23 15:25:33 +00:00
parent 1da043245c
commit 873a40678a
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
View file

@ -39,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Link;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.filestorage.FileModelHelper; import edu.cornell.mannlib.vitro.webapp.filestorage.FileModelHelper;
import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper; import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper;
@ -798,6 +799,34 @@ public class IndividualJena extends IndividualImpl implements Individual {
return vClassList; return vClassList;
} }
/**
* The base method in {@link IndividualImpl} is adequate if the reasoner is
* up to date.
*
* If the base method returns false, check directly to see if
* any of the super classes of the direct classes will satisfy this request.
*/
@Override
public boolean isVClass(String uri) {
if (uri == null) {
return false;
}
if (super.isVClass(uri)) {
return true;
}
VClassDao vclassDao = webappDaoFactory.getVClassDao();
for (VClass vClass : getVClasses(true)) {
for (String superClassUri: vclassDao.getAllSuperClassURIs(vClass.getURI())) {
if (uri.equals(superClassUri)) {
return true;
}
}
}
return false;
}
/** /**
* Overriding the base method so that we can do the sorting by arbitrary property here. An * Overriding the base method so that we can do the sorting by arbitrary property here. An
* IndividualJena has a reference back to the model; everything else is just a dumb bean (for now). * IndividualJena has a reference back to the model; everything else is just a dumb bean (for now).