import java.util.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
-import java.util.Vector;
/**
*
{
url = url + SEP + st.nextToken();
}
- urls.put(name, new UrlLink(name + SEP + url));
+ urls.put(name, new UrlLink(name, url, name));
}
}
upgradeOldLinks(urls);
{
Map.Entry<String, String> pair = it.next();
urls.put(pair.getKey(),
- new UrlLink(pair.getKey() + SEP + pair.getValue()));
+ new UrlLink(pair.getKey(), pair.getValue(),
+ pair.getKey()));
}
upgradeOldLinks(urls);
return urls;
if (urls.containsKey(SRS_LABEL))
{
urls.remove(SRS_LABEL);
- urls.put(UrlConstants.DEFAULT_LABEL, new UrlLink(UrlConstants.DEFAULT_STRING));
+ UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
+ link.setLabel(UrlConstants.DEFAULT_LABEL);
+ urls.put(UrlConstants.DEFAULT_LABEL, link);
}
}
@Override
- public Vector<String> getLinksForMenu()
+ public List<String> getLinksForMenu()
{
- Vector<String> links = new Vector<String>();
+ List<String> links = new ArrayList<String>();
Iterator<Map.Entry<String, UrlLink>> it = selectedUrls.entrySet()
.iterator();
while (it.hasNext())
if (link.getIsSelected())
{
selurls.put(link.getId(),
- new UrlLink(link.getName() + SEP + link.getUrl()));
+ new UrlLink(link.getDescription(), link.getUrl(), link.getDescription()));
}
else
{
- unselurls.put(link.getId(), new UrlLink(link.getName() + SEP
- + link.getUrl()));
+ unselurls
+ .put(link.getId(),
+ new UrlLink(link.getDescription(), link.getUrl(), link
+ .getDescription()));
}
// sort out primary and selected ids
if (link.getIsPrimary())
if ((!nonselectedUrls.containsKey(UrlConstants.DEFAULT_LABEL))
&& (!selectedUrls.containsKey(UrlConstants.DEFAULT_LABEL)))
{
- selectedUrls.put(UrlConstants.DEFAULT_LABEL, new UrlLink(
- UrlConstants.DEFAULT_STRING));
+ UrlLink link = new UrlLink(UrlConstants.DEFAULT_STRING);
+ link.setLabel(UrlConstants.DEFAULT_LABEL);
+ selectedUrls.put(UrlConstants.DEFAULT_LABEL, link);
}
primaryUrl = UrlConstants.DEFAULT_LABEL;
return UrlConstants.DEFAULT_LABEL;