From 912a063a4b7c80e3ae27f8d87979116a9913435f Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 10 Dec 2012 13:37:49 -0500
Subject: [PATCH] removed call to IndividualsViaVClassOptions for autocomplete
 fields.

---
 .../generators/AddPresenterRoleToPersonGenerator.java  | 10 ++++------
 .../PersonHasAdvisingRelationshipGenerator.java        | 10 ++++------
 .../generators/PersonHasAwardOrHonorGenerator.java     |  8 +++-----
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
index 217aa51a..1cab984d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
@@ -101,9 +101,8 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
         conf.addSparqlForExistingUris("endField-precision", 
                 existingEndPrecisionQuery);
         
-        conf.addField( new FieldVTwo().
-                setName("existingPresentation").
-                setOptions(new IndividualsViaVClassOptions(presentationClass))                
+        conf.addField( new FieldVTwo(). // an autocomplete field
+                setName("existingPresentation") 
                 );
 
         conf.addField( new FieldVTwo().                        
@@ -131,9 +130,8 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
                 setValidators( list("nonempty") )
                 );
 
-        conf.addField( new FieldVTwo().
-                setName("existingConference").
-                setOptions(new IndividualsViaVClassOptions(conferenceClass))
+        conf.addField( new FieldVTwo(). // an autocomplete field
+                setName("existingConference") 
                 );
         
         conf.addField( new FieldVTwo().
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java
index 3adc2f2d..e7159579 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java
@@ -126,10 +126,8 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
 
-        conf.addField( new FieldVTwo().
-                setName("existingSubjArea").
-                setOptions(
-                        new IndividualsViaVClassOptions(subjAreaClass))
+        conf.addField( new FieldVTwo(). // options set by auto complete JS
+                setName("existingSubjArea") 
                 );             
 
         conf.addField( new FieldVTwo().
@@ -141,10 +139,10 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
         conf.addField( new FieldVTwo().
                 setName("degree").
                 setOptions( 
-                        new IndividualsViaVClassOptions(degreeClass))
+                    new IndividualsViaVClassOptions(degreeClass))
                 );
 
-        conf.addField( new FieldVTwo(). //options set by auto complete JS
+        conf.addField( new FieldVTwo(). // options set by auto complete JS
                 setName("existingAdvisee")                
         );                
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
index 1ef0210c..0e911d07 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
@@ -109,14 +109,12 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
                 setValidators( list("datatype:" + XSD.xstring.toString()) )
                 );
 
-        conf.addField( new FieldVTwo().//options will be added in browser by auto complete JS
+        conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
                 setName("existingOrg")      
         );
 
-        conf.addField( new FieldVTwo().
-                setName("existingAward").
-                setOptions( new IndividualsViaVClassOptions(
-                        awardClass))
+        conf.addField( new FieldVTwo(). // options will be added in browser by auto complete JS
+                setName("existingAward")
         );        
 
         conf.addField( new FieldVTwo().