diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF index 78d977eeccc..bb666c96a91 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, org.eclipse.ui.ide, org.eclipse.ui.views, - org.eclipse.debug.core, org.eclipse.ui.workbench.texteditor, org.eclipse.jface.text, org.eclipse.search, diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditProjectFileLineAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditProjectFileLineAction.java deleted file mode 100644 index 1269cf67c64..00000000000 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditProjectFileLineAction.java +++ /dev/null @@ -1,194 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, - * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.files.ui.actions; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; -import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.files.ui.resources.RemoteSourceLookupDirector; -import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; -import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; -import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; -import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; -import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IEditorDescriptor; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.part.FileEditorInput; - - - - -public class SystemEditProjectFileLineAction extends SystemEditFileAction { - - - protected IRemoteFile _remoteFile; - protected IRemoteOutput _output; - - /** - * Constructor for SystemEditFileAction - */ - public SystemEditProjectFileLineAction(String text, String tooltip, ImageDescriptor image, Shell parent, String editorId, - IRemoteFile remoteFile, IRemoteOutput output) - { - super(text, tooltip, image, parent, editorId); - - _output = output; - _remoteFile = remoteFile; - } - - public void run() - { - process(); - } - - - - /** - * Process the object: download file, open in editor, etc. - */ - protected void process() - { - openWorkspaceFile(_remoteFile, _output); - } - - - protected IEditorRegistry getEditorRegistry() - { - return RSEUIPlugin.getDefault().getWorkbench().getEditorRegistry(); - } - - protected IEditorDescriptor getDefaultTextEditor() - { - IEditorRegistry registry = getEditorRegistry(); - return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); - } - /** - * Open workspace file associated with IRemoteCommandShell. If there is no associated project - * return. - * @param remoteFile - * @param output - * @return - */ - protected boolean openWorkspaceFile(IRemoteFile remoteFile, IRemoteOutput output) - { - IRemoteCommandShell cmd = (IRemoteCommandShell)(output.getParent()); - IProject associatedProject = cmd.getAssociatedProject(); - if (associatedProject != null) - { - ProjectSourceContainer container = new ProjectSourceContainer(associatedProject, false); - ISourceLookupDirector director = new RemoteSourceLookupDirector(); - container.init(director); - try - { - Object[] matches = container.findSourceElements(remoteFile.getName()); - for (int i = 0; i < matches.length; i++) - { - //System.out.println("match="+matches[i]); - } - - if (matches.length == 1) - { - IFile localMatch = (IFile)matches[0]; - - - - IWorkbenchPage activePage = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage(); - - FileEditorInput finput = new FileEditorInput(localMatch); - - IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(remoteFile.getName()); - if (desc == null) - { - desc = getDefaultTextEditor(); - } - String editorid = desc.getId(); - - IEditorPart editor = activePage.openEditor(finput, editorid); - - int line = output.getLine(); - int charStart = output.getCharStart(); - int charEnd = output.getCharEnd(); - - try - { - IMarker marker = null; - - // DKM - should we? this will populate the Problems view..but resources are actually remote - if (output instanceof IRemoteError) - { - IRemoteError error = (IRemoteError)output; - String type = error.getType(); - - marker = localMatch.createMarker(IMarker.TEXT); - - if (type.equals("error")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR); - } - else if (type.equals("warning")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING); - } - else if (type.equals("informational")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO); - } - - marker.setAttribute(IMarker.MESSAGE, output.getText()); - marker.setAttribute(IMarker.LINE_NUMBER, line); - marker.setAttribute(IMarker.CHAR_START, charStart); - marker.setAttribute(IMarker.CHAR_END, charEnd); - - } - else - { - marker = localMatch.createMarker(IMarker.TEXT); - marker.setAttribute(IMarker.LINE_NUMBER, line); - marker.setAttribute(IMarker.CHAR_START, charStart); - marker.setAttribute(IMarker.CHAR_END, charEnd); - } - IDE.gotoMarker(editor, marker); - - - } - catch (CoreException e) - { - e.printStackTrace(); - } - return true; - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - return false; - } -} - \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java index 17a8522dec6..e703f809c79 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java @@ -17,32 +17,19 @@ package org.eclipse.rse.files.ui.actions; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; -import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.IRemoteLineReference; -import org.eclipse.rse.files.ui.FileResources; import org.eclipse.rse.files.ui.resources.ISystemTextEditor; -import org.eclipse.rse.files.ui.resources.RemoteSourceLookupDirector; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemIFileProperties; -import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; -import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; -import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteOutput; import org.eclipse.rse.ui.RSEUIPlugin; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -53,7 +40,6 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.part.FileEditorInput; /** @@ -62,7 +48,7 @@ import org.eclipse.ui.part.FileEditorInput; public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMenu { protected IRemoteLineReference _remoteLine; - protected IProject _associatedProject; + public void updateSelection(IStructuredSelection selection) { @@ -78,11 +64,6 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe { return; } - if (_remoteLine instanceof IRemoteOutput) - { - IRemoteOutput output = (IRemoteOutput)_remoteLine; - _associatedProject = ((IRemoteCommandShell)output.getParent()).getAssociatedProject(); - } } } @@ -90,13 +71,6 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe public void fill(Menu menu, int index) { - if (_associatedProject != null) - { - IEditorDescriptor defaultEditor = getDefaultTextEditor(); - // project file edit action if there's an associated project - IEditorDescriptor projectEditDescriptor = getPreferredEditor(_remoteFile); - createProjectFileMenuItem(menu, defaultEditor, projectEditDescriptor); - } super.fill(menu, index); } @@ -113,42 +87,6 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); } - /** - * Creates the menu item for the editor descriptor. - * - * @param menu the menu to add the item to - * @param descriptor the editor descriptor, or null for the system editor - * @param preferredEditor the descriptor of the preferred editor, or null - */ - protected void createProjectFileMenuItem(Menu menu, final IEditorDescriptor descriptor, final IEditorDescriptor preferredEditor) - { - // XXX: Would be better to use bold here, but SWT does not support it. - final MenuItem menuItem = new MenuItem(menu, SWT.RADIO); - menuItem.setSelection(true); - String pLabel = SystemMessage.sub(FileResources.RESID_OPEN_FROM_ASSOCIATED_PROJECT, "&1", _associatedProject.getName()); - menuItem.setText(pLabel); - Image image = getImage(descriptor); - if (image != null) - { - menuItem.setImage(image); - } - Listener listener = new Listener() - { - public void handleEvent(Event event) - { - switch (event.type) - { - case SWT.Selection: - if(menuItem.getSelection()) - { - openWorkspaceFile(_remoteFile, (IRemoteOutput)_remoteLine, descriptor); - } - break; - } - } - }; - menuItem.addListener(SWT.Selection, listener); - } public static IRemoteFile outputToFile(IRemoteLineReference output) @@ -267,111 +205,4 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe } } - /** - * Open workspace file associated with IRemoteCommandShell. If there is no associated project - * return. - * @param remoteFile - * @param output - * @return - */ - protected boolean openWorkspaceFile(IRemoteFile remoteFile, IRemoteOutput output, IEditorDescriptor desc) - { - IRemoteCommandShell cmd = (IRemoteCommandShell)(output.getParent()); - IProject associatedProject = cmd.getAssociatedProject(); - if (associatedProject != null) - { - ProjectSourceContainer container = new ProjectSourceContainer(associatedProject, false); - ISourceLookupDirector director = new RemoteSourceLookupDirector(); - container.init(director); - try - { - Object[] matches = container.findSourceElements(remoteFile.getName()); - for (int i = 0; i < matches.length; i++) - { - //System.out.println("match="+matches[i]); - } - - if (matches.length == 1) - { - IFile localMatch = (IFile)matches[0]; - - - - IWorkbenchPage activePage = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage(); - - FileEditorInput finput = new FileEditorInput(localMatch); - - if (desc == null) - { - desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(remoteFile.getName()); - } - if (desc == null) - { - desc = getDefaultTextEditor(); - } - String editorid = desc.getId(); - - IEditorPart editor = activePage.openEditor(finput, editorid); - - int line = output.getLine(); - int charStart = output.getCharStart(); - int charEnd = output.getCharEnd(); - - try - { - IMarker marker = null; - - // DKM - should we? this will populate the Problems view..but resources are actually remote - if (output instanceof IRemoteError) - { - IRemoteError error = (IRemoteError)output; - String type = error.getType(); - - marker = localMatch.createMarker(IMarker.TEXT); - - if (type.equals("error")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR); - } - else if (type.equals("warning")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_WARNING); - } - else if (type.equals("informational")) - { - marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO); - } - - marker.setAttribute(IMarker.MESSAGE, output.getText()); - marker.setAttribute(IMarker.LINE_NUMBER, line); - marker.setAttribute(IMarker.CHAR_START, charStart); - marker.setAttribute(IMarker.CHAR_END, charEnd); - - } - else - { - marker = localMatch.createMarker(IMarker.TEXT); - marker.setAttribute(IMarker.LINE_NUMBER, line); - marker.setAttribute(IMarker.CHAR_START, charStart); - marker.setAttribute(IMarker.CHAR_END, charEnd); - } - IDE.gotoMarker(editor, marker); - - - } - catch (CoreException e) - { - e.printStackTrace(); - } - return true; - } - } - catch(Exception e) - { - e.printStackTrace(); - } - } - - return false; - } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/RemoteSourceLookupDirector.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/RemoteSourceLookupDirector.java deleted file mode 100644 index bc7a9dda282..00000000000 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/RemoteSourceLookupDirector.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006 IBM Corporation. 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 - * - * Initial Contributors: - * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, - * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * - * Contributors: - * {Name} (company) - description of contribution. - ********************************************************************************/ - -package org.eclipse.rse.files.ui.resources; - -import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector; -import org.eclipse.debug.core.sourcelookup.ISourceContainerType; - - -public class RemoteSourceLookupDirector extends AbstractSourceLookupDirector -{ - - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector#initializeParticipants() - */ - public void initializeParticipants() { - //addParticipants(new ISourceLookupParticipant[] {new JavaSourceLookupParticipant()}); - } - /* (non-Javadoc) - * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector#supportsSourceContainerType(org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType) - */ - public boolean supportsSourceContainerType(ISourceContainerType type) { - return true; - } - - -} \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF index 44a3da1f81a..a3406023d64 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.forms, org.eclipse.ui.ide, - org.eclipse.debug.core, org.eclipse.rse.files.ui, org.eclipse.rse.subsystems.shells.core, org.eclipse.rse.subsystems.files.core,