diff options
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console')
13 files changed, 125 insertions, 125 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java index d00a40569..92d9e863c 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java @@ -39,10 +39,10 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan private List<IConsoleLineTracker> fListeners = new ArrayList<IConsoleLineTracker>(2); /** - * The console this notifier is tracking + * The console this notifier is tracking */ private ProcessConsole fConsole = null; - + /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole) */ @@ -56,11 +56,11 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan lineTrackers[i].init(fConsole); addConsoleListener(lineTrackers[i]); } - + fConsole.addPropertyChangeListener(this); } } - + /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#disconnect() */ @@ -95,19 +95,19 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan fConsole = null; fListeners = null; } - + /** * Adds the given listener to the list of listeners notified when a line of * text is appended to the console. - * - * @param listener the listener to add + * + * @param listener the listener to add */ public void addConsoleListener(IConsoleLineTracker listener) { if (!fListeners.contains(listener)) { fListeners.add(listener); } } - + /* (non-Javadoc) * @see org.eclipse.ui.console.IPatternMatchListener#matchFound(org.eclipse.ui.console.PatternMatchEvent) */ @@ -118,11 +118,11 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan int lineOfOffset = document.getLineOfOffset(event.getOffset()); String delimiter = document.getLineDelimiter(lineOfOffset); int strip = delimiter==null ? 0 : delimiter.length(); - Region region = new Region(event.getOffset(), event.getLength()-strip); + Region region = new Region(event.getOffset(), event.getLength()-strip); lineAppended(region); } catch (BadLocationException e) {} } - + public void lineAppended(IRegion region) { int size = fListeners.size(); for (int i=0; i<size; i++) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java index 5ad0c055b..364254195 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleMessages.java @@ -4,7 +4,7 @@ * 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 - Initial API and implementation *******************************************************************************/ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java index 794264c51..8d2bb38be 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java @@ -30,7 +30,7 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, public void dispose() { DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this); } - + /* (non-Javadoc) * @see org.eclipse.ui.texteditor.IUpdate#update() */ @@ -56,11 +56,11 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches(); RemoveAllTerminatedAction.removeTerminatedLaunches(launches); } - + public ConsoleRemoveAllTerminatedAction() { - super(ConsoleMessages.ConsoleRemoveAllTerminatedAction_0); + super(ConsoleMessages.ConsoleRemoveAllTerminatedAction_0); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_REMOVE_ALL_TERMINATED); - setToolTipText(ConsoleMessages.ConsoleRemoveAllTerminatedAction_1); + setToolTipText(ConsoleMessages.ConsoleRemoveAllTerminatedAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); @@ -98,5 +98,5 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate, @Override public void launchesTerminated(ILaunch[] launches) { update(); - } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java index aa4a60c92..c398288a9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java @@ -35,7 +35,7 @@ import org.eclipse.ui.console.IConsoleView; public class ConsoleRemoveLaunchAction extends Action implements IViewActionDelegate, IConsoleListener, ILaunchesListener2 { private ILaunch fLaunch; - + // only used when a view action delegate private IConsoleView fConsoleView; @@ -49,7 +49,7 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); ConsolePlugin.getDefault().getConsoleManager().addConsoleListener(this); } - + public ConsoleRemoveLaunchAction(ILaunch launch) { this(); fLaunch = launch; @@ -82,7 +82,7 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele @Override public void init(IViewPart view) { if (view instanceof IConsoleView) { - fConsoleView = (IConsoleView) view; + fConsoleView = (IConsoleView) view; } update(); } @@ -133,7 +133,7 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele @Override public void launchesChanged(ILaunch[] launches) { } - + protected ILaunch getLaunch() { if (fConsoleView == null) { return fLaunch; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java index 4d2babb25..6f1f6e743 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java @@ -19,14 +19,14 @@ import org.eclipse.ui.IViewPart; /** * ConsoleShowPreferencesAction Displays the Console's Preference page - * + * * @since 3.2 */ public class ConsoleShowPreferencesAction extends Action implements IViewActionDelegate { /* * (non-Javadoc) - * + * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ @Override @@ -34,7 +34,7 @@ public class ConsoleShowPreferencesAction extends Action implements IViewActionD /* * (non-Javadoc) - * + * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ @Override @@ -44,7 +44,7 @@ public class ConsoleShowPreferencesAction extends Action implements IViewActionD /* * (non-Javadoc) - * + * * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java index 61d975135..ec31c36d8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java @@ -38,16 +38,16 @@ public class ConsoleTerminateAction extends Action implements IUpdate { private IWorkbenchWindow fWindow; /** - * Creates a terminate action for the console + * Creates a terminate action for the console * @param window the window * @param console the console */ public ConsoleTerminateAction(IWorkbenchWindow window, ProcessConsole console) { - super(ConsoleMessages.ConsoleTerminateAction_0); + super(ConsoleMessages.ConsoleTerminateAction_0); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_TERMINATE_ACTION); fConsole = console; fWindow = window; - setToolTipText(ConsoleMessages.ConsoleTerminateAction_1); + setToolTipText(ConsoleMessages.ConsoleTerminateAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE)); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE)); setHoverImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_LCL_TERMINATE)); @@ -60,10 +60,10 @@ public class ConsoleTerminateAction extends Action implements IUpdate { */ @Override public void update() { - IProcess process = fConsole.getProcess(); + IProcess process = fConsole.getProcess(); setEnabled(process.canTerminate()); } - + /* (non-Javadoc) * @see org.eclipse.jface.action.IAction#run() */ @@ -75,10 +75,10 @@ public class ConsoleTerminateAction extends Action implements IUpdate { DebugCommandService service = DebugCommandService.getService(fWindow); service.executeCommand(ITerminateHandler.class, targets.toArray(), null); } - + /** * Collects targets associated with a process. - * + * * @param process the process to collect {@link IDebugTarget}s for * @return associated targets */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java index 016e17432..d49af159a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -87,7 +87,7 @@ import com.ibm.icu.text.MessageFormat; /** * A console for a system process with standard I/O streams. - * + * * @since 3.0 */ @SuppressWarnings("deprecation") @@ -106,7 +106,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe private String fStdInFile = null; private boolean fStreamsClosed = false; - + /** * Proxy to a console document */ @@ -152,7 +152,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe Path path = new Path(file); IFile ifile = root.getFileForLocation(path); String message = null; - + try { String fileLoc = null; if (ifile != null) { @@ -165,11 +165,11 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe ifile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor()); } } - + File outputFile = new File(file); fFileOutputStream = new FileOutputStream(outputFile, append); fileLoc = outputFile.getAbsolutePath(); - + message = MessageFormat.format(ConsoleMessages.ProcessConsole_1, new Object[] { fileLoc }); addPatternMatchListener(new ConsoleLogFilePatternMatcher(fileLoc)); } catch (FileNotFoundException e) { @@ -177,7 +177,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } catch (CoreException e) { DebugUIPlugin.log(e); } - if (message != null) { + if (message != null) { try (IOConsoleOutputStream stream = newOutputStream()) { stream.write(message); } catch (IOException e) { @@ -231,7 +231,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * Computes and returns the image descriptor for this console. - * + * * @return an image descriptor for this console or <code>null</code> */ protected ImageDescriptor computeImageDescriptor() { @@ -250,7 +250,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * Computes and returns the current name of this console. - * + * * @return a name for this console */ protected String computeName() { @@ -467,7 +467,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /** * Notify listeners when name changes. - * + * * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[]) */ @Override @@ -487,7 +487,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } /** - * resets the name of this console to the original computed name + * resets the name of this console to the original computed name */ private void resetName() { final String newName = computeName(); @@ -526,7 +526,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } streamMonitor = streamsProxy.getOutputStreamMonitor(); if (streamMonitor != null) { - connect(streamMonitor, IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM, + connect(streamMonitor, IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM, store.getBoolean(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT)); } InputReadJob readJob = new InputReadJob(streamsProxy); @@ -541,13 +541,13 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe public void connect(IStreamMonitor streamMonitor, String streamIdentifier) { connect(streamMonitor, streamIdentifier, false); } - + /** * Connects the given stream monitor to a new output stream with the given identifier. - * + * * @param streamMonitor stream monitor * @param streamIdentifier stream identifier - * @param activateOnWrite whether the stream should displayed when written to + * @param activateOnWrite whether the stream should displayed when written to */ @SuppressWarnings("resource") private void connect(IStreamMonitor streamMonitor, String streamIdentifier, boolean activateOnWrite) { @@ -616,14 +616,14 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe this.fStreamId = streamIdentifier; this.fStreamMonitor = monitor; this.fStream = stream; - fStreamMonitor.addListener(this); + fStreamMonitor.addListener(this); //fix to bug 121454. Ensure that output to fast processes is processed. streamAppended(null, monitor); } /* * (non-Javadoc) - * + * * @see org.eclipse.debug.core.IStreamListener#streamAppended(java.lang.String, * org.eclipse.debug.core.model.IStreamMonitor) */ @@ -720,7 +720,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /* * (non-Javadoc) - * + * * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ @Override @@ -750,7 +750,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe /* * (non-Javadoc) - * + * * @see org.eclipse.ui.console.IConsole#getImageDescriptor() */ @Override @@ -767,7 +767,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe public ConsoleLogFilePatternMatcher(String filePath) { fFilePath = escape(filePath); } - + private String escape(String path) { StringBuffer buffer = new StringBuffer(path); int index = buffer.indexOf("\\"); //$NON-NLS-1$ @@ -777,7 +777,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } return buffer.toString(); } - + @Override public String getPattern() { return fFilePath; @@ -816,7 +816,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe ConsoleLogFileHyperlink(String filePath) { fFilePath = filePath; } - + @Override public void linkActivated() { IEditorInput input; @@ -831,7 +831,7 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe } else { input = new FileEditorInput(ifile); } - + IWorkbenchPage activePage = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage(); try { activePage.openEditor(input, EditorsUI.DEFAULT_TEXT_EDITOR_ID, true); @@ -845,16 +845,16 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe public void linkExited() { } } - + class StorageEditorInput extends PlatformObject implements IStorageEditorInput { private File fFile; private IStorage fStorage; - + public StorageEditorInput(IStorage storage, File file) { fStorage = storage; fFile = file; } - + @Override public IStorage getStorage() { return fStorage; @@ -879,13 +879,13 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe public String getToolTipText() { return getStorage().getFullPath().toOSString(); } - + @Override public boolean equals(Object object) { return object instanceof StorageEditorInput && getStorage().equals(((StorageEditorInput)object).getStorage()); } - + @Override public int hashCode() { return getStorage().hashCode(); @@ -903,5 +903,5 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe @Override public String getHelpContextId() { return IDebugHelpContextIds.PROCESS_CONSOLE; - } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java index c1cc89c2c..b5d735b69 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsoleManager.java @@ -42,23 +42,23 @@ import com.ibm.icu.text.MessageFormat; * The singleton manager is accessible from the debug UI plugin. */ public class ProcessConsoleManager implements ILaunchListener { - + /** * Console document content provider extensions, keyed by extension id */ private Map<String, IConfigurationElement> fColorProviders; - + /** * The default color provider. Used if no color provider is contributed * for the given process type. */ private IConsoleColorProvider fDefaultColorProvider; - + /** - * Console line trackers; keyed by process type to list of trackers (1:N) + * Console line trackers; keyed by process type to list of trackers (1:N) */ private Map<String, List<IConfigurationElement>> fLineTrackers; - + /** * Map of processes for a launch to compute removed processes */ @@ -75,40 +75,40 @@ public class ProcessConsoleManager implements ILaunchListener { public void launchRemoved(ILaunch launch) { removeLaunch(launch); } - + protected void removeLaunch(ILaunch launch) { - IProcess[] processes= launch.getProcesses(); + IProcess[] processes= launch.getProcesses(); for (int i= 0; i < processes.length; i++) { IProcess iProcess = processes[i]; removeProcess(iProcess); - } + } if (fProcesses != null) { fProcesses.remove(launch); } } - + /** * Removes the console and document associated with the given process. - * + * * @param iProcess process to clean up */ private void removeProcess(IProcess iProcess) { IConsole console = getConsole(iProcess); - + if (console != null) { IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); manager.removeConsoles(new IConsole[]{console}); } } - + /** * Returns the console for the given process, or <code>null</code> if none. - * + * * @param process * @return the console for the given process, or <code>null</code> if none */ public IConsole getConsole(IProcess process) { - IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); + IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); IConsole[] consoles = manager.getConsoles(); for (int i = 0; i < consoles.length; i++) { IConsole console = consoles[i]; @@ -121,7 +121,7 @@ public class ProcessConsoleManager implements ILaunchListener { } return null; } - + /** * @see ILaunchListener#launchAdded(ILaunch) */ @@ -129,7 +129,7 @@ public class ProcessConsoleManager implements ILaunchListener { public void launchAdded(ILaunch launch) { launchChanged(launch); } - + /** * @see ILaunchListener#launchChanged(ILaunch) */ @@ -160,7 +160,7 @@ public class ProcessConsoleManager implements ILaunchListener { } } } - + /** * Returns the document for the process, or <code>null</code> * if none. @@ -168,8 +168,8 @@ public class ProcessConsoleManager implements ILaunchListener { public IDocument getConsoleDocument(IProcess process) { ProcessConsole console = (ProcessConsole) getConsole(process); return (console != null ? console.getDocument() : null); - } - + } + /** * Called by the debug ui plug-in on startup. * The console document manager starts listening for @@ -178,18 +178,18 @@ public class ProcessConsoleManager implements ILaunchListener { */ public void startup() { ILaunchManager launchManager= DebugPlugin.getDefault().getLaunchManager(); - launchManager.addLaunchListener(this); - + launchManager.addLaunchListener(this); + //set up the docs for launches already registered ILaunch[] launches= launchManager.getLaunches(); for (int i = 0; i < launches.length; i++) { launchAdded(launches[i]); } } - + /** * Called by the debug ui plug-in on shutdown. - * The console document manager de-registers as a + * The console document manager de-registers as a * launch listener and kills all existing console documents. */ public void shutdown() { @@ -204,11 +204,11 @@ public class ProcessConsoleManager implements ILaunchListener { fProcesses.clear(); } } - + /** * Returns a new console document color provider extension for the given * process type, or <code>null</code> if none. - * + * * @param type corresponds to <code>IProcess.ATTR_PROCESS_TYPE</code> * @return IConsoleColorProvider */ @@ -228,7 +228,7 @@ public class ProcessConsoleManager implements ILaunchListener { Object colorProvider = extension.createExecutableExtension("class"); //$NON-NLS-1$ if (colorProvider instanceof IConsoleColorProvider) { return (IConsoleColorProvider)colorProvider; - } + } DebugUIPlugin.logErrorMessage(MessageFormat.format( "Extension {0} must specify an instanceof IConsoleColorProvider for class attribute.", //$NON-NLS-1$ new Object[] { extension.getDeclaringExtension().getUniqueIdentifier() })); @@ -241,8 +241,8 @@ public class ProcessConsoleManager implements ILaunchListener { fDefaultColorProvider = new ConsoleColorProvider(); } return fDefaultColorProvider; - } - + } + /** * Returns the Line Trackers for a given process type. * @param process The process for which line trackers are required. @@ -250,7 +250,7 @@ public class ProcessConsoleManager implements ILaunchListener { */ public IConsoleLineTracker[] getLineTrackers(IProcess process) { String type = process.getAttribute(IProcess.ATTR_PROCESS_TYPE); - + if (fLineTrackers == null) { synchronized (fLineTrackersLock) { // can't use fLineTrackers as lock as it is null here fLineTrackers = new HashMap<String, List<IConfigurationElement>>(); @@ -268,14 +268,14 @@ public class ProcessConsoleManager implements ILaunchListener { } } } - + ArrayList<IConsoleLineTracker> trackers = new ArrayList<IConsoleLineTracker>(); if (type != null) { List<IConfigurationElement> lineTrackerExtensions; synchronized (fLineTrackers) {// need to synchronize as the update to list might be still happening lineTrackerExtensions = fLineTrackers.get(type); } - if(lineTrackerExtensions != null) { + if(lineTrackerExtensions != null) { for (IConfigurationElement element : lineTrackerExtensions) { try { trackers.add((IConsoleLineTracker) element.createExecutableExtension("class")); //$NON-NLS-1$ @@ -287,11 +287,11 @@ public class ProcessConsoleManager implements ILaunchListener { } return trackers.toArray(new IConsoleLineTracker[0]); } - + /** * Returns the processes that have been removed from the given * launch, or <code>null</code> if none. - * + * * @param launch launch that has changed * @return removed processes or <code>null</code> */ @@ -317,10 +317,10 @@ public class ProcessConsoleManager implements ILaunchListener { fProcesses.put(launch, curr); return removed; } - + /** * Returns whether the given object is contained in the list. - * + * * @param list list to search * @param object object to search for * @return whether the given object is contained in the list diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java index 4052537dd..9f85f919a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java @@ -53,11 +53,11 @@ import org.eclipse.ui.part.ShowInContext; /** * Creates and manages process console specific actions - * + * * @since 3.1 */ public class ProcessConsolePageParticipant implements IConsolePageParticipant, IShowInSource, IShowInTargetList, IDebugEventSetListener, IDebugContextListener { - + // actions private ConsoleTerminateAction fTerminate; private ConsoleRemoveLaunchAction fRemoveTerminated; @@ -70,14 +70,14 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I private IPageBookViewPage fPage; private IConsoleView fView; - + private EOFHandler fEOFHandler; private String fContextId = "org.eclipse.debug.ui.console"; //$NON-NLS-1$; private IContextActivation fActivatedContext; private IHandlerActivation fActivatedHandler; /** * Handler to send EOF - */ + */ private class EOFHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException { @@ -91,9 +91,9 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I } return null; } - - } - + + } + /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#init(IPageBookViewPage, IConsole) */ @@ -101,26 +101,26 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I public void init(IPageBookViewPage page, IConsole console) { fPage = page; fConsole = (ProcessConsole) console; - + fRemoveTerminated = new ConsoleRemoveLaunchAction(fConsole.getProcess().getLaunch()); fRemoveAllTerminated = new ConsoleRemoveAllTerminatedAction(); fTerminate = new ConsoleTerminateAction(page.getSite().getWorkbenchWindow(), fConsole); fStdOut = new ShowStandardOutAction(); fStdErr = new ShowStandardErrorAction(); - + fView = (IConsoleView) fPage.getSite().getPage().findView(IConsoleConstants.ID_CONSOLE_VIEW); - + DebugPlugin.getDefault().addDebugEventListener(this); DebugUITools.getDebugContextManager().getContextService(fPage.getSite().getWorkbenchWindow()).addDebugContextListener(this); - + // contribute to toolbar IActionBars actionBars = fPage.getSite().getActionBars(); configureToolBar(actionBars.getToolBarManager()); - + // create handler and submissions for EOF fEOFHandler = new EOFHandler(); } - + /* (non-Javadoc) * @see org.eclipse.ui.console.IConsolePageParticipant#dispose() */ @@ -193,7 +193,7 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I IProcess process = getProcess(); if (process == null) { return null; - } + } IDebugTarget target = process.getAdapter(IDebugTarget.class); ISelection selection = null; if (target == null) { @@ -234,12 +234,12 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I } } }; - - DebugUIPlugin.getStandardDisplay().asyncExec(r); + + DebugUIPlugin.getStandardDisplay().asyncExec(r); } } } - + protected IProcess getProcess() { return fConsole != null ? fConsole.getProcess() : null; } @@ -284,6 +284,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I fView.display(fConsole); } } - + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java index 478cc0eae..79fb709d0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -17,7 +17,7 @@ import org.eclipse.ui.console.TextConsole; /** * Tests if a process type matches the expected value. - * + * * @since 3.1 */ public class ProcessTypePropertyTester extends PropertyTester { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java index a13a0cfe4..a72f597b0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardErrorAction.java @@ -20,11 +20,11 @@ import org.eclipse.ui.PlatformUI; /** * Toggles preference show the console when output is written * to standard error stream. - * + * * @since 3.3 */ public class ShowStandardErrorAction extends ShowWhenContentChangesAction { - + /** * Constructs an action to toggle console auto activation preferences */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java index 71fd9fd12..daa7ece0f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowStandardOutAction.java @@ -20,11 +20,11 @@ import org.eclipse.ui.PlatformUI; /** * Toggles preference show the console when output is written * to standard output stream. - * + * * @since 3.3 */ public class ShowStandardOutAction extends ShowWhenContentChangesAction { - + /** * Constructs an action to toggle console auto activation preferences */ diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java index fca78ddb6..760cd9333 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java @@ -20,17 +20,17 @@ import org.eclipse.jface.util.PropertyChangeEvent; /** * Abstract action for toggling preference to automatically show * the console when a streams content changes. - * + * * @since 3.3 */ public abstract class ShowWhenContentChangesAction extends Action implements IPropertyChangeListener{ - + /** * Constructs an action to toggle console auto activation preferences */ public ShowWhenContentChangesAction(String name) { super(name, IAction.AS_CHECK_BOX); - setToolTipText(name); + setToolTipText(name); getPreferenceStore().addPropertyChangeListener(this); update(); } @@ -45,9 +45,9 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr update(); } } - + protected abstract String getKey(); - + private void update() { IPreferenceStore store = getPreferenceStore(); if (store.getBoolean(getKey())) { @@ -77,7 +77,7 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr store.setValue(getKey(), show); store.addPropertyChangeListener(this); } - + /** * Must be called to dispose this action. */ |