From 21a36706a43f19ed6c570ccbba8524ed81c7d53a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 23:14:33 +0000
Subject: [PATCH] NIHVIVO-799 Use LinkedHashMap in SelectListGenerator so order
 of HARDCODED_LITERALS select is exactly as specified.

---
 .../edit/forms/addHeadOfRoleToPerson.jsp      | 54 +++++++++----------
 .../edit/forms/addOutreachRoleToPerson.jsp    | 54 +++++++++----------
 .../forms/addServiceProviderRoleToPerson.jsp  | 54 +++++++++----------
 3 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
index 50a7e632..85167fc2 100644
--- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp
+++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
@@ -8,34 +8,34 @@
 	<jsp:param name="roleActivityType_objectClassUri" value="" />
 	 
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["", "Select one"],	
-	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
-	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
-	       [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+    value='["", "Select one"],
+           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
+           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
+           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#College", "College" ],
+           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
+           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
+           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
+           [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
+           [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
+           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
+           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
+           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
+           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
+           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
+           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
+           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
+           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],        
+           [ "http://xmlns.com/foaf/0.1/Organization", "Organization" ],
+           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
+           [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+           [ "http://vivoweb.org/ontology/core#Project", "Project" ],
+           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
+           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
            [ "http://vivoweb.org/ontology/core#School", "School" ],
-           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
-           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
-           [ "http://vivoweb.org/ontology/core#Division", "Division" ],
-           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
-           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
-           [ "http://vivoweb.org/ontology/core#College", "College" ],
-           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
-           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
-           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
-           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
-           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
-           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
-           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],
+           [ "http://vivoweb.org/ontology/core#Service","Service"],
            [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
-           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
-           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
-           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
-           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
-           [ "http://vivoweb.org/ontology/core#University", "University" ],	       	       	       	      
-	       [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+           [ "http://vivoweb.org/ontology/core#University", "University" ]' />  
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp
index 3b43caac..d8896b4f 100644
--- a/productMods/edit/forms/addOutreachRoleToPerson.jsp
+++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp
@@ -7,34 +7,34 @@
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["", "Select one"],
-	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
-	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
-	       [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+    value='["", "Select one"],
+           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
+           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
+           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#College", "College" ],
+           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
+           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
+           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
+           [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
+           [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
+           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
+           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
+           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
+           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
+           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
+           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
+           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
+           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],        
+           [ "http://xmlns.com/foaf/0.1/Organization", "Organization" ],
+           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
+           [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+           [ "http://vivoweb.org/ontology/core#Project", "Project" ],
+           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
+           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
            [ "http://vivoweb.org/ontology/core#School", "School" ],
-           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
-           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
-           [ "http://vivoweb.org/ontology/core#Division", "Division" ],
-           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
-           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
-           [ "http://vivoweb.org/ontology/core#College", "College" ],
-           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
-           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
-           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
-           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
-           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
-           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
-           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],
+           [ "http://vivoweb.org/ontology/core#Service","Service"],
            [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
-           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
-           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
-           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
-           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
-           [ "http://vivoweb.org/ontology/core#University", "University" ],	       	       	       	      
-	       [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+           [ "http://vivoweb.org/ontology/core#University", "University" ]' /> 
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
index a7cddffa..c483a58f 100644
--- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
+++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
@@ -7,34 +7,34 @@
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 	
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["", "Select one"],
-	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
-	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
-	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
-	       [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+    value='["", "Select one"],
+           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
+           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
+           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
+           [ "http://vivoweb.org/ontology/core#College", "College" ],
+           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],                     
+           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
+           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
+           [ "http://vivoweb.org/ontology/core#Division", "Division" ], 
+           [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
+           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
+           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
+           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
+           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
+           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
+           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
+           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
+           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
+           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],        
+           [ "http://xmlns.com/foaf/0.1/Organization", "Organization" ],
+           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
+           [ "http://vivoweb.org/ontology/core#Program", "Program" ],
+           [ "http://vivoweb.org/ontology/core#Project", "Project" ],
+           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
+           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
            [ "http://vivoweb.org/ontology/core#Team", "Team" ],
            [ "http://vivoweb.org/ontology/core#School", "School" ],
-           [ "http://vivoweb.org/ontology/core#Foundation", "Foundation" ],
-           [ "http://vivoweb.org/ontology/core#PrivateCompany", "Private Company" ],
-           [ "http://vivoweb.org/ontology/core#Division", "Division" ],
-           [ "http://vivoweb.org/ontology/core#ResearchOrganization", "Research Organization" ],
-           [ "http://vivoweb.org/ontology/core#Extension Unit", "Extension Unit" ],
-           [ "http://vivoweb.org/ontology/core#Library", "Library" ],
-           [ "http://vivoweb.org/ontology/core#College", "College" ],
-           [ "http://vivoweb.org/ontology/core#FundingOrganization", "Funding Organization" ],
-           [ "http://vivoweb.org/ontology/core#Publisher", "Publisher" ],
-           [ "http://vivoweb.org/ontology/core#GovernmentAgency", "Government Agency" ],
-           [ "http://vivoweb.org/ontology/core#Association", "Association" ],
-           [ "http://vivoweb.org/ontology/core#Committee", "Committee" ],
-           [ "http://vivoweb.org/ontology/core#Department", "Department" ],
-           [ "http://vivoweb.org/ontology/core#Clinical Organization", "Clinical Organization" ],
-           [ "http://vivoweb.org/ontology/core#Museum", "Museum" ],
+           [ "http://vivoweb.org/ontology/core#Service","Service"],
            [ "http://vivoweb.org/ontology/core#Student Organization", "Student Organization" ],
-           [ "http://vivoweb.org/ontology/core#Laboratory", "Laboratory" ],
-           [ "http://vivoweb.org/ontology/core#Center", "Center" ],
-           [ "http://vivoweb.org/ontology/core#Hospital", "Hospital" ],
-           [ "http://vivoweb.org/ontology/core#Consortium", "Consortium" ],
-           [ "http://vivoweb.org/ontology/core#Institute", "Institute" ],
-           [ "http://vivoweb.org/ontology/core#University", "University" ],	       	       	       	      
-	       [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+           [ "http://vivoweb.org/ontology/core#University", "University" ]' />  
 </jsp:include>
\ No newline at end of file