Author: xcoulon
Date: 2012-02-29 08:38:59 -0500 (Wed, 29 Feb 2012)
New Revision: 39191
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.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/AbstractActionProvider.java
Log:
Fixed - JBIDE-11108
Server Adapter is not properly configured when it is created from OpenShift Express
Console
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-29
10:55:05 UTC (rev 39190)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-29
13:38:59 UTC (rev 39191)
@@ -155,6 +155,9 @@
this.fapplication = app;
this.app = app.getName();
showVerify = false;
+ ExpressServerUtils.fillServerWithOpenShiftDetails(
+ callback.getServer(), fapplication, fuser, mode,
+ deployProject, deployFolder, remote);
} catch( OpenShiftException ose ) {
// ignore, allow appList and appListNames to be null / empty
}
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-29
10:55:05 UTC (rev 39190)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogActionProvider.java 2012-02-29
13:38:59 UTC (rev 39191)
@@ -2,30 +2,20 @@
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
import org.eclipse.ui.navigator.ICommonViewerSite;
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
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.ui.viewer.actionProvider.AbstractActionProvider;
-public class TailServerLogActionProvider extends CommonActionProvider {
+public class TailServerLogActionProvider extends AbstractActionProvider {
- private TailServerLogAction action;
-
- private ICommonActionExtensionSite actionExtensionSite;
-
- public void init(ICommonActionExtensionSite actionExtensionSite) {
- super.init(actionExtensionSite);
- this.actionExtensionSite = actionExtensionSite;
- ICommonViewerSite site = actionExtensionSite.getViewSite();
- if (site instanceof ICommonViewerWorkbenchSite) {
- action = new TailServerLogAction();
- action.setSelection(actionExtensionSite.getStructuredViewer().getSelection());
- }
+ public TailServerLogActionProvider() {
+ super(new TailServerLogAction(), "group.showIn");
}
-
+
+ @Override
public void fillContextMenu(IMenuManager menu) {
if (action != null && action.isEnabled()) {
Object sel = getSelection();
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.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/AbstractActionProvider.java 2012-02-29
10:55:05 UTC (rev 39190)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractActionProvider.java 2012-02-29
13:38:59 UTC (rev 39191)
@@ -22,8 +22,10 @@
*/
public abstract class AbstractActionProvider extends CommonActionProvider {
- private final AbstractAction action;
+ protected final AbstractAction action;
+ protected ICommonActionExtensionSite actionExtensionSite;
+
private final String group;
public AbstractActionProvider(AbstractAction action, String group) {
@@ -33,6 +35,7 @@
public void init(ICommonActionExtensionSite actionExtensionSite) {
super.init(actionExtensionSite);
+ this.actionExtensionSite = actionExtensionSite;
ICommonViewerSite site = actionExtensionSite.getViewSite();
if (site instanceof ICommonViewerWorkbenchSite) {
action.setViewer(actionExtensionSite.getStructuredViewer());
Show replies by date