Added more protected methods

1 files changed, 29 insertions, 3 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
index 6ad0b611b..d4a8683de 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
@@ -125,7 +125,7 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 			if (menuContributions != null && menuContributions.length > 0) {
 				for (int j = 0; j < menuContributions.length; j++) {
 					if (menuManager == null) {
-						menuManager = new MenuManager(group.getName(), SharedImages.getImageDescriptor(SharedImages.IMG_GROUP), null);
+						menuManager = createMenuManagerForGroup(group);
 					}
 					menuManager.add(menuContributions[j]);
 				}
@@ -137,6 +137,15 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 	}
 
 	/**
+	 * Create a MenuManager for the given {@link IRosterGroup}.
+	 * @param group the IRosterGroup to create the menu manager for.  Will not be <code>null</code>.
+	 * @return the menu manager.  Should not be <code>null</code>.
+	 */
+	protected MenuManager createMenuManagerForGroup(IRosterGroup group) {
+		return new MenuManager(group.getName(), SharedImages.getImageDescriptor(SharedImages.IMG_GROUP), null);
+	}
+
+	/**
 	 * Create contribution items for a given presence container adapter.  Subclasses may override as 
 	 * appropriate to customize the creation of contributions with an alternative strategy.
 	 * @param presenceContainerAdapter the IPresenceContainerAdapter to create contribution items for.  Must not be <code>null</code>.
@@ -148,13 +157,22 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 		IContributionItem[] contributions = createContributionItemsForRoster(roster);
 		if (contributions == null || contributions.length == 0)
 			return NO_CONTRIBUTIONS;
-		MenuManager menuManager = new MenuManager(roster.getUser().getName(), SharedImages.getImageDescriptor(SharedImages.IMG_IDENTITY), null);
+		MenuManager menuManager = createMenuManagerForRoster(roster);
 		for (int i = 0; i < contributions.length; i++) {
 			menuManager.add(contributions[i]);
 		}
 		return new IContributionItem[] {menuManager};
 	}
 
+	/**
+	 * Create a MenuManager for the given {@link IRosterGroup}.
+	 * @param roster the IRosterGroup to create the menu manager for.  Will not be <code>null</code>.
+	 * @return the menu manager.  Should not be <code>null</code>.
+	 */
+	protected MenuManager createMenuManagerForRoster(IRoster roster) {
+		return new MenuManager(roster.getUser().getName(), SharedImages.getImageDescriptor(SharedImages.IMG_IDENTITY), null);
+	}
+
 	private int getNextCommandIdIndex() {
 		commandIdIndex = (commandIdIndex == (maxCommandIds - 1)) ? 0 : commandIdIndex + 1;
 		return commandIdIndex;
@@ -295,7 +313,7 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 				contributions.add(items[j]);
 		}
 		if (contributions.size() > 0) {
-			MenuManager menuManager = new MenuManager(topMenuName, topMenuImageDescriptor, null);
+			MenuManager menuManager = createMenuManagerForTop();
 			IContributionItem[] items = (IContributionItem[]) contributions.toArray(new IContributionItem[] {});
 			for (int i = 0; i < items.length; i++)
 				menuManager.add(items[i]);
@@ -304,4 +322,12 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 		return NO_CONTRIBUTIONS;
 	}
 
+	/**
+	 * Create a MenuManager for the top level menu.
+	 * @return the menu manager.  Should not be <code>null</code>.
+	 */
+	protected MenuManager createMenuManagerForTop() {
+		return new MenuManager(topMenuName, topMenuImageDescriptor, null);
+	}
+
 }