Author: rob.stryker(a)jboss.com Date: 2011-08-08 06:05:01 -0400 (Mon, 08 Aug 2011) New Revision: 33668 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java Log: JBIDE-9132 - exploire for remote stuff yay! Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -48,13 +48,17 @@ * @return */ public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server) { - String type = server.getAttribute(IDeployableServer.SERVER_MODE, (String)null); + return getCurrentDeploymentMethodType(server, null); + } + + public static IJBossServerPublishMethodType getCurrentDeploymentMethodType(IServer server, String defaultType) { + String type = server.getAttribute(IDeployableServer.SERVER_MODE, defaultType); if( type != null ) { return ExtensionManager.getDefault().getPublishMethod(type); } return null; } - + public static DeploymentPreferences loadPreferencesFromFile(IServer server) { File f = getFile(server); InputStream is = null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -50,6 +50,10 @@ return RSE_ID; } + public void setBehaviour(DeployableServerBehavior beh) { + this.behaviour = beh; + } + private IFileServiceSubSystem fileSubSystem = null; private IPath remoteRootFolder; @Deprecated private IPath remoteTemporaryFolder; @@ -123,7 +127,7 @@ return behaviour.getServer(); } - private void ensureConnection(IProgressMonitor monitor) { + public void ensureConnection(IProgressMonitor monitor) { if (fileSubSystem != null && !fileSubSystem.isConnected()) { try { fileSubSystem.connect(monitor, false); @@ -132,6 +136,12 @@ } } public IPath getRemoteRootFolder() { + if( remoteRootFolder == null ) + try { + loadRemoteDeploymentDetails(); + } catch(CoreException ce) { + // TODO + } return remoteRootFolder; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-08-08 10:05:01 UTC (rev 33668) @@ -32,7 +32,8 @@ org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.300", org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.300", org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.200", - org.eclipse.ui.console;bundle-version="3.5.100" + org.eclipse.ui.console;bundle-version="3.5.100", + org.eclipse.ui.views;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -13,8 +13,10 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.wizard.WizardDialog; @@ -23,6 +25,7 @@ import org.eclipse.rse.core.events.ISystemModelChangeListener; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog; +import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile; import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard; import org.eclipse.swt.SWT; @@ -41,13 +44,19 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod; import org.jboss.ide.eclipse.as.rse.core.RSEUtils; import org.jboss.ide.eclipse.as.ui.UIUtil; import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant; @@ -55,6 +64,7 @@ import org.jboss.ide.eclipse.as.ui.editor.ModuleDeploymentPage; import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection; import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand; +import org.jboss.tools.as.wst.server.ui.xpl.ExploreActionProvider; public class RSEDeploymentPreferenceUI implements IDeploymentTypeUI { static { @@ -65,6 +75,32 @@ return browseClicked4(new Shell(), h); } }); + ExploreActionProvider.exploreBehaviorMap.put("rse", new ExploreActionProvider.IExploreBehavior() { + public void openExplorer(IServer server, IModule[] module) { + IDeployableServer ds = ServerConverter.getDeployableServer(server); + IPath remoteFolder = new Path(RSEUtils.getDeployRootFolder(ds)); + IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(server); + RSEPublishMethod method = (RSEPublishMethod)type.createPublishMethod(); + method.setBehaviour(ServerConverter.getDeployableServerBehavior(server)); + if( module != null ) { + remoteFolder = PublishUtil.getDeployPath(method, module, ds); + } + try { + method.getFileService(); + method.ensureConnection(new NullProgressMonitor()); + IHostFile file = method.getFileService().getFile(remoteFolder.removeLastSegments(1).toOSString(), remoteFolder.lastSegment(), new NullProgressMonitor()); + String path = file.getAbsolutePath(); + + IRemoteFile rf = method.getFileServiceSubSystem().getRemoteFileObject(path, null); + + SystemShowInTableAction act = new SystemShowInTableAction(Display.getDefault().getActiveShell()); + act.setSelectedObject(rf); + act.run(); + } catch(Exception e) { + e.printStackTrace(); + } + } + }); } public RSEDeploymentPreferenceUI() { Added: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/SystemShowInTableAction.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -0,0 +1,108 @@ +/******************************************************************************* + * Copyright (c) 2002, 2007 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 + * + * 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.jboss.ide.eclipse.as.rse.ui; + +import java.util.Iterator; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.rse.internal.ui.SystemResources; +import org.eclipse.rse.internal.ui.view.SystemTableViewPart; +import org.eclipse.rse.ui.ISystemIconConstants; +import org.eclipse.rse.ui.RSEUIPlugin; +import org.eclipse.rse.ui.actions.SystemBaseAction; +import org.eclipse.rse.ui.view.ISystemViewElementAdapter; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; + + +/** + * This is the default action for showing a remote object in a table + */ +public class SystemShowInTableAction extends SystemBaseAction +{ + private Object _selected; + + /** + * Constructor. + * @param shell Shell of parent window, used as the parent for the dialog. + * Can be null, but be sure to call setParent before the action is used (ie, run). + */ + public SystemShowInTableAction(Shell parent) + { + super(SystemResources.ACTION_TABLE_LABEL, + SystemResources.ACTION_TABLE_TOOLTIP, + RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SHOW_TABLE_ID), + parent); + setAvailableOffline(true); + } + + /** + * Called when this action is selected from the popup menu. + */ + public void run() + { + SystemTableViewPart viewPart = null; + IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + try + { + viewPart = (SystemTableViewPart) page.showView("org.eclipse.rse.ui.view.systemTableView", null, IWorkbenchPage.VIEW_CREATE); //$NON-NLS-1$ + } + catch (PartInitException e) + { + return; + } + catch (Exception e) + { + return; + } + + viewPart.setInput((IAdaptable) _selected); + page.activate(viewPart); + + } + + /** + * Called when the selection changes. The selection is checked to + * make sure this action can be performed on the selected object. + */ + public boolean updateSelection(IStructuredSelection selection) + { + boolean enable = false; + Iterator e = selection.iterator(); + Object selected = e.next(); + + if (selected != null && selected instanceof IAdaptable) + { + ISystemViewElementAdapter va = (ISystemViewElementAdapter) ((IAdaptable) selected).getAdapter(ISystemViewElementAdapter.class); + if (va.hasChildren((IAdaptable)selected)) + { + _selected = selected; + enable = true; + } + } + + return enable; + } + + public void setSelectedObject(Object o) { + _selected = o; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreAction.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -10,47 +10,11 @@ ************************************************************************************/ package org.jboss.ide.eclipse.as.ui.actions; -import java.io.IOException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; - /** * @author snjeza * */ - -public class ExploreAction extends AbstractServerAction { - - public ExploreAction(Shell shell, ISelectionProvider selectionProvider) { - super(shell, selectionProvider, ExploreUtils.EXPLORE); - setToolTipText(ExploreUtils.EXPLORE_DESCRIPTION); - setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.EXPLORE_IMAGE)); - try { - selectionChanged((IStructuredSelection) selectionProvider - .getSelection()); - } catch (Exception ignore) { - } - } - - @Override - public void perform(IServer server) { - String deployDirectory = ExploreUtils.getDeployDirectory(server); - if (deployDirectory != null && deployDirectory.length() > 0) { - ExploreUtils.explore(deployDirectory); - } - - } - - @Override - public boolean accept(IServer server) { - return ExploreUtils.canExplore(server); - } - +@Deprecated +public class ExploreAction { } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreActionDelegate.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -10,53 +10,12 @@ ************************************************************************************/ package org.jboss.ide.eclipse.as.ui.actions; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.wst.server.core.IServer; /** * @author Snjeza * */ -public class ExploreActionDelegate implements IObjectActionDelegate { - - private ISelection fCurrentSelection; +@Deprecated +public class ExploreActionDelegate{ - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) - */ - - public void run(IAction action) { - if (fCurrentSelection instanceof IStructuredSelection) { - IStructuredSelection structuredSelection = (IStructuredSelection) fCurrentSelection; - Object object = structuredSelection.getFirstElement(); - if (object instanceof IServer) { - IServer server = (IServer) object; - String deployDirectory = ExploreUtils.getDeployDirectory(server); - if (deployDirectory != null && deployDirectory.length() > 0) { - ExploreUtils.explore(deployDirectory); - } - } - } - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection) - */ - - public void selectionChanged(IAction action, ISelection selection) { - fCurrentSelection= selection; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart) - */ - - public void setActivePart(IAction action, IWorkbenchPart targetPart) { - - } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2011-08-08 09:37:35 UTC (rev 33667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2011-08-08 10:05:01 UTC (rev 33668) @@ -11,6 +11,7 @@ package org.jboss.tools.as.wst.server.ui.xpl; import java.io.File; +import java.util.HashMap; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.action.Action; @@ -34,6 +35,44 @@ import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.actions.ExploreUtils; public class ExploreActionProvider extends CommonActionProvider { + public static interface IExploreBehavior { + public void openExplorer(IServer server, IModule[] module); + } + public static HashMap<String, IExploreBehavior> exploreBehaviorMap = new HashMap<String, IExploreBehavior>(); + static { + exploreBehaviorMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new IExploreBehavior() { + public void openExplorer(IServer server, IModule[] module) { + if( module != null ) + runExploreModuleServer(server, module); + else + runExploreServer(server); + } + public void runExploreServer(IServer server) { + String deployDirectory = ExploreUtils.getDeployDirectory(server); + if (deployDirectory != null && deployDirectory.length() > 0) { + ExploreUtils.explore(deployDirectory); + } + } + + public void runExploreModuleServer(IServer server, IModule[] module) { + IPath path = getModuleDeployPath(server, module); + if (path != null) { + File file = path.toFile(); + if (file.exists()) { + ExploreUtils.explore(file.getAbsolutePath()); + } + } + } + private IPath getModuleDeployPath(IServer server, IModule[] module) { + IDeployableServer deployableServer = ServerConverter.getDeployableServer(server); + if( deployableServer != null ) + return ExploreUtils.getDeployPath(deployableServer, module); + return null; + } + }); + } + + private ICommonActionExtensionSite actionSite; private CommonViewer cv; public ExploreActionProvider() { @@ -66,54 +105,25 @@ exploreAction.setDescription(ExploreUtils.EXPLORE_DESCRIPTION); exploreAction.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.EXPLORE_IMAGE)); } - + private void runExplore() { - if( getModuleServer() != null ) - runExploreModuleServer(); - else - runExploreServer(); + runExplore(getServer(), getModuleServer()); } + private void runExplore(IServer server, ModuleServer ms) { + String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD); + IExploreBehavior beh = exploreBehaviorMap.get(mode); + beh.openExplorer(server, ms == null ? null : ms.module); + } + public void fillContextMenu(IMenuManager menu) { - boolean enabled = false; if( getModuleServer() != null ) menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction); else menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction); - if( getServer() != null ) { - String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD); - if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(mode)) { - enabled = true; - } - } - exploreAction.setEnabled(enabled); + exploreAction.setEnabled(true); } - public void runExploreServer() { - String deployDirectory = ExploreUtils.getDeployDirectory(getServer()); - if (deployDirectory != null && deployDirectory.length() > 0) { - ExploreUtils.explore(deployDirectory); - } - } - - public void runExploreModuleServer() { - IPath path = getModuleDeployPath(); - if (path != null) { - File file = path.toFile(); - if (file.exists()) { - ExploreUtils.explore(file.getAbsolutePath()); - } - } - } - private IPath getModuleDeployPath() { - ModuleServer ms = getModuleServer(); - IModule[] module = ms.module; - IDeployableServer deployableServer = ServerConverter.getDeployableServer(ms.server); - if( deployableServer != null ) - return ExploreUtils.getDeployPath(deployableServer, module); - return null; - } - public IServer getServer() { Object o = getSelection(); if (o instanceof IServer)