Small refactoring/renaming for consistency

3 files changed, 10 insertions, 7 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.xml
index 2f056d716..5a833ad10 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.xml
@@ -58,6 +58,9 @@
          </dynamic>
       </menuContribution>
    </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+   </extension>
    
    
 </plugin>
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java
index ed4c05c6f..d992c76b4 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java
@@ -94,7 +94,7 @@ public class ConsoleShare extends AbstractCollabShare {
 		super(adapter);
 	}
 
-	private void handleShowStackRequest(final String user, final String stackTrace) {
+	private void handleShowConsoleSelection(final String user, final String consoleSelection) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
 				try {
@@ -117,7 +117,7 @@ public class ConsoleShare extends AbstractCollabShare {
 								final TextConsole textConsole = (TextConsole) consoles[i];
 								textConsole.activate();
 								final IDocument document = textConsole.getDocument();
-								final String text = document.get() + getStackTraceToShow(user, stackTrace);
+								final String text = document.get() + getConsoleSelectionToShow(user, consoleSelection);
 								document.set(text);
 							}
 						}
@@ -130,15 +130,15 @@ public class ConsoleShare extends AbstractCollabShare {
 		});
 	}
 
-	private String getStackTraceToShow(String user, String stackTrace) {
+	private String getConsoleSelectionToShow(String user, String stackTrace) {
 		return NLS.bind(Messages.ConsoleShare_STACK_TRACE_CONTENT, user, stackTrace);
 	}
 
-	public void sendShareStackRequest(final String senderuser, final ID toID, final String stackTrace) {
+	public void sendShareConsoleSelection(final String senderuser, final ID toID, final String consoleSelection) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
 				try {
-					sendMessage(toID, serialize(new Object[] {senderuser, stackTrace}));
+					sendMessage(toID, serialize(new Object[] {senderuser, consoleSelection}));
 				} catch (final ECFException e) {
 					showErrorToUser(Messages.Share_ERROR_SEND_TITLE, NLS.bind(Messages.Share_ERROR_SEND_MESSAGE, e.getStatus().getException().getLocalizedMessage()));
 					logError(e.getStatus());
@@ -158,7 +158,7 @@ public class ConsoleShare extends AbstractCollabShare {
 	protected void handleMessage(ID fromContainerID, byte[] data) {
 		try {
 			final Object[] msg = (Object[]) deserialize(data);
-			handleShowStackRequest((String) msg[0], (String) msg[1]);
+			handleShowConsoleSelection((String) msg[0], (String) msg[1]);
 		} catch (final Exception e) {
 			showErrorToUser(Messages.Share_ERROR_RECEIVE_TITLE, NLS.bind(Messages.Share_ERROR_RECEIVE_MESSAGE, e.getLocalizedMessage()));
 			logError(Messages.Share_EXCEPTION_LOG_MESSAGE, e);
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java
index c1c3257cf..fd82826f2 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java
@@ -47,7 +47,7 @@ public class ConsoleShareRosterEntryContributionItem extends AbstractRosterEntry
 					final ConsoleShare stackshare = tmp;
 					final IAction action = new Action() {
 						public void run() {
-							stackshare.sendShareStackRequest(entry.getRoster().getUser().getName(), entry.getUser().getID(), selection.getText());
+							stackshare.sendShareConsoleSelection(entry.getRoster().getUser().getName(), entry.getUser().getID(), selection.getText());
 						}
 					};
 					action.setText(Messages.ConsoleShare_RosterEntryMenu);