Removed xml markup for command creation. Now done programmatically

2 files changed, 2 insertions, 203 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.presence.ui/plugin.xml
index 653609cf2..9b1e9fb58 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/plugin.xml
@@ -116,206 +116,6 @@
             id="org.eclipse.ecf.presence.ui.commands.browse"
             name="Open Contact">
       </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.0"
-            name="command 0">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.1"
-            name="command 1">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.2"
-            name="command 2">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.3"
-            name="command 3">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.4"
-            name="command 4">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.5"
-            name="command 5">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.6"
-            name="command 6">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.7"
-            name="command 7">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.8"
-            name="command 8">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.9"
-            name="command 9">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.10"
-            name="command 10">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.11"
-            name="command 11">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.12"
-            name="command 12">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.13"
-            name="command 13">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.14"
-            name="command 14">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.15"
-            name="command 15">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.16"
-            name="command 16">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.17"
-            name="command 17">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.18"
-            name="command 18">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.19"
-            name="command 19">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.20"
-            name="command 20">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.21"
-            name="command 21">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.22"
-            name="command 22">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.23"
-            name="command 23">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.24"
-            name="command 24">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.25"
-            name="command 25">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.26"
-            name="command 26">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.27"
-            name="command 27">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.28"
-            name="command 28">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.29"
-            name="command 29">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.30"
-            name="command 30">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.31"
-            name="command 31">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.32"
-            name="command 32">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.33"
-            name="command 33">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.34"
-            name="command 34">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.35"
-            name="command 35">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.36"
-            name="command 36">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.37"
-            name="command 37">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.38"
-            name="command 38">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.39"
-            name="command 39">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.40"
-            name="command 40">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.41"
-            name="command 41">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.42"
-            name="command 42">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.43"
-            name="command 43">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.44"
-            name="command 44">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.45"
-            name="command 45">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.46"
-            name="command 46">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.47"
-            name="command 47">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.48"
-            name="command 48">
-      </command>
-      <command
-            id="org.eclipse.ecf.presence.ui.rosterCommand.49"
-            name="command 49">
-      </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
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 d4a8683de..be755f413 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
@@ -46,7 +46,6 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 	private static final List contributionItems = new ArrayList();
 	private static final List handlerActivations = new ArrayList();
 	private static int commandIdIndex = 0;
-	private static final int maxCommandIds = 50;
 
 	private IServiceLocator serviceLocator;
 	private IHandlerService handlerService;
@@ -174,8 +173,7 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 	}
 
 	private int getNextCommandIdIndex() {
-		commandIdIndex = (commandIdIndex == (maxCommandIds - 1)) ? 0 : commandIdIndex + 1;
-		return commandIdIndex;
+		return commandIdIndex++;
 	}
 
 	/**
@@ -219,6 +217,7 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 			String commandId = ROSTERCOMMAND_PREFIX + getNextCommandIdIndex();
 			// Get existing/new command
 			Command command = commandService.getCommand(commandId);
+			command.define(commandId, null, commandService.getCategory(commandId + ".c")); //$NON-NLS-1$
 			IHandler handler = command.getHandler();
 			// Only mess with it if it was of old type
 			if (handler != null && handler instanceof AbstractRosterMenuHandler) {