Undo QR code changes

This commit is contained in:
mbarbier 2011-04-05 18:01:31 +00:00
parent 92068de031
commit 113664680c
4 changed files with 0 additions and 24 deletions

View file

@ -165,11 +165,4 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com
Float getSearchBoost();
void setSearchBoost( Float boost );
/**
* Return the individual that is wrapped by this individual. Implementations that do not wrap an individual should
* simply "return this;". Those which wrap an individual should "return wrapped.getBaseIndividual();".
* @return the wrapped individual
*/
Individual getBaseIndividual();
}

View file

@ -505,9 +505,4 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
public boolean hasThumb() {
return getThumbUrl() != null && ! getThumbUrl().isEmpty();
}
@Override
public Individual getBaseIndividual() {
return this;
}
}

View file

@ -714,9 +714,4 @@ public class IndividualFiltering implements Individual {
public boolean hasThumb() {
return _innerIndividual.hasThumb();
}
@Override
public Individual getBaseIndividual() {
return _innerIndividual.getBaseIndividual();
}
}

View file

@ -29,7 +29,6 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
protected VitroRequest vreq;
protected UrlBuilder urlBuilder;
protected GroupedPropertyList propertyList = null;
protected GroupedPropertyList fullPropertyList = null;
protected LoginStatusBean loginStatusBean = null;
private EditingPolicyHelper policyHelper = null;
@ -114,12 +113,6 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
}
return propertyList;
}
public GroupedPropertyList getFullPropertyList() {
if (fullPropertyList == null) {
fullPropertyList = new GroupedPropertyList(individual.getBaseIndividual(), vreq, policyHelper); //get individual without filtering
}
return fullPropertyList;
}
public boolean isEditable() {
// RY This will be improved later. What is important is not whether the user is a self-editor,