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

Merging r5308, r5320, r5322 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-19 21:37:59 +00:00
parent ddae9bb311
commit a5f60a9f7f
5 changed files with 60 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

80
webapp/src/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
View file

@ -80,51 +80,55 @@ public class MiscWebUtils {
return (String) contentObj;
}
// Get custom short view from either the object's class or one of its
// superclasses.
// This is needed because the inference update happens asynchronously, so
// when a new
// property has been added and the page is reloaded, the custom short view
// from a
// superclass may not have been inferred yet.
public static String getCustomShortView(HttpServletRequest request) {
VitroRequest vreq = new VitroRequest(request);
VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();
String customShortView = null;
Individual object = ((ObjectPropertyStatement) request
.getAttribute("opStmt")).getObject();
List<VClass> vclasses = object.getVClasses(true); // get directly
// asserted vclasses
Set<String> superClasses = new HashSet<String>();
return getCustomShortView(object, request);
}
// First try directly asserted classes, there is no useful decision
// mechanism for
// the case where two directly asserted classes have a custom short
// view.
for (VClass vclass : vclasses) {
// Use this class's custom short view, if there is one
customShortView = vclass.getCustomShortView();
if (customShortView != null) {
return customShortView;
}
// Otherwise, add superclass to list of vclasses to check for custom
// short views
String vclassUri = vclass.getURI();
superClasses.addAll(vcDao.getAllSuperClassURIs(vclassUri));
}
// Get custom short view from either the object's class or one of its
// superclasses. This is needed because the inference update happens asynchronously,
// so when a new property has been added and the page is reloaded, the custom short view
// from a superclass may not have been inferred yet.
// Next try super classes. There is no useful decision mechanism for
// the case where two super classes have a custom short view.
for (String superClassUri : superClasses) {
VClass vc = vcDao.getVClassByURI(superClassUri);
customShortView = vc.getCustomShortView();
if (customShortView != null) {
return customShortView;
}
}
public static String getCustomShortView(Individual individual, HttpServletRequest request) {
VitroRequest vreq = new VitroRequest(request);
VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();
String customShortView = null;
List<VClass> vclasses = individual.getVClasses(true); // get directly
// asserted vclasses
Set<String> superClasses = new HashSet<String>();
// First try directly asserted classes, there is no useful decision
// mechanism for the case where two directly asserted classes
// have a custom short view.
// RY If we're getting the custom short view with reference to an object property.
// should we use the property's getRangeVClass() method instead?
for (VClass vclass : vclasses) {
// Use this class's custom short view, if there is one
customShortView = vclass.getCustomShortView();
if (customShortView != null) {
return customShortView;
}
// Otherwise, add superclass to list of vclasses to check for custom
// short views
String vclassUri = vclass.getURI();
superClasses.addAll(vcDao.getAllSuperClassURIs(vclassUri));
}
// Next try super classes. There is no useful decision mechanism for
// the case where two super classes have a custom short view.
for (String superClassUri : superClasses) {
VClass vc = vcDao.getVClassByURI(superClassUri);
customShortView = vc.getCustomShortView();
if (customShortView != null) {
return customShortView;
}
}
return null;
return null;
}
/**

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java
View file

@ -432,6 +432,12 @@ public class InputElementFormattingTag extends TagSupport {
out.print("<input "+classStr+" "+sizeStr+" type=\"text\" id=\""+getId()+"\" name=\""+getName()+"\" value=\""+valueStr+"\" />");
if (definitionTags) { out.print("</dd>"); }
out.println();
} else if( getType().equalsIgnoreCase("hidden")) {
String valueStr = doValue(editConfig, editSub);
if (definitionTags) { out.print("<dd>"); }
out.print("<input "+classStr+ "type=\"hidden\" id=\""+getId()+"\" name=\""+getName()+"\" value=\""+valueStr+"\" />");
if (definitionTags) { out.print("</dd>"); }
out.println();
} else if (getType().equalsIgnoreCase("textarea")) {
String valueStr = doValue(editConfig, editSub);
String rowStr = doRows();