Attachment #168245 for bug #312677

Lines 1-6 Link Here

(-)plugin.xml (-1 / +11 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<?eclipse version="3.0"?><!--	2	<?eclipse version="3.0"?><!--
3	Copyright (c) 2005, 2009 IBM Corporation and others.	3	Copyright (c) 2005, 2010 IBM Corporation and others.
4	All rights reserved. This program and the accompanying materials	4	All rights reserved. This program and the accompanying materials
5	are made available under the terms of the Eclipse Public License v1.0	5	are made available under the terms of the Eclipse Public License v1.0
6	which accompanies this distribution, and is available at	6	which accompanies this distribution, and is available at
Lines 2087-2090 Link Here
2087	label="%consoleFactory.label">	2087	label="%consoleFactory.label">
2088	</consoleFactory>	2088	</consoleFactory>
2089	</extension>	2089	</extension>
		2090	<extension
		2091	point="org.eclipse.ui.console.consolePageParticipants">
		2092	<consolePageParticipant
		2093	class="org.eclipse.pde.internal.ui.util.OSGiConsolePageParticipant"
		2094	id="org.eclipse.pde.ui.OSGiConsoleParticipant">
		2095	<enablement>
		2096	<test property="org.eclipse.ui.console.consoleTypeTest" value="osgiConsole"/>
		2097	</enablement>
		2098	</consolePageParticipant>
		2099	</extension>
2090	</plugin>	2100	</plugin>




 *
 * Contributors:
 *     Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
 *     IBM Corporation - ongoing enhancements and bug fixing
 *******************************************************************************/
package org.eclipse.pde.internal.ui.util;

import java.io.*;
import java.io.OutputStream;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.framework.console.ConsoleSession;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.ui.console.IOConsole;
import org.eclipse.ui.console.IOConsoleOutputStream;
import org.osgi.framework.BundleContext;

/**
 * OSGi console connected to the Host/Running Eclipse.
 * 
 * @since 3.6
 */
public class OSGiConsole extends IOConsole {

	public final static String TYPE = "osgiConsole"; //$NON-NLS-1$

		BundleContext context = PDEPlugin.getDefault().getBundle().getBundleContext();
		context.registerService(ConsoleSession.class.getName(), session, null);
		super.init();
		IOConsoleOutputStream info = newOutputStream(); // create a stream to write info message to
		try {
			info.write(PDEUIMessages.OSGiConsoleFactory_title);
		} catch (IOException e) {
		}
	}

	protected void dispose() {




 *******************************************************************************/
package org.eclipse.pde.internal.ui.util;

import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.ui.console.*;

/**
 * Console factory extension used to create a "Host OSGi Console".
 * 
 * @since 3.6
 */
public class OSGiConsoleFactory implements IConsoleFactory {
	private final IConsoleManager fConsoleManager;
	private IOConsole fConsole = null;

	 * @see org.eclipse.ui.console.IConsoleFactory#openConsole()
	 */
	public void openConsole() {
		openConsole(PDEUIMessages.OSGiConsoleFactory_title);
	}

	public void openConsole(String initialText) {
		IOConsole console = getConsole();

		IConsole[] existing = fConsoleManager.getConsoles();

		if (!exists)
			fConsoleManager.addConsoles(new IConsole[] {console});
		fConsoleManager.showConsoleView(console);
		console.getDocument().set(initialText);
	}

	private synchronized IOConsole getConsole() {




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.util;

import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.ui.console.*;
import org.eclipse.ui.console.actions.CloseConsoleAction;
import org.eclipse.ui.part.IPageBookViewPage;

/**
 * Page participant extension for an OSGi console. Contributes a close action.
 * 
 * @since 3.6
 */
public class OSGiConsolePageParticipant implements IConsolePageParticipant {

	private CloseConsoleAction fCloseAction;

	/* (non-Javadoc)
	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
	 */
	public Object getAdapter(Class adapter) {
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.console.IConsolePageParticipant#init(org.eclipse.ui.part.IPageBookViewPage, org.eclipse.ui.console.IConsole)
	 */
	public void init(IPageBookViewPage page, IConsole console) {
		fCloseAction = new CloseConsoleAction(console);
		IToolBarManager manager = page.getSite().getActionBars().getToolBarManager();
		manager.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fCloseAction);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.console.IConsolePageParticipant#dispose()
	 */
	public void dispose() {
		fCloseAction = null;

	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.console.IConsolePageParticipant#activated()
	 */
	public void activated() {
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.console.IConsolePageParticipant#deactivated()
	 */
	public void deactivated() {
	}

}

Return to bug 312677

Lines 7-25 Link Here

(-)src/org/eclipse/pde/internal/ui/util/OSGiConsole.java (-2 / +13 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation	9	* Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation
		10	* IBM Corporation - ongoing enhancements and bug fixing
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.util;	12	package org.eclipse.pde.internal.ui.util;
12		13
13	import java.io.InputStream;	14	import java.io.*;
14	import java.io.OutputStream;
15	import org.eclipse.core.runtime.Platform;	15	import org.eclipse.core.runtime.Platform;
16	import org.eclipse.osgi.framework.console.ConsoleSession;	16	import org.eclipse.osgi.framework.console.ConsoleSession;
17	import org.eclipse.osgi.util.NLS;	17	import org.eclipse.osgi.util.NLS;
18	import org.eclipse.pde.internal.ui.PDEPlugin;	18	import org.eclipse.pde.internal.ui.PDEPlugin;
19	import org.eclipse.pde.internal.ui.PDEUIMessages;	19	import org.eclipse.pde.internal.ui.PDEUIMessages;
20	import org.eclipse.ui.console.IOConsole;	20	import org.eclipse.ui.console.IOConsole;
		21	import org.eclipse.ui.console.IOConsoleOutputStream;
21	import org.osgi.framework.BundleContext;	22	import org.osgi.framework.BundleContext;
22		23
		24	/**
		25	* OSGi console connected to the Host/Running Eclipse.
		26	*
		27	* @since 3.6
		28	*/
23	public class OSGiConsole extends IOConsole {	29	public class OSGiConsole extends IOConsole {
24		30
25	public final static String TYPE = "osgiConsole"; //$NON-NLS-1$	31	public final static String TYPE = "osgiConsole"; //$NON-NLS-1$
Lines 47-52 Link Here
47	BundleContext context = PDEPlugin.getDefault().getBundle().getBundleContext();	53	BundleContext context = PDEPlugin.getDefault().getBundle().getBundleContext();
48	context.registerService(ConsoleSession.class.getName(), session, null);	54	context.registerService(ConsoleSession.class.getName(), session, null);
49	super.init();	55	super.init();
		56	IOConsoleOutputStream info = newOutputStream(); // create a stream to write info message to
		57	try {
		58	info.write(PDEUIMessages.OSGiConsoleFactory_title);
		59	} catch (IOException e) {
		60	}
50	}	61	}
51		62
52	protected void dispose() {	63	protected void dispose() {

Added Link Here

(-)src/org/eclipse/pde/internal/ui/util/OSGiConsolePageParticipant.java (+63 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.util;
12
13	import org.eclipse.jface.action.IToolBarManager;
14	import org.eclipse.ui.console.*;
15	import org.eclipse.ui.console.actions.CloseConsoleAction;
16	import org.eclipse.ui.part.IPageBookViewPage;
17
18	/**
19	* Page participant extension for an OSGi console. Contributes a close action.
20	*
21	* @since 3.6
22	*/
23	public class OSGiConsolePageParticipant implements IConsolePageParticipant {
24
25	private CloseConsoleAction fCloseAction;
26
27	/* (non-Javadoc)
28	* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
29	*/
30	public Object getAdapter(Class adapter) {
31	return null;
32	}
33
34	/* (non-Javadoc)
35	* @see org.eclipse.ui.console.IConsolePageParticipant#init(org.eclipse.ui.part.IPageBookViewPage, org.eclipse.ui.console.IConsole)
36	*/
37	public void init(IPageBookViewPage page, IConsole console) {
38	fCloseAction = new CloseConsoleAction(console);
39	IToolBarManager manager = page.getSite().getActionBars().getToolBarManager();
40	manager.appendToGroup(IConsoleConstants.LAUNCH_GROUP, fCloseAction);
41	}
42
43	/* (non-Javadoc)
44	* @see org.eclipse.ui.console.IConsolePageParticipant#dispose()
45	*/
46	public void dispose() {
47	fCloseAction = null;
48
49	}
50
51	/* (non-Javadoc)
52	* @see org.eclipse.ui.console.IConsolePageParticipant#activated()
53	*/
54	public void activated() {
55	}
56
57	/* (non-Javadoc)
58	* @see org.eclipse.ui.console.IConsolePageParticipant#deactivated()
59	*/
60	public void deactivated() {
61	}
62
63	}