From 04f244baef89fa6e3684e0adddaf20249576587b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 17 Dec 2010 17:59:00 +0000
Subject: [PATCH] Removed the concept of a default object property data
 preprocessor, since profile urls are now handled elsewhere.

---
 .../BaseObjectPropertyDataPreprocessor.java   | 21 +++----------------
 ...DefaultObjectPropertyDataPreprocessor.java |  2 +-
 .../ObjectPropertyDataPreprocessor.java       |  2 +-
 .../ObjectPropertyTemplateModel.java          |  2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPreprocessor.java
index a2b1133dd..d54bd2be2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPreprocessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPreprocessor.java
@@ -5,10 +5,9 @@ import java.util.List;
 import java.util.Map;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
-public class BaseObjectPropertyDataPreprocessor implements
+public abstract class BaseObjectPropertyDataPreprocessor implements
         ObjectPropertyDataPreprocessor {
 
     protected ObjectPropertyTemplateModel objectPropertyTemplateModel;
@@ -23,28 +22,14 @@ public class BaseObjectPropertyDataPreprocessor implements
     @Override
     public void process(List<Map<String, String>> data) {
         for (Map<String, String> map : data) {
-            applyStandardPreprocessing(map);
-            applyPropertySpecificPreprocessing(map);            
+            process(map);           
         }
     }
     
-    /* Standard preprocessing that applies to all views. */
-    protected void applyStandardPreprocessing(Map<String, String> map) {
-        /* none identified yet */
-    }
-    
-    protected void applyPropertySpecificPreprocessing(Map<String, String> map) { 
-        /* Base class method is empty because this method is defined 
-         * to apply subclass preprocessing. 
-         */        
-    }
+    protected abstract void process(Map<String, String> map);
      
     /* Preprocessor helper methods callable from any preprocessor */
     
-    protected String getLink(String uri) {
-        return UrlBuilder.getIndividualProfileUrl(uri, wdf);
-    }
-    
     protected String getMoniker(String uri) {
         return getIndividual(uri).getMoniker();
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPreprocessor.java
index 1b5db160f..d3bf2a21a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPreprocessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPreprocessor.java
@@ -15,7 +15,7 @@ public class DefaultObjectPropertyDataPreprocessor extends
 
     @Override
     /* Apply preprocessing specific to this preprocessor */
-    protected void applyPropertySpecificPreprocessing(Map<String, String> map) {
+    protected void process(Map<String, String> map) {
         addName(map);
         addMoniker(map);
     }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPreprocessor.java
index 4b35a34cf..fee3936a8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPreprocessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPreprocessor.java
@@ -16,5 +16,5 @@ import java.util.Map;
 public interface ObjectPropertyDataPreprocessor {
 
     public void process(List<Map<String, String>> data);
-   
+
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index 26c038054..7bbee6f4a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -71,7 +71,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     protected void preprocess(List<Map<String, String>> data, WebappDaoFactory wdf) {
         String preprocessorName = config.preprocessor;
         if (preprocessorName == null) {
-            preprocessorName = DEFAULT_PREPROCESSOR;
+            return;
         }
 
         try {