From 40ab798c48aa92e3447a6b6988496e4ce9cc5ed8 Mon Sep 17 00:00:00 2001
From: ass92 <ass92@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 5 Nov 2010 15:34:20 +0000
Subject: [PATCH] NIHVIVO-1306 code fix for sorting properties on dropdown.

---
 .../edit/PropertyRetryController.java         | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
index 34ab8633f..70737fe25 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
@@ -4,11 +4,15 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit;
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
@@ -146,7 +150,8 @@ public class PropertyRetryController extends BaseEditController {
 
 
         FormObject foo = new FormObject();
-        foo.setErrorMap(epo.getErrMsgMap());
+        foo.setErrorMap(epo.getErrMsgMap());
+       
 
         HashMap<String, List<Option>> optionMap = new HashMap<String, List<Option>>();
         try {
@@ -158,7 +163,9 @@ public class PropertyRetryController extends BaseEditController {
             optionMap.put("NamespaceInverse", namespaceIdInverseList);
             List<ObjectProperty> objPropList = propDao.getAllObjectProperties();
             Collections.sort(objPropList);
-            List<Option> parentIdList = FormUtils.makeOptionListFromBeans(objPropList,"URI","PickListName",propertyForEditing.getParentURI(),null);
+            List<Option> parentIdList = FormUtils.makeOptionListFromBeans(objPropList,"URI","PickListName",propertyForEditing.getParentURI(),null);
+            HashMap<String,Option> hashMap = new HashMap<String,Option>();
+            parentIdList = getSortedList(hashMap,parentIdList);
             parentIdList.add(0,new Option("-1","none (root property)", false));
             optionMap.put("ParentURI", parentIdList);
             List<DataProperty> dpList = dpDao.getAllDataProperties();
@@ -180,6 +187,8 @@ public class PropertyRetryController extends BaseEditController {
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(propertyForEditing));
 
         List groupOptList = FormUtils.makeOptionListFromBeans(request.getFullWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((propertyForEditing.getGroupURI()==null) ? "" : propertyForEditing.getGroupURI()), null, (propertyForEditing.getGroupURI()!=null));
+        HashMap<String,Option> hashMap = new HashMap<String,Option>();
+        groupOptList = getSortedList(hashMap,groupOptList);
         groupOptList.add(0,new Option("","none"));
         optionMap.put("GroupURI", groupOptList);
         
@@ -267,5 +276,35 @@ public class PropertyRetryController extends BaseEditController {
                 log.error("PropertyInsertPageForwarder could not send redirect.");
             }
         }
-    }
+    }
+    
+    public List<Option> getSortedList(HashMap<String,Option> hashMap, List<Option> optionList){
+    	
+      	 class ListComparator implements Comparator<String>{
+   			@Override
+   			public int compare(String str1, String str2) {
+   				// TODO Auto-generated method stub
+   				Collator collator = Collator.getInstance();
+   				return collator.compare(str1, str2);
+   			}
+           	
+           }
+
+      	List<String> bodyVal = new ArrayList<String>();
+      	List<Option> options = new ArrayList<Option>();
+      	Iterator<Option> itr = optionList.iterator();
+      	 while(itr.hasNext()){
+           	Option option = itr.next();
+           	hashMap.put(option.getBody(),option);
+              bodyVal.add(option.getBody());
+           }
+           
+                   
+          Collections.sort(bodyVal, new ListComparator());
+          ListIterator<String> itrStr = bodyVal.listIterator();
+          while(itrStr.hasNext()){
+          	options.add(hashMap.get(itrStr.next()));
+          }
+          return options;
+      }
 }