litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from dgcliff/develop

Browse source 
Fix for HashMap out of order bug raised by Rohan Mathure. VIVO-21
This commit is contained in:
Jim Blake 2013-02-04 11:11:16 -08:00
commit 9bba099882
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -5,7 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.HashMap; //import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -129,7 +130,7 @@ public class UrlBuilder {
return getUrl(Route.LOGOUT); return getUrl(Route.LOGOUT);
} }
public static class ParamMap extends HashMap<String, String> { public static class ParamMap extends LinkedHashMap<String, String> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public ParamMap() { } public ParamMap() { }
@ -276,7 +277,7 @@ public class UrlBuilder {
} }
if (profileUrl != null) { if (profileUrl != null) {
HashMap<String, String> specialParams = getModelParams(vreq); LinkedHashMap<String, String> specialParams = getModelParams(vreq);
if(specialParams.size() != 0) { if(specialParams.size() != 0) {
profileUrl = addParams(profileUrl, new ParamMap(specialParams)); profileUrl = addParams(profileUrl, new ParamMap(specialParams));
} }
@ -325,9 +326,9 @@ public class UrlBuilder {
//To be used in different property templates so placing method for reuse here //To be used in different property templates so placing method for reuse here
//Check if special params included, specifically for menu management and other models //Check if special params included, specifically for menu management and other models
public static HashMap<String,String> getModelParams(VitroRequest vreq) { public static LinkedHashMap<String,String> getModelParams(VitroRequest vreq) {
HashMap<String,String> specialParams = new HashMap<String, String>(); LinkedHashMap<String,String> specialParams = new LinkedHashMap<String, String>();
if(vreq != null) { if(vreq != null) {
//this parameter is sufficient to switch to menu model //this parameter is sufficient to switch to menu model
String useMenuModelParam = vreq.getParameter(DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL); String useMenuModelParam = vreq.getParameter(DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL);