Index: rwiki/rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/bean/ReferencesBean.java =================================================================== --- rwiki/rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/bean/ReferencesBean.java (revision 50882) +++ rwiki/rwiki-tool/tool/src/java/uk/ac/cam/caret/sakai/rwiki/tool/bean/ReferencesBean.java (working copy) @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.TreeMap; import org.sakaiproject.entity.api.Entity; @@ -69,6 +70,7 @@ String referenced = rwikiObject.getReferenced(); String[] references = referenced.split("::"); List referenceLinks = new ArrayList(references.length); + TreeMap tmLinks = new TreeMap (); ViewBean vb = new ViewBean(rwikiObject.getName(), defaultSpace); vb.setLocalSpace(vb.getPageSpace()); for (int i = 0; i < references.length; i++) @@ -77,12 +79,20 @@ if (pageName != null && !pageName.equals("")) { vb.setPageName(pageName); - String link = "" - + XmlEscaper.xmlEscape(vb.getLocalName()) + ""; - referenceLinks.add(link); + tmLinks.put(vb.getLocalName(),vb.getViewUrl()); } } + + Iterator tmiter = tmLinks.keySet().iterator(); + while (tmiter.hasNext()) { + String objLocalName = (String) tmiter.next(); + String objViewUrl = (String) tmLinks.get(objLocalName); + String link = "" + + XmlEscaper.xmlEscape(objLocalName) + ""; + referenceLinks.add(link); + } + return referenceLinks; }