bug 376744 - [console] some commands are listed multiple times in the help

6 files changed, 12 insertions, 12 deletions

diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
index fc12e6529..bf9928d59 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/Activator.java
@@ -81,7 +81,7 @@ public class Activator implements BundleActivator {
 			if (isFirstProcessor) {
 				isFirstProcessor = false;
 				telnetConnection = new TelnetCommand(processor, context);
-				telnetConnection.start();
+				telnetConnection.startService();
 			} else {
 				telnetConnection.addCommandProcessor(processor);
 			}
@@ -223,16 +223,16 @@ public class Activator implements BundleActivator {
 		platformAdminTracker.open();
 		
 		equinoxCmdProvider = new EquinoxCommandProvider(context, this);
-		equinoxCmdProvider.start();
+		equinoxCmdProvider.startService();
 		
 		HelpCommand helpCommand = new HelpCommand(context); 
-		helpCommand.start();
+		helpCommand.startService();
 		
 		ManCommand manCommand = new ManCommand(context);
-		manCommand.start();
+		manCommand.startService();
 		
 		DisconnectCommand disconnectCommand = new DisconnectCommand(context);
-		disconnectCommand.start();
+		disconnectCommand.startService();
 
 		startBundle("org.apache.felix.gogo.runtime", true);
 		startBundle("org.apache.felix.gogo.shell", true);
@@ -315,7 +315,7 @@ public class Activator implements BundleActivator {
 		commandProviderTracker.close();
 		commandProcessorTracker.close();
 		if (equinoxCmdProvider != null) {
-			equinoxCmdProvider.stop();
+			equinoxCmdProvider.stopService();
 		}
 
 		try {
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
index 69acc779c..68b2c1fcf 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/DisconnectCommand.java
@@ -25,7 +25,7 @@ public class DisconnectCommand {
 		this.context = context;
 	}
 	
-	public void start() {
+	public void startService() {
 		Dictionary<String, Object> props = new Hashtable<String, Object>();
 		props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
 		props.put(CommandProcessor.COMMAND_FUNCTION, new String[] {"disconnect"});
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
index 717d8945c..1e35b0196 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
@@ -156,7 +156,7 @@ public class EquinoxCommandProvider implements SynchronousBundleListener {
 	 *  Registers this object as a service providing commands
 	 *  Adds this object as a SynchronousBundleListener.
 	 */
-	public void start() {
+	public void startService() {
 		EquinoxCommandsConverter converter = new EquinoxCommandsConverter(context);
 		converterReg = context.registerService(Converter.class.getName(), converter, null);
 		
@@ -168,7 +168,7 @@ public class EquinoxCommandProvider implements SynchronousBundleListener {
 		context.addBundleListener(this);
 	}
 
-	public void stop() {
+	public void stopService() {
 		if (converterReg != null) {
 			converterReg.unregister();
 		}
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
index e1e3ac387..0a87326ac 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
@@ -78,7 +78,7 @@ public class HelpCommand {
 		commandProvidersTracker.open();
 	}
 	
-	public void start() {
+	public void startService() {
 		Dictionary<String, Object> props = new Hashtable<String, Object>();
 		props.put(Constants.SERVICE_RANKING, new Integer(Integer.MAX_VALUE));
 		props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
index da5441f8c..a0a3fba82 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/ManCommand.java
@@ -14,7 +14,7 @@ public class ManCommand {
 		this.context = context;
 	}
 	
-	public void start() {
+	public void startService() {
 		Dictionary<String, Object> props = new Hashtable<String, Object>();
 		props.put(CommandProcessor.COMMAND_SCOPE, "equinox");
 		props.put(CommandProcessor.COMMAND_FUNCTION, new String[] {"man"});
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
index 2874c1b16..5a0e74317 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/telnet/TelnetCommand.java
@@ -89,7 +89,7 @@ public class TelnetCommand {
         } 
     }
     
-    public synchronized void start() {
+    public synchronized void startService() {
     	Dictionary<String, Object> properties = new Hashtable<String, Object>();
 		properties.put("osgi.command.scope", "equinox");
 		properties.put("osgi.command.function", new String[] {"telnet"});