diff -r c3599e02bf7f -r 18638adda547 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java Thu Jul 29 09:51:07 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java Thu Jul 29 13:28:20 2010 -0500 @@ -76,17 +76,19 @@ loadPortalPages(); } - private Map> loadPortalLayers() { - Map> pageIdToExtensionsMap = new HashMap>(); + private Map>> loadPortalLayers() { + Map>> pageIdToExtensionsMap = + new HashMap>>(); IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".portalPageLayer"); //$NON-NLS-1$ for (IConfigurationElement element : elements) { String pageId = element.getAttribute("pageId"); //$NON-NLS-1$ + String title = element.getAttribute("title"); //$NON-NLS-1$ try { IPortalPageLayer extension = (IPortalPageLayer) element.createExecutableExtension("class"); //$NON-NLS-1$ if (!pageIdToExtensionsMap.containsKey(pageId)) - pageIdToExtensionsMap.put(pageId, new ArrayList()); - pageIdToExtensionsMap.get(pageId).add(extension); + pageIdToExtensionsMap.put(pageId, new ArrayList>()); + pageIdToExtensionsMap.get(pageId).add(new Pair(extension, title)); } catch (CoreException e) { Activator.logError(MessageFormat.format(Messages.PortalEditor_PageLoadError, pageId), e); } @@ -95,7 +97,7 @@ } private void loadPortalPages() { - Map> portalLayersMap = loadPortalLayers(); + Map>> portalLayersMap = loadPortalLayers(); List> pageList = new ArrayList>(); IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(Activator.PLUGIN_ID + ".portalPage"); //$NON-NLS-1$ @@ -115,9 +117,9 @@ String imageFilePath = element.getAttribute("image"); //$NON-NLS-1$ String pluginId = element.getContributor().getName(); ImageDescriptor imageDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, imageFilePath); - List portalLayers = portalLayersMap.get(id); + List> portalLayers = portalLayersMap.get(id); if (portalLayers == null || portalLayers.isEmpty()) { - Activator.logError(MessageFormat.format("Could not load portal page because no layers were found for id: {0}", id), null); + Activator.logError(MessageFormat.format(Messages.PortalEditor_NoLayersError, id), null); } PortalPage portalPage = new PortalPage(title, imageDesc, id, portalLayers); pageList.add(new Pair(portalPage, order));