From 1fd6c838a149182c92615931371279fefedd4a05 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 5 Jun 2012 16:00:14 +0000
Subject: [PATCH] NIHVIVO 1831

---
 .../edit/DatapropEditController.java          | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index 8f2f8a172..8b2a9e45b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -1,44 +1,44 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
 package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.controller.BaseEditController;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 
 public class DatapropEditController extends BaseEditController {
 	
 	private static final Log log = LogFactory.getLog(DatapropEditController.class.getName());
 
-    public void doPost (HttpServletRequest request, HttpServletResponse response) {
-        if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
-        	return;
-        }
-
-    	VitroRequest vreq = new VitroRequest(request);
+    public void doPost (HttpServletRequest request, HttpServletResponse response) {
+        if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
+        	return;
+        }
+
+    	VitroRequest vreq = new VitroRequest(request);
     	
         final int NUM_COLS=15;
 
@@ -56,7 +56,7 @@ public class DatapropEditController extends BaseEditController {
         results.add("range datatype");
         results.add("group");
         results.add("display tier");
-        results.add("display limit");
+        results.add("data entry limit");
         results.add("example");
         results.add("description");
         results.add("public description");
@@ -169,8 +169,8 @@ public class DatapropEditController extends BaseEditController {
             }
         }
         request.setAttribute("equivalentProperties", eqProperties);
-        
-        ApplicationBean appBean = vreq.getAppBean();
+        
+        ApplicationBean appBean = vreq.getAppBean();
         
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("datatypeProperty", dp);