From 59a23c20bf6b35a407c7f9a21256ddec9b33172f Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 7 Jul 2011 15:01:11 +0000
Subject: [PATCH] NIHVIVO-2449 Remove moniker references

---
 .../vitro/webapp/beans/IndividualImpl.java    |  1 -
 .../webapp/edit/n3editing/VTwo/FieldVTwo.java |  3 --
 .../edit/n3editing/configuration/Field.java   |  3 --
 .../configuration/SelectListGenerator.java    | 28 +------------------
 4 files changed, 1 insertion(+), 34 deletions(-)

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 ab3024b86..8e583c588 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
@@ -307,7 +307,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public static final String [] INCLUDED_IN_JSON = {
          "URI",
          "name",
-         "moniker",
          "vClassId"
     };
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/FieldVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/FieldVTwo.java
index bdca658c6..7cd174494 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/FieldVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/FieldVTwo.java
@@ -25,7 +25,6 @@ public class FieldVTwo {
         STRINGS_VIA_DATATYPE_PROPERTY, 
         INDIVIDUALS_VIA_OBJECT_PROPERTY, 
         INDIVIDUALS_VIA_VCLASS, 
-        MONIKERS_VIA_VCLASS, 
         CHILD_VCLASSES, 
         CHILD_VCLASSES_WITH_PARENT,
         VCLASSGROUP,
@@ -286,8 +285,6 @@ public class FieldVTwo {
             return FieldVTwo.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY;
         } else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) {
             return FieldVTwo.OptionsType.INDIVIDUALS_VIA_VCLASS;
-        } else if ("MONIKERS_VIA_VCLASS".equalsIgnoreCase(s)) {
-            return FieldVTwo.OptionsType.MONIKERS_VIA_VCLASS;
         } else if ("DATETIME".equalsIgnoreCase(s)) {
             return FieldVTwo.OptionsType.DATETIME;
         } else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) {            
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/Field.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/Field.java
index 1c3f357fa..674a3ae40 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/Field.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/Field.java
@@ -26,7 +26,6 @@ public class Field {
         STRINGS_VIA_DATATYPE_PROPERTY, 
         INDIVIDUALS_VIA_OBJECT_PROPERTY, 
         INDIVIDUALS_VIA_VCLASS, 
-        MONIKERS_VIA_VCLASS, 
         CHILD_VCLASSES, 
         CHILD_VCLASSES_WITH_PARENT,
         VCLASSGROUP,
@@ -287,8 +286,6 @@ public class Field {
             return Field.OptionsType.INDIVIDUALS_VIA_OBJECT_PROPERTY;
         } else if ("INDIVIDUALS_VIA_VCLASS".equalsIgnoreCase(s)) {
             return Field.OptionsType.INDIVIDUALS_VIA_VCLASS;
-        } else if ("MONIKERS_VIA_VCLASS".equalsIgnoreCase(s)) {
-            return Field.OptionsType.MONIKERS_VIA_VCLASS;
         } else if ("DATETIME".equalsIgnoreCase(s)) {
             return Field.OptionsType.DATETIME;
         } else if ("CHILD_VCLASSES".equalsIgnoreCase(s)) {            
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/SelectListGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/SelectListGenerator.java
index 0382f2949..abc7ddd2c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/SelectListGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/SelectListGenerator.java
@@ -282,33 +282,7 @@ public class SelectListGenerator {
                     }
                 }
                 break;
-            case MONIKERS_VIA_VCLASS: //so we have a vclass URI
-                vclassUri = field.getObjectClassUri();
-                if (vclassUri==null || vclassUri.equals("")){
-                    log.error("no vclassUri found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType MONIKERS_VIA_VCLASS specified");
-                } else {
-                    // first test to see whether there's a default "leave blank" value specified with the literal options
-                    String defaultOption=null;
-                    if ((defaultOption=getDefaultOption(field))!=null) {
-                        optionsMap.put(LEFT_BLANK, defaultOption);
-                    }
-                    // now populate the options                
-                    if( wDaoFact == null ) log.error("could not get WebappDaoFactory from request in SelectListGenerator.getOptions().");
-    
-                    VClass vclass = wDaoFact.getVClassDao().getVClassByURI( vclassUri );
-                    if( vclass == null ) { 
-                        log.error("Cannot find owl:Class " + vclassUri + " in the model" );
-                        optionsMap.put("", "Could not find class " + vclassUri);
-                    }else{                
-                        List<Individual> individuals = wDaoFact.getIndividualDao().getIndividualsByVClassURI(vclass.getURI(),-1,-1);                                   
-                        if (individuals.size()==0){ 
-                            log.error("No individuals of type "+vclass.getName()+" to add to pick list in SelectListGenerator.getOptions(); check portal visibility");
-                            optionsMap.put("", "No " + vclass.getName() + " found");
-                        }
-                    }
-                }
-                break;
-                
+
             case CHILD_VCLASSES: //so we have a vclass URI
                 vclassUri = field.getObjectClassUri();
                 if (vclassUri==null || vclassUri.equals("")){