From 113664680c356eeda57d311cca04b719e69c7890 Mon Sep 17 00:00:00 2001 From: mbarbier Date: Tue, 5 Apr 2011 18:01:31 +0000 Subject: [PATCH] Undo QR code changes --- .../edu/cornell/mannlib/vitro/webapp/beans/Individual.java | 7 ------- .../cornell/mannlib/vitro/webapp/beans/IndividualImpl.java | 5 ----- .../vitro/webapp/dao/filtering/IndividualFiltering.java | 5 ----- .../individual/BaseIndividualTemplateModel.java | 7 ------- 4 files changed, 24 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java index 6aa2f1234..7fd075d3e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java @@ -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(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java index f5ee0534e..c6fd97c76 100755 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java @@ -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; - } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java index d2f79b9ad..7b7948fd9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java @@ -714,9 +714,4 @@ public class IndividualFiltering implements Individual { public boolean hasThumb() { return _innerIndividual.hasThumb(); } - - @Override - public Individual getBaseIndividual() { - return _innerIndividual.getBaseIndividual(); - } } \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java index 0a3552f40..f12736ddd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java @@ -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,