Author: rob.stryker(a)jboss.com Date: 2012-02-10 09:31:02 -0500 (Fri, 10 Feb 2012) New Revision: 38600 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java Log: Added delete connection action, updated user model to allow listeners, added viewer refresh after model change, Updated error messaging in new server composite Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-10 14:31:02 UTC (rev 38600) @@ -297,7 +297,7 @@ </view--> <view category="org.jboss.tools.common.model.ui.views" - class="org.eclipse.ui.navigator.CommonNavigator" + class="org.jboss.tools.openshift.express.internal.ui.console.ExpressConsoleView" icon="icons/openshift-logo-white-icon.png" id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView" name="OpenShift Express Console"> @@ -370,6 +370,17 @@ </enablement> </actionProvider> <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.RemoveConnectionActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.RemoveConnectionActionProvider"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IUser"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateApplicationActionProvider" id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.createApplicationActionProvider"> <enablement> Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -10,8 +10,14 @@ *******************************************************************************/ package org.jboss.tools.openshift.express.internal.core.behaviour; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jgit.transport.URIish; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerAttributes; @@ -26,8 +32,7 @@ import org.jboss.ide.eclipse.as.core.util.RuntimeUtils; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils; -import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.tools.openshift.express.internal.core.console.UserModel; +import org.jboss.tools.openshift.egit.core.EGitUtils; import com.openshift.express.client.IApplication; import com.openshift.express.client.IUser; @@ -320,5 +325,38 @@ return false; } - + public static IApplication findApplicationForProject(IProject p, List<IApplication> applications) + throws OpenShiftException, CoreException { + List<URIish> uris = EGitUtils.getRemoteURIs(p); + Iterator<IApplication> i = applications.iterator(); + while(i.hasNext()) { + IApplication a = i.next(); + String gitUri = a.getGitUri(); + Iterator<URIish> j = uris.iterator(); + while(j.hasNext()) { + String projUri = j.next().toPrivateString(); + if( projUri.equals(gitUri)) { + return a; + } + } + } + return null; + } + + public static IProject findProjectForApplication(IApplication application) + throws OpenShiftException, CoreException { + String gitUri = application.getGitUri(); + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + for( int i = 0; i < projects.length; i++ ) { + List<URIish> uris = EGitUtils.getRemoteURIs(projects[i]); + Iterator<URIish> it = uris.iterator(); + while(it.hasNext()) { + String projURI = it.next().toPrivateString(); + if( projURI.equals(gitUri)) + return projects[i]; + } + } + return null; + } + } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -0,0 +1,9 @@ +package org.jboss.tools.openshift.express.internal.core.console; + +import com.openshift.express.client.IUser; + +public interface IUserModelListener { + public void userAdded(IUser user); + public void userRemoved(IUser user); + public void userChanged(IUser user); +} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -11,6 +11,7 @@ package org.jboss.tools.openshift.express.internal.core.console; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -40,11 +41,20 @@ /** The most recent user connected on OpenShift. */ private IUser recentUser = null; private HashMap<String, IUser> allUsers = new HashMap<String,IUser>(); + private ArrayList<IUserModelListener> listeners = new ArrayList<IUserModelListener>(); public UserModel() { load(); } + public void addListener(IUserModelListener listener) { + listeners.add(listener); + } + + public void removeListener(IUserModelListener listener) { + listeners.remove(listener); + } + /** * Create a user for temporary external use * @@ -60,14 +70,51 @@ return u; } + private static final int ADDED = 0; + private static final int REMOVED = 1; + private static final int CHANGED = 2; + public void addUser(IUser user) { try { allUsers.put(user.getRhlogin(), user); this.recentUser = user; + fireModelChange(user, ADDED); } catch(OpenShiftException ose ) { // TODO } } + + public void removeUser(IUser user) { + try { + allUsers.remove(user.getRhlogin()); + if( this.recentUser == user ) + this.recentUser = null; + fireModelChange(user, REMOVED); + } catch(OpenShiftException ose ) { + // TODO + } + } + + private void fireModelChange(IUser user, int type) { + Iterator<IUserModelListener> i = listeners.iterator(); + while(i.hasNext()) { + IUserModelListener l = i.next(); + switch (type) { + case ADDED: + l.userAdded(user); + break; + case REMOVED: + l.userRemoved(user); + break; + case CHANGED: + l.userChanged(user); + break; + + default: + break; + } + } + } public IUser getRecentUser() { return recentUser; @@ -177,6 +224,9 @@ * null if platform not found, or password not stored */ public String getPasswordFromSecureStorage(final String rhLogin) { + if( rhLogin == null ) + return null; + SecurePasswordStore store = getSecureStore(rhLogin); if( store != null && rhLogin != null && !rhLogin.isEmpty() ) { try { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IFolder; @@ -24,7 +23,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jgit.transport.URIish; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -42,8 +40,8 @@ import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback; import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyComboCommand; import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyCommand; -import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPageModel; import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftWizardModel; @@ -63,9 +61,9 @@ protected IServerModeUICallback callback; private ModifyListener nameModifyListener, remoteModifyListener, appModifyListener, deployProjectModifyListener; -// private ModifyListener passModifyListener; + private ModifyListener passModifyListener; protected Text userText, remoteText; -// protected Text passText; + protected Text passText; protected Combo appNameCombo, deployProjectCombo; protected Button verifyButton; protected boolean showVerify; @@ -91,18 +89,14 @@ return composite; } - public String getPassword() { - return pass; - } - private void fillSection(Composite composite) { composite.setLayout(new GridLayout(2, false)); Label userLabel = new Label(composite, SWT.NONE); userText = new Text(composite, SWT.SINGLE | SWT.BORDER); GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(userText); Label passLabel = new Label(composite, SWT.NONE); -// passText = new Text(composite, SWT.PASSWORD | SWT.BORDER); -// GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText); + passText = new Text(composite, SWT.PASSWORD | SWT.BORDER); + GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(passText); if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) { Label appNameLabel = new Label(composite, SWT.NONE); @@ -134,9 +128,10 @@ remoteText.setText(IOpenShiftWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT); String n = ExpressServerUtils.getExpressUsername(server); + String p = UserModel.getDefault().getPasswordFromSecureStorage(n); String remote = ExpressServerUtils.getExpressRemoteName(server); if( n != null ) userText.setText(n); -// if( p != null ) passText.setText(p); + if( p != null ) passText.setText(p); if( remote != null ) remoteText.setText(remote); if( showVerify ) { @@ -169,18 +164,21 @@ nameModifyListener = new ModifyListener() { public void modifyText(ModifyEvent e) { user = userText.getText(); + String storedPass = UserModel.getDefault().getPasswordFromSecureStorage(user); + if( storedPass != null && !storedPass.equals("")) + passText.setText(storedPass); callback.execute(new SetUserCommand(server)); } }; userText.addModifyListener(nameModifyListener); -// passModifyListener = new ModifyListener() { -// public void modifyText(ModifyEvent e) { -// //pass = passText.getText(); -// callback.execute(new SetPassCommand(server)); -// } -// }; -// passText.addModifyListener(passModifyListener); + passModifyListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + //pass = passText.getText(); + callback.execute(new SetPassCommand(server)); + } + }; + passText.addModifyListener(passModifyListener); remoteModifyListener = new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -283,32 +281,31 @@ } } -// public class SetPassCommand extends ServerWorkingCopyPropertyCommand { -// public SetPassCommand(IServerWorkingCopy server) { -// super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(), -// IJBossToolingConstants.SERVER_PASSWORD, passModifyListener); -// oldVal = passText.getText(); -// } -// -// public void execute() { -// pass = newVal; -// } -// -// public void undo() { -// pass = oldVal; -// text.removeModifyListener(listener); -// text.setText(oldVal); -// text.addModifyListener(listener); -// } -// } + public class SetPassCommand extends ServerWorkingCopyPropertyCommand { + public SetPassCommand(IServerWorkingCopy server) { + super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(), + null, passModifyListener); + oldVal = passText.getText(); + } + + public void execute() { + pass = newVal; + } + + public void undo() { + pass = oldVal; + text.removeModifyListener(listener); + text.setText(oldVal); + text.addModifyListener(listener); + } + } private Runnable getVerifyingCredentialsJob(final CredentialsWizardPageModel model) { return new Runnable() { public void run() { final IStatus s = model.validateCredentials(); - String error = null; if( !s.isOK() ) { - error = "Credentials Failed"; + ExpressDetailsComposite.this.error = "Credentials Failed"; } else { if( mode.equals(ExpressServerUtils.EXPRESS_SOURCE_MODE) ) { @@ -317,28 +314,11 @@ verifyApplicationBinaryMode(model); } } - ExpressDetailsComposite.this.error = error; } }; } - private IApplication findApplicationForProject(IProject p, List<IApplication> applications) - throws OpenShiftException, CoreException { - List<URIish> uris = EGitUtils.getRemoteURIs(p); - Iterator<IApplication> i = applications.iterator(); - while(i.hasNext()) { - IApplication a = i.next(); - String gitUri = a.getGitUri(); - Iterator<URIish> j = uris.iterator(); - while(j.hasNext()) { - String projUri = j.next().toPrivateString(); - if( projUri.equals(gitUri)) { - return a; - } - } - } - return null; - } + private void verifyApplicationBinaryMode(CredentialsWizardPageModel model) { System.out.println(deployProject); @@ -346,7 +326,7 @@ try { fuser = OpenShiftUIActivator.getDefault().getUser(); final List<IApplication> allApps = fuser.getApplications(); - fapplication = findApplicationForProject(p, allApps); + fapplication = ExpressServerUtils.findApplicationForProject(p, allApps); if( fapplication == null ) { error = "Application for project \"" + p.getName() + "\" not found"; @@ -366,6 +346,7 @@ } private void verifyApplicationSourceMode(CredentialsWizardPageModel model) { + error = null; // now check the app name and cartridge String[] appNames = new String[]{}; try { @@ -406,5 +387,27 @@ return appNames; } + public String getUsername() { + return user; + } + + public String getPassword() { + return pass; + } + + public String getApplicationName() { + return app; + } + public IUser getUser() { + return fuser; + } + + public IApplication getApplication() { + return fapplication; + } + + public String getRemote() { + return remote; + } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -10,6 +10,7 @@ *******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.behaviour; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.jobs.Job; @@ -22,7 +23,12 @@ import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil.NewServerWizardBehaviourCallback; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + public class ExpressWizardFragment extends WizardFragment implements ICompletable { private IWizardHandle handle; private ExpressDetailsComposite composite; @@ -66,6 +72,19 @@ public void performFinish(IProgressMonitor monitor) throws CoreException { super.performFinish(monitor); -// ExpressServerUtils.setExpressPassword(callback.getServer(), composite.getPassword()); + IUser user = composite.getUser(); + UserModel.getDefault().addUser(user); + IApplication app = composite.getApplication(); + try { + // Only clone and import if there's no project already in existence + IProject p = ExpressServerUtils.findProjectForApplication(app); + if( p == null ) { + // clone and import + + // If we had to clone and import, we also need to add the module ?? + } + } catch(OpenShiftException ose ) { + + } } } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -0,0 +1,48 @@ +package org.jboss.tools.openshift.express.internal.ui.console; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.navigator.CommonNavigator; +import org.eclipse.ui.navigator.CommonViewer; +import org.jboss.tools.openshift.express.internal.core.console.IUserModelListener; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; + +import com.openshift.express.client.IUser; + +public class ExpressConsoleView extends CommonNavigator implements IUserModelListener { + protected Object getInitialInput() { + return UserModel.getDefault(); + } + protected CommonViewer createCommonViewer(Composite aParent) { + CommonViewer v = super.createCommonViewer(aParent); + UserModel.getDefault().addListener(this); + return v; + } + public void dispose() { + UserModel.getDefault().removeListener(this); + super.dispose(); + } + + private void refreshViewer() { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + getCommonViewer().refresh(); + } + }); + } + public void userAdded(IUser user) { + if( getCommonViewer() != null && !getCommonViewer().getTree().isDisposed()) { + refreshViewer(); + } + } + public void userRemoved(IUser user) { + if( getCommonViewer() != null && !getCommonViewer().getTree().isDisposed()) { + refreshViewer(); + } + } + public void userChanged(IUser user) { + if( getCommonViewer() != null && !getCommonViewer().getTree().isDisposed()) { + refreshViewer(); + } + } +} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-10 12:01:37 UTC (rev 38599) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -1,5 +1,6 @@ package org.jboss.tools.openshift.express.internal.ui.console; +import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.navigator.CommonActionProvider; @@ -9,12 +10,15 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.ui.views.server.extensions.CommonActionProviderUtils; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.jboss.tools.openshift.express.internal.ui.action.TailServerLogAction; +import com.openshift.express.client.IUser; + public class TailServerLogActionProvider extends CommonActionProvider { private TailServerLogAction action; - + private ICommonActionExtensionSite actionExtensionSite; public void init(ICommonActionExtensionSite actionExtensionSite) { @@ -24,7 +28,6 @@ if (site instanceof ICommonViewerWorkbenchSite) { action = new TailServerLogAction(); action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); - actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); } } @@ -34,7 +37,6 @@ if( sel instanceof IServer ) { IServer server = (IServer)sel; if (ExpressServerUtils.isOpenShiftRuntime(server) || ExpressServerUtils.isInOpenshiftBehaviourMode(server)) { - //menu.insertBefore(ServerActionProvider.CONTROL_SERVER_SECTION_END_SEPARATOR, action); CommonActionProviderUtils.addToShowInQuickSubMenu(action, menu, actionExtensionSite); } } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-10 14:31:02 UTC (rev 38600) @@ -0,0 +1,49 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; +import org.jboss.tools.openshift.express.internal.ui.action.AbstractAction; + +import com.openshift.express.client.IUser; + +/** + * @author Rob Stryker + */ +public class RemoveConnectionActionProvider extends AbstractActionProvider { + + + + public RemoveConnectionActionProvider() { + super(new DeleteConnectionAction(), "group.edition"); + } + + + public static class DeleteConnectionAction extends AbstractAction { + + public DeleteConnectionAction() { + super("Delete Connection"); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) { + final IUser user = (IUser) treeSelection.getFirstElement(); + UserModel.getDefault().removeUser(user); + } + } + + + } + +}