Author: xcoulon
Date: 2012-02-22 08:34:07 -0500 (Wed, 22 Feb 2012)
New Revision: 38979
Added:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java
Removed:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-10989 - Disconnect should be Delete
https://issues.jboss.org/browse/JBIDE-10989
Added:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
(rev 0)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-02-22
13:34:07 UTC (rev 38979)
@@ -0,0 +1,25 @@
+package org.jboss.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.jboss.tools.openshift.express.internal.core.console.UserModel;
+import
org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+
+import com.openshift.express.client.IUser;
+
+public class DeleteConnectionAction extends AbstractAction {
+
+ public DeleteConnectionAction() {
+ super(OpenShiftExpressUIMessages.DELETE_CONNECTION_ACTION);
+ }
+
+ @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);
+ }
+ }
+
+
+}
\ No newline at end of file
Property changes on:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-22
13:31:24 UTC (rev 38978)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-22
13:34:07 UTC (rev 38979)
@@ -6,6 +6,7 @@
private static final String BUNDLE_NAME = OpenShiftExpressUIMessages.class.getName();
+
static {
NLS.initializeMessages(BUNDLE_NAME, OpenShiftExpressUIMessages.class);
}
@@ -40,4 +41,5 @@
public static String REFRESH_VIEWER_ACTION;
+ public static String DELETE_CONNECTION_ACTION;
}
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-22
13:31:24 UTC (rev 38978)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-22
13:34:07 UTC (rev 38979)
@@ -16,3 +16,6 @@
SHOW_PROPERTIES_VIEW_ACTION=Properties
REFRESH_VIEWER_ACTION=Refresh
+DELETE_CONNECTION_ACTION=Delete
+
+
Copied:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java
(from rev 38935,
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java)
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java
(rev 0)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java 2012-02-22
13:34:07 UTC (rev 38979)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * 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.jboss.tools.openshift.express.internal.ui.action.DeleteConnectionAction;
+
+
+
+/**
+ * @author Rob Stryker
+ */
+public class DeleteConnectionActionProvider extends AbstractActionProvider {
+
+
+
+ public DeleteConnectionActionProvider() {
+ super(new DeleteConnectionAction(), "group.edition");
+ }
+
+}
Deleted:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-22
13:31:24 UTC (rev 38978)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-22
13:34:07 UTC (rev 38979)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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("Disconnect");
- }
-
- @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);
- }
- }
-
-
- }
-
-}