Author: xcoulon Date: 2012-02-03 12:32:06 -0500 (Fri, 03 Feb 2012) New Revision: 38419 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/console_view.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/edit.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/go-into.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/open-browser.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query-new.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh_remote.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/repository-middle.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/resource_obj.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository-new.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task.gif trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/copy_edit_co.gif Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 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/ui/OpenShiftUIActivator.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/console/TailConsolePageParticipant.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java Log: OPEN - issue JBIDE-10528: Improve OpenShift UI https://issues.jboss.org/browse/JBIDE-10528 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-02-03 17:32:06 UTC (rev 38419) @@ -38,6 +38,8 @@ org.eclipse.wst.common.modulecore;bundle-version="1.2.101", org.jboss.ide.eclipse.as.wtp.core;bundle-version="2.3.0", org.eclipse.ui.forms;bundle-version="3.5.100", + org.eclipse.jface.text;bundle-version="3.7.0", + org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", org.jboss.ide.eclipse.archives.webtools;bundle-version="2.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/console_view.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/console_view.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/copy_edit_co.gif =================================================================== (Binary files differ) Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/edit.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/edit.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/go-into.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/go-into.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/open-browser.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/open-browser.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query-new.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query-new.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/query.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh_remote.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/refresh_remote.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/repository-middle.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/repository-middle.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/resource_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/resource_obj.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository-new.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository-new.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task-repository.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task.gif =================================================================== (Binary files differ) Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/task.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream 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-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-03 17:32:06 UTC (rev 38419) @@ -173,11 +173,12 @@ class="org.jboss.tools.openshift.express.internal.ui.console.TailServerLogActionProvider" id="org.jboss.tools.openshift.express.ui.internal.ui.console.tailServerLogActionProvider"> <enablement> - <and> - <instanceof - value="org.eclipse.wst.server.core.IServer"> - </instanceof> - </and> + <and> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </and> + </enablement> </actionProvider> </extension> @@ -275,10 +276,7 @@ typeIds="org.jboss.tools.openshift.express.openshift.server.type"> </fragment> </extension> - - - - + <!-- Openshift Binary --> <extension point="org.jboss.ide.eclipse.as.ui.DeployMethodUI"> @@ -286,5 +284,276 @@ deployMethodId="openshiftBinary"> </ui> </extension> - + + <!-- the 'Express console' view --> + <extension + point="org.eclipse.ui.views"> + <!--view + category="org.jboss.tools.common.model.ui.views" + class="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftConsoleExpressView" + icon="icons/openshift-logo-white-icon.png" + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView" + name="OpenShift Express Console"> + </view--> + <view + category="org.jboss.tools.common.model.ui.views" + class="org.eclipse.ui.navigator.CommonNavigator" + icon="icons/openshift-logo-white-icon.png" + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView" + name="OpenShift Express Console"> + </view> + + </extension> + <extension point="org.eclipse.ui.navigator.viewer"> + <viewer + viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <popupMenu + allowsPlatformContributions="false"> + <insertionPoint + name="group.showIn" + separator="true"> + </insertionPoint> + <insertionPoint + name="group.edition" + separator="true"> + </insertionPoint> + <insertionPoint + name="group.server" + separator="true"> + </insertionPoint> + <insertionPoint + name="group.properties" + separator="true"> + </insertionPoint> + </popupMenu> + <options> + <property + name="org.eclipse.ui.navigator.hideLinkWithEditorAction" + value="true"> + </property> + </options> + </viewer> + <viewerActionBinding viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <includes> + <actionExtension + pattern="org.jboss.tools.openshift.express.internal.ui.viewer.*"/> + </includes> + </viewerActionBinding> + <viewerContentBinding + viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <includes> + <contentExtension + isRoot="false" + pattern="org.jboss.tools.openshift.express.ui.viewer.expressConsoleContent"> + </contentExtension> + </includes> + </viewerContentBinding> + </extension> + <extension + point="org.eclipse.ui.navigator.navigatorContent"> + <navigatorContent + contentProvider="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider" + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleContent" + labelProvider="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleLabelProvider" + name="OpenShift Express Console Content"> + <triggerPoints></triggerPoints> + </navigatorContent> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.EditDomainActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.editDomainAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IUser"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.CreateApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.createApplicationAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IUser"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.OpenInWebBrowserActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.openInWebBrowserAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.TailServerLogActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.tailServerLogAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.EditCartridgesActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.editCartridgesAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.ImportApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.importApplicationAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.DeleteApplicationActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.deleteApplicationAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.CreateServerAdapterActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.createServerAdapterAction"> + <enablement> + <and> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + </and> + </enablement> + </actionProvider> + <actionProvider + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.ShowPropertiesActionProvider" + id="org.jboss.tools.openshift.express.internal.ui.viewer.showPropertiesAction"> + <enablement> + <or> + <instanceof + value="com.openshift.express.client.IUser"> + </instanceof> + <instanceof + value="com.openshift.express.client.IApplication"> + </instanceof> + <instanceof + value="com.openshift.express.client.IEmbeddableCartridge"> + </instanceof> + </or> + </enablement> + </actionProvider> + + </extension> + + <extension + point="org.eclipse.ui.viewActions"> + <viewContribution + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewContribution" + targetID="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <!--action + class="org.jboss.tools.openshift.express.internal.ui.viewer.RefreshDomainAction" + icon="icons/refresh.gif" + id="org.jboss.tools.openshift.express.ui.viewActions.refreshAction" + label="Refresh" + style="push" + toolbarPath="openshift"> + </action--> + <action + class="org.jboss.tools.openshift.express.internal.ui.viewer.action.OpenConnectionDialogActionDelegate" + icon="icons/resource_obj.gif" + id="org.jboss.tools.openshift.express.ui.viewActions.openConnectionWizard" + label="Connect" + style="push" + toolbarPath="openshift" + tooltip="Connect to OpenShift"> + </action> + </viewContribution> + </extension> + <!-- when using the 'classic' properties view. --> + <extension + point="org.eclipse.core.runtime.adapters"> + <factory + adaptableType="com.openshift.express.client.IUser" + class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory"> + <adapter + type="org.eclipse.ui.views.properties.IPropertySource"> + </adapter> + </factory> + <factory + adaptableType="com.openshift.express.client.IApplication" + class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory"> + <adapter + type="org.eclipse.ui.views.properties.IPropertySource"> + </adapter> + </factory> + <factory + adaptableType="com.openshift.express.client.IEmbeddableCartridge" + class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory"> + <adapter + type="org.eclipse.ui.views.properties.IPropertySource"> + </adapter> + </factory> + </extension> + <!-- when using the new 'tabbed' properties view. --> + + <!--extension + point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> + <propertyContributor + contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView" + typeMapper="org.jboss.tools.openshift.express.internal.ui.viewer.TypeMapper"> + <propertyCategory + category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory"></propertyCategory> + </propertyContributor> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> + <propertyTabs + contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <propertyTab + category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory" + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleUserTab" + label="Account"> + </propertyTab> + <propertyTab + category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory" + id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleApplicationsTab" + label="Account"> + </propertyTab> + </propertyTabs> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertySections"> + <propertySections + contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> + <propertySection + class="org.jboss.tools.openshift.express.internal.ui.viewer.property.UserPropertySection" + id="org.jboss.tools.openshift.express.ui.userPropertySection" + tab="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTab"> + <input + type="com.openshift.express.client.IUser"> + </input> + </propertySection> + </propertySections> + </extension --> </plugin> Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -1,11 +1,20 @@ package org.jboss.tools.openshift.express.internal.ui; +import java.net.URL; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import com.openshift.express.client.IUser; + /** * The activator class controls the plug-in life cycle */ @@ -17,6 +26,9 @@ // The shared instance private static OpenShiftUIActivator plugin; + /** The user connected on OpenShift. */ + private IUser user = null; + /** * The constructor */ @@ -79,4 +91,40 @@ public static IStatus createErrorStatus(String message, Throwable throwable, Object... arguments) { return createErrorStatus(NLS.bind(message, arguments), throwable); } + + + public void setUser(IUser user) { + this.user = user; + } + + /** + * @return the user + */ + public final IUser getUser() { + return user; + } + + /** + * Creates an image by loading it from a file in the plugin's images + * directory. + * + * @param imagePath path to the image, relative to the /icons directory of the plugin + * @return The image object loaded from the image file + */ + public final Image createImage(final String imagePath) { + return createImageDescriptor(imagePath).createImage(); + } + + /** + * Creates an image descriptor by loading it from a file in the plugin's images + * directory. + * + * @param imagePath path to the image, relative to the /icons directory of the plugin + * @return The image object loaded from the image file + */ + public final ImageDescriptor createImageDescriptor(final String imagePath) { + IPath imageFilePath = new Path("/icons/" + imagePath); + URL imageFileUrl = FileLocator.find(this.getBundle(), imageFilePath, null); + return ImageDescriptor.createFromURL(imageFileUrl); + } } 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-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -221,7 +221,7 @@ } private void verifyPressed() { - final CredentialsWizardPageModel model = new CredentialsWizardPageModel(null); + final CredentialsWizardPageModel model = new CredentialsWizardPageModel(); this.fapplication = null; this.fuser = null; this.appListNames = null; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -44,7 +44,7 @@ * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { return null; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -9,11 +9,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.RemoteSession; import org.eclipse.jgit.transport.SshSessionFactory; @@ -24,7 +20,6 @@ import org.eclipse.ui.console.IConsoleConstants; import org.eclipse.ui.console.IConsoleListener; import org.eclipse.ui.console.MessageConsole; -import org.eclipse.ui.navigator.CommonViewer; import org.eclipse.ui.views.IViewDescriptor; import org.eclipse.ui.views.IViewRegistry; import org.eclipse.wst.server.core.IServer; @@ -33,6 +28,7 @@ import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker.JschToEclipseLogger; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.viewer.action.AbstractAction; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -44,11 +40,8 @@ * @author Xavier Coulon * */ -public class TailServerLogAction extends Action implements ISelectionChangedListener, IConsoleListener { +public class TailServerLogAction extends AbstractAction implements IConsoleListener { - /** The current selection in the view. */ - private ISelection selection = null; - /** * The message consoles associated with the 'tail' workers that write the * output. @@ -159,19 +152,6 @@ return command; } - @Override - public void selectionChanged(SelectionChangedEvent event) { - Object source = event.getSource(); - if (source instanceof CommonViewer) { - this.selection = ((CommonViewer) source).getSelection(); - } - } - - public void setSelection(ISelection selection) { - this.selection = selection; - - } - public IServer getServer() { if (selection instanceof IStructuredSelection) { final Object selectedItem = ((IStructuredSelection) selection).getFirstElement(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -4,18 +4,39 @@ public class OpenShiftExpressUIMessages extends NLS { - private static final String BUNDLE_NAME = OpenShiftExpressUIMessages.class.getName(); + private static final String BUNDLE_NAME = OpenShiftExpressUIMessages.class.getName(); - static { - NLS.initializeMessages(BUNDLE_NAME, OpenShiftExpressUIMessages.class); - } - - private OpenShiftExpressUIMessages() { - // Do not instantiate - } + static { + NLS.initializeMessages(BUNDLE_NAME, OpenShiftExpressUIMessages.class); + } - public static String HOSTNAME_NOT_ANSWERING; - - public static String TAIL_SERVER_LOG_ACTION; + private OpenShiftExpressUIMessages() { + // Do not instantiate + } + public static String HOSTNAME_NOT_ANSWERING; + + public static String TAIL_SERVER_LOG_ACTION; + + public static String EDIT_DOMAIN_ACTION; + + public static String SHOW_IN_ACTION_GROUP; + + public static String SHOW_IN_BROWSER_ACTION; + + public static String DELETE_APPLICATION_ACTION; + + public static String CREATE_APPLICATION_ACTION; + + public static String IMPORT_APPLICATION_ACTION; + + public static String CREATE_SERVER_ADAPTER_ACTION; + + public static String EDIT_CARTRIDGES_ACTION; + + public static String MAKE_SNAPSHOT_ACTION; + + public static String SHOW_PROPERTIES_VIEW_ACTION; + + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-02-03 17:32:06 UTC (rev 38419) @@ -1,2 +1,16 @@ HOSTNAME_NOT_ANSWERING=We weren''t able to lookup your hostname ({0}) in a reasonable amount of time. This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\nOnce you are able to access your application in a browser, you can then clone your git repository.\nIf you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\nIf this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode) TAIL_SERVER_LOG_ACTION=Remote console + +# +EDIT_DOMAIN_ACTION=Edit Domain +# +SHOW_IN_ACTION_GROUP=Show In +SHOW_IN_BROWSER_ACTION=Web Browser +DELETE_APPLICATION_ACTION=Delete Application +CREATE_APPLICATION_ACTION=New OpenShift Application +IMPORT_APPLICATION_ACTION=Import Application +CREATE_SERVER_ADAPTER_ACTION=Create a Server Adapter +EDIT_CARTRIDGES_ACTION=Edit Embeddable Cartridges +MAKE_SNAPSHOT_ACTION=Pull down Application Snapshot + +SHOW_PROPERTIES_VIEW_ACTION=Properties Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,30 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.eclipse.jface.wizard.Wizard; +import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPage; + +public class ConnectToOpenShiftWizard extends Wizard { + + private final CredentialsWizardPage page = new CredentialsWizardPage(this); + + public ConnectToOpenShiftWizard() { + setNeedsProgressMonitor(true); + } + + @Override + public boolean performFinish() { + if(page.performAuthentication()) { + return true; + } + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#addPages() + */ + @Override + public void addPages() { + addPage(page); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,45 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.swt.graphics.Image; + +public class LabelProvider implements ILabelProvider { + + @Override + public void addListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + @Override + public boolean isLabelProperty(Object element, String property) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void removeListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + @Override + public Image getImage(Object element) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getText(Object element) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,129 @@ +/** + * + */ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StackLayout; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Link; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.navigator.CommonViewer; +import org.eclipse.ui.part.ViewPart; +import org.eclipse.ui.views.properties.IPropertySheetPage; +import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; +import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IUser; + +/** + * @author Xavier Coulon + * + */ +public class OpenShiftConsoleExpressView extends ViewPart implements ITabbedPropertySheetPageContributor { + + private static final String VIEWER_ID = "org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewer"; + + private Composite loginContainer = null; + + private CommonViewer commonViewer = null; + + private final StackLayout layout = new StackLayout(); + + private Composite stackContainer = null; + + private TabbedPropertySheetPage tabbedPropertySheetPage; + + /* + * (non-Javadoc) + * @see org.eclipse.ui.navigator.CommonNavigator#createPartControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createPartControl(Composite parent) { + stackContainer = new Composite(parent, SWT.NONE); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(stackContainer); + stackContainer.setLayout(layout); + loginContainer = new Composite(stackContainer, SWT.BORDER); + GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(loginContainer); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginContainer); + loginContainer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); + Link loginLink = new Link(loginContainer, SWT.WRAP); + loginLink.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); + loginLink.setText("Click <a>here</a> to connect to your OpenShift account."); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginLink); + loginLink.addSelectionListener(onLoginLinkClicked()); + + commonViewer = new CommonViewer(VIEWER_ID, stackContainer, SWT.BORDER); + GridLayoutFactory.fillDefaults().applyTo(commonViewer.getTree()); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(commonViewer.getTree()); + commonViewer.setContentProvider(new OpenShiftExpressConsoleContentProvider()); + commonViewer.setLabelProvider(new OpenShiftExpressConsoleLabelProvider()); + getSite().setSelectionProvider(commonViewer); + layout.topControl = loginContainer; + } + + private SelectionListener onLoginLinkClicked() { + SelectionListener listener = new SelectionListener() { + + @Override + public void widgetSelected(SelectionEvent e) { + final Display display = Display.getCurrent(); + final Shell shell = new Shell(display); + final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(); + int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell); + if (returnCode == Window.OK) { + Logger.debug("OpenShift Auth succeeded."); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user)); + switchToCommonViewer(); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }; + return listener; + } + + @Override + public void setFocus() { + layout.topControl.setFocus(); + } + + + public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + if (adapter == IPropertySheetPage.class) { + if (tabbedPropertySheetPage == null) { + tabbedPropertySheetPage = new TabbedPropertySheetPage(this); + } + return tabbedPropertySheetPage; + } + return super.getAdapter(adapter); + } + + public void switchToCommonViewer() { + layout.topControl = this.commonViewer.getTree(); + stackContainer.layout(); + } + + public CommonViewer getCommonViewer() { + return this.commonViewer; + } + + @Override + public String getContributorId() { + return VIEWER_ID; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,21 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import com.openshift.express.client.IUser; + +public class OpenShiftExpressConsoleContentCategory { + + private final IUser user; + + public OpenShiftExpressConsoleContentCategory(final IUser user) { + this.user = user; + } + + /** + * @return the user + */ + public IUser getUser() { + return user; + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,97 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.TimeUnit; + +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + +public class OpenShiftExpressConsoleContentProvider implements ITreeContentProvider { + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + @Override + public Object[] getElements(final Object parentElement) { + if(parentElement instanceof IWorkspaceRoot) { + return new Object[0]; + } + final ArrayBlockingQueue<Object[]> queue = new ArrayBlockingQueue<Object[]>(1); + try { + Job job = new Job("Loading OpenShift Express User information...") { + + @Override + protected IStatus run(IProgressMonitor monitor) { + // TODO Auto-generated method stub + monitor.beginTask("Loading OpenShift Express information...", IProgressMonitor.UNKNOWN); + monitor.worked(1); + try { + if (parentElement instanceof OpenShiftExpressConsoleContentCategory) { + queue.offer(new Object[] { ((OpenShiftExpressConsoleContentCategory) parentElement).getUser() }); + } + if (parentElement instanceof IUser) { + queue.offer(((IUser) parentElement).getApplications().toArray()); + } + if (parentElement instanceof IApplication) { + queue.offer(((IApplication) parentElement).getEmbeddedCartridges().toArray()); + } + // .... the actual work is done here... + } catch (OpenShiftException e) { + Logger.error("Unable to retrieve OpenShift Express information", e); + } finally { + monitor.done(); + } + return Status.OK_STATUS; + } + }; + job.setPriority(Job.LONG); + job.schedule(); + //job.join(); + return queue.poll(10, TimeUnit.SECONDS); + } catch (Exception e) { + Logger.error("Failed to load OpenShit Express account information", e); + } + + return null; + } + + @Override + public Object[] getChildren(Object parentElement) { + return getElements(parentElement); + } + + @Override + public Object getParent(Object element) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean hasChildren(Object element) { + if (element instanceof IUser) { + return true; + } + if (element instanceof IApplication) { + return true; + } + return false; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,94 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; +import org.eclipse.jface.viewers.StyledString; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + +public class OpenShiftExpressConsoleLabelProvider implements IStyledLabelProvider, ILabelProvider { + + @Override + public void addListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + @Override + public void dispose() { + // TODO Auto-generated method stub + + } + + @Override + public boolean isLabelProperty(Object element, String property) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void removeListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + @Override + public Image getImage(Object element) { + if (element instanceof IUser) { + return OpenShiftUIActivator.getDefault().createImage("repository-middle.gif"); + } + if (element instanceof IApplication) { + return OpenShiftUIActivator.getDefault().createImage("query.gif"); + } + if (element instanceof IEmbeddableCartridge) { + return OpenShiftUIActivator.getDefault().createImage("task-repository.gif"); + } + return null; + } + + @Override + public String getText(Object element) { + return getStyledText(element).getString(); + } + + @Override + public StyledString getStyledText(Object element) { + if (element instanceof IUser) { + try { + String message = ((IUser) element).getRhlogin(); + StyledString styledString = new StyledString(message); + styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER); + return new StyledString(message); + } catch (OpenShiftException e) { + Logger.error("Failed to retrieve user's OpenShift login", e); + } + } + if (element instanceof IApplication) { + IApplication app = (IApplication) element; + String appName = app.getName(); + String appType = app.getCartridge().getName(); + StringBuilder sb = new StringBuilder(); + sb.append(appName); + sb.append(" "); + sb.append(appType); + StyledString styledString = new StyledString(sb.toString()); + styledString.setStyle(appName.length() + 1, appType.length(), StyledString.QUALIFIER_STYLER); + return styledString; + } + if (element instanceof IEmbeddableCartridge) { + String message = ((IEmbeddableCartridge) element).getName(); + StyledString styledString = new StyledString(message); + styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER); + return new StyledString(message); + } + return null; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,36 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.ui.navigator.CommonViewer; + +public abstract class AbstractAction extends Action implements ISelectionChangedListener { + + /** The current selection in the view. */ + protected ISelection selection = null; + + public AbstractAction(String text) { + super(text); + } + + public AbstractAction(String text, ImageDescriptor image) { + super(text, image); + } + + @Override + public void selectionChanged(SelectionChangedEvent event) { + Object source = event.getSource(); + if (source instanceof CommonViewer) { + this.selection = ((CommonViewer) source).getSelection(); + } + } + + public void setSelection(ISelection selection) { + this.selection = selection; + + } + +} \ No newline at end of file Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,36 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; + +public abstract class AbstractActionProvider extends CommonActionProvider { + + private final AbstractAction action; + + private final String group; + + public AbstractActionProvider(AbstractAction action, String group) { + this.action = action; + this.group = group; + } + + public void init(ICommonActionExtensionSite actionExtensionSite) { + super.init(actionExtensionSite); + ICommonViewerSite site = actionExtensionSite.getViewSite(); + if (site instanceof ICommonViewerWorkbenchSite) { + action.setSelection(actionExtensionSite.getStructuredViewer().getSelection()); + actionExtensionSite.getStructuredViewer().addSelectionChangedListener(action); + } + } + + @Override + public void fillContextMenu(IMenuManager menu) { + if (action != null && action.isEnabled()) { + menu.appendToGroup(group, action); + } + } + +} \ No newline at end of file Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/AbstractActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,32 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.express.client.IApplication; + +public class CreateApplicationAction extends AbstractAction { + + /** + * Constructor + */ + public CreateApplicationAction() { + super(OpenShiftExpressUIMessages.CREATE_APPLICATION_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("query-new.gif")); + } + + /** + * Operation called when the user clicks on 'Show In>Remote Console'. If no Console/Worker existed, a new one is + * created, otherwise, it is displayed. {@inheritDoc} + */ + @Override + public void run() { + if (selection != null && selection instanceof ITreeSelection && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,11 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + + +public class CreateApplicationActionProvider extends AbstractActionProvider { + + public CreateApplicationActionProvider() { + super(new CreateApplicationAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateApplicationActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,31 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.wst.server.core.ServerCore; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; + +import com.openshift.express.client.IApplication; + +public class CreateServerAdapterAction extends AbstractAction { + + public CreateServerAdapterAction() { + super(OpenShiftExpressUIMessages.CREATE_SERVER_ADAPTER_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection) selection; + if (selection != null && selection instanceof ITreeSelection + && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + ServerCore.getServers(); + /* + * EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(user, user); WizardDialog dialog = new + * WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open(); + */ + + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,9 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +public class CreateServerAdapterActionProvider extends AbstractActionProvider { + + public CreateServerAdapterActionProvider() { + super(new CreateServerAdapterAction(), "group.server"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/CreateServerAdapterActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,63 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; + +public class DeleteApplicationAction extends AbstractAction { + + /** + * Constructor + */ + public DeleteApplicationAction() { + super(OpenShiftExpressUIMessages.DELETE_APPLICATION_ACTION); + setImageDescriptor(PlatformUI.getWorkbench().getSharedImages() + .getImageDescriptor(ISharedImages.IMG_ETOOL_DELETE)); + } + + /** + * Operation called when the user clicks on 'Show In>Remote Console'. If no Console/Worker existed, a new one is + * created, otherwise, it is displayed. {@inheritDoc} + */ + @Override + public void run() { + if (selection != null && selection instanceof ITreeSelection && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); + final String appName = application.getName(); + final boolean confirm = MessageDialog + .openConfirm( + Display.getCurrent().getActiveShell(), + "Application deletion", + "You are about to destroy the '" + appName + "' application.\n" + + "This is NOT reversible, all remote data for this application will be removed."); + if (confirm) { + Job job = new Job("Deleting application '" + appName + "'...") { + protected IStatus run(IProgressMonitor monitor) { + try { + application.destroy(); + } catch (OpenShiftException e) { + Logger.error("Failed to delete application '" + appName + "'", e); + } finally { + monitor.done(); + } + return Status.OK_STATUS; + } + }; + job.setPriority(Job.SHORT); + job.schedule(); // start as soon as possible + } + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + +public class DeleteApplicationActionProvider extends AbstractActionProvider { + + public DeleteApplicationActionProvider() { + super(new DeleteApplicationAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/DeleteApplicationActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,35 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + +public class EditCartridgesAction extends AbstractAction { + + public EditCartridgesAction() { + super(OpenShiftExpressUIMessages.EDIT_CARTRIDGES_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("task-repository-new.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + +public class EditCartridgesActionProvider extends AbstractActionProvider { + + public EditCartridgesActionProvider() { + super(new EditCartridgesAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditCartridgesActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,33 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EditDomainDialog; + +import com.openshift.express.client.IUser; + +public class EditDomainAction extends AbstractAction { + + public EditDomainAction() { + super(OpenShiftExpressUIMessages.EDIT_DOMAIN_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + } + + @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(); + EditDomainDialog wizard = new EditDomainDialog(user); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,11 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.ui.navigator.ICommonMenuConstants; + +public class EditDomainActionProvider extends AbstractActionProvider { + + public EditDomainActionProvider() { + super(new EditDomainAction(), "group.edition"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/EditDomainActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,36 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; +import org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizard; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; + +public class ImportApplicationAction extends AbstractAction { + + public ImportApplicationAction() { + super(OpenShiftExpressUIMessages.IMPORT_APPLICATION_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("go-into.gif")); + } + + @Override + public void run() { + final ITreeSelection treeSelection = (ITreeSelection)selection; + if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { + final IApplication application = (IApplication) treeSelection.getFirstElement(); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + ImportExistingApplicationWizard wizard = new ImportExistingApplicationWizard(); + WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); + dialog.create(); + dialog.open(); + + } + } + + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + +public class ImportApplicationActionProvider extends AbstractActionProvider { + + public ImportApplicationActionProvider() { + super(new ImportApplicationAction(), "group.server"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ImportApplicationActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,54 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.navigator.CommonNavigator; +import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; +import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentCategory; + +import com.openshift.express.client.IUser; + +public class OpenConnectionDialogActionDelegate implements IViewActionDelegate { + + private CommonNavigator view; + + @Override + public void run(IAction action) { + final Display display = Display.getCurrent(); + final Shell shell = new Shell(display); + final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(); + int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell); + if (returnCode == Window.OK) { + Logger.debug("OpenShift Auth succeeded."); + if (view != null) { + IUser user = OpenShiftUIActivator.getDefault().getUser(); + //view.switchToCommonViewer(); + view.getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user)); + //view.getCommonViewer().refresh(); + } + } + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + + } + + @Override + public void init(IViewPart view) { + if (view instanceof CommonNavigator) { + this.view = (CommonNavigator) view; + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenConnectionDialogActionDelegate.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,42 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.viewers.ITreeSelection; +import org.jboss.tools.common.ui.BrowserUtil; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; + +public class OpenInWebBrowserAction extends AbstractAction { + + /** + * Constructor + */ + public OpenInWebBrowserAction() { + super(OpenShiftExpressUIMessages.SHOW_IN_BROWSER_ACTION); + setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("open-browser.gif")); + } + + /** + * Operation called when the user clicks on 'Show In>Remote Console'. If no Console/Worker existed, a new one is + * created, otherwise, it is displayed. {@inheritDoc} + */ + @Override + public void run() { + if (selection != null && selection instanceof ITreeSelection + && ((ITreeSelection) selection).getFirstElement() instanceof IApplication) { + try { + final IApplication application = (IApplication) ((ITreeSelection) selection).getFirstElement(); + final String appName = application.getName(); + final String appUrl = application.getApplicationUrl(); + BrowserUtil.checkedCreateInternalBrowser(appUrl, appName, + OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog()); + } catch (OpenShiftException e) { + Logger.error("Failed to open OpenShift Application in a browser", e); + } + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + +public class OpenInWebBrowserActionProvider extends AbstractActionProvider { + + public OpenInWebBrowserActionProvider() { + super(new OpenInWebBrowserAction(), "group.showIn"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/OpenInWebBrowserActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,28 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; + +public class RefreshDomainAction implements IViewActionDelegate { + + @Override + public void run(IAction action) { + // TODO Auto-generated method stub + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/RefreshDomainAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,28 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +public class ShowPropertiesAction extends AbstractAction { + + public ShowPropertiesAction() { + super(OpenShiftExpressUIMessages.SHOW_PROPERTIES_VIEW_ACTION); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.action.Action#run() + */ + @Override + public void run() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.ui.views.PropertySheet"); + } catch (PartInitException e) { + Logger.error("Failed to show properties view", e); + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + + +public class ShowPropertiesActionProvider extends AbstractActionProvider { + + public ShowPropertiesActionProvider() { + super(new ShowPropertiesAction(), "group.properties"); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/ShowPropertiesActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,10 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.action; + +import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogAction; + +public class TailServerLogActionProvider extends AbstractActionProvider { + + public TailServerLogActionProvider() { + super(new TailServerLogAction(), "group.showIn"); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/action/TailServerLogActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,84 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import java.text.SimpleDateFormat; + +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +import org.eclipse.ui.views.properties.TextPropertyDescriptor; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.OpenShiftException; + +public class ApplicationPropertySource implements IPropertySource { + + private final IApplication application; + + public ApplicationPropertySource(IApplication adaptableObject) { + this.application = adaptableObject; + } + + @Override + public Object getEditableValue() { + return this; + } + + @Override + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[] { new TextPropertyDescriptor("3.URL", "Public URL"), + new TextPropertyDescriptor("1.Name", "Name"), + new TextPropertyDescriptor("6.UUID", "UUID"), + new TextPropertyDescriptor("5.Git URI", "Git URI"), + new TextPropertyDescriptor("2.Type", "Type"), + new TextPropertyDescriptor("4.Created on", "Created on") }; + } + + @Override + public Object getPropertyValue(Object id) { + try { + if (id.equals("3.URL")) { + return application.getApplicationUrl().toString(); + } + if (id.equals("1.Name")) { + return application.getName(); + } + if (id.equals("6.UUID")) { + return application.getUUID(); + } + if (id.equals("4.Created on")) { + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd 'at' HH:mm:ss"); + return format.format(application.getCreationTime()); + } + + if (id.equals("2.Type")) { + return application.getCartridge().getName(); + } + if (id.equals("5.Git URI")) { + return application.getGitUri(); + } + + + } catch (OpenShiftException e) { + Logger.error("Could not get selected object's property '" + id + "'.", e); + } + return null; + } + + @Override + public void resetPropertyValue(Object id) { + // TODO Auto-generated method stub + + } + + @Override + public void setPropertyValue(Object id, Object value) { + // TODO Auto-generated method stub + + } + + @Override + public boolean isPropertySet(Object id) { + return false; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,62 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +import org.eclipse.ui.views.properties.TextPropertyDescriptor; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.OpenShiftException; + +public class EmbeddableCartridgePropertySource implements IPropertySource { + + private final IEmbeddableCartridge cartridge; + + public EmbeddableCartridgePropertySource(IEmbeddableCartridge cartridge) { + this.cartridge = cartridge; + } + + @Override + public Object getEditableValue() { + return this; + } + + @Override + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[] { new TextPropertyDescriptor("Name", "Name"), + new TextPropertyDescriptor("URL", "URL") }; + } + + @Override + public Object getPropertyValue(Object id) { + try { + if (id.equals("Name")) { + return cartridge.getName(); + } + if (id.equals("URL")) { + return cartridge.getUrl(); + } + } catch (OpenShiftException e) { + Logger.error("Could not get selected object's property '" + id + "'.", e); + } + return null; + } + + @Override + public void resetPropertyValue(Object id) { + // TODO Auto-generated method stub + + } + + @Override + public void setPropertyValue(Object id, Object value) { + // TODO Auto-generated method stub + + } + + @Override + public boolean isPropertySet(Object id) { + return false; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,47 @@ +/** + * + */ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.ui.views.properties.IPropertySource; + +import com.openshift.express.client.IApplication; +import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.IUser; + +/** + * @author Xavier Coulon + * + */ +public class PropertySourceAdapterFactory implements IAdapterFactory { + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) + */ + @Override + public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) { + if(adapterType == IPropertySource.class) { + if(adaptableObject instanceof IUser) { + return new UserPropertySource((IUser)adaptableObject); + } + if(adaptableObject instanceof IApplication) { + return new ApplicationPropertySource((IApplication)adaptableObject); + }if(adaptableObject instanceof IEmbeddableCartridge) { + return new EmbeddableCartridgePropertySource((IEmbeddableCartridge)adaptableObject); + } + } + return null; + } + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() + */ + @Override + public Class<?>[] getAdapterList() { + return new Class[] { IPropertySource.class }; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,17 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import org.eclipse.jface.viewers.TreeNode; +import org.eclipse.ui.views.properties.tabbed.AbstractTypeMapper; + +public class TypeMapper extends AbstractTypeMapper { + + @SuppressWarnings("rawtypes") + @Override + public Class mapType(Object object) { + if (object instanceof TreeNode) { + return ((TreeNode) object).getValue().getClass(); + } + return super.mapType(object); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,54 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection; +import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; + +public class UserPropertySection extends AbstractPropertySection { + + private Text labelText; + + public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) { + super.createControls(parent, aTabbedPropertySheetPage); + Composite composite = getWidgetFactory().createFlatFormComposite(parent); + FormData data; + + labelText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$ + data = new FormData(); + data.left = new FormAttachment(0, STANDARD_LABEL_WIDTH); + data.right = new FormAttachment(100, 0); + data.top = new FormAttachment(0, ITabbedPropertyConstants.VSPACE); + labelText.setLayoutData(data); + //labelText.addModifyListener(listener); + + CLabel labelLabel = getWidgetFactory().createCLabel(composite, "Label:"); //$NON-NLS-1$ + data = new FormData(); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(labelText, -ITabbedPropertyConstants.HSPACE); + data.top = new FormAttachment(labelText, 0, SWT.CENTER); + labelLabel.setLayoutData(data); + } + + public void setInput(IWorkbenchPart part, ISelection selection) { + super.setInput(part, selection); + Assert.isTrue(selection instanceof IStructuredSelection); + Object input = ((IStructuredSelection) selection).getFirstElement(); + } + + public void refresh() { +// labelText.removeModifyListener(listener); +// ButtonElementProperties properties = (ButtonElementProperties) buttonElement.getAdapter(IPropertySource.class); +// labelText.setText(properties.strText); +// labelText.addModifyListener(listener); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,62 @@ +package org.jboss.tools.openshift.express.internal.ui.viewer.property; + +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; +import org.eclipse.ui.views.properties.TextPropertyDescriptor; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + +public class UserPropertySource implements IPropertySource { + + private final IUser user; + + public UserPropertySource(IUser user) { + this.user = user; + } + + @Override + public Object getEditableValue() { + return this; + } + + @Override + public IPropertyDescriptor[] getPropertyDescriptors() { + return new IPropertyDescriptor[] { new TextPropertyDescriptor("Username", "Username"), + new TextPropertyDescriptor("Domain", "Domain") }; + } + + @Override + public Object getPropertyValue(Object id) { + try { + if (id.equals("Username")) { + return user.getRhlogin(); + } + if (id.equals("Domain")) { + return user.getDomain().getNamespace() + "." + user.getDomain().getRhcDomain(); + } + } catch (OpenShiftException e) { + Logger.error("Could not get selected object's property '" + id + "'.", e); + } + return null; + } + + @Override + public void resetPropertyValue(Object id) { + // TODO Auto-generated method stub + + } + + @Override + public void setPropertyValue(Object id, Object value) { + // TODO Auto-generated method stub + + } + + @Override + public boolean isPropertySet(Object id) { + return false; + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -30,13 +30,15 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** * @author Andr� Dietisheim * @author Xavier Coulon */ -public class CreateNewApplicationWizard extends AbstractOpenShiftApplicationWizard<CreateNewApplicationWizardModel> implements INewWizard { +public class CreateNewApplicationWizard extends AbstractOpenShiftApplicationWizard<CreateNewApplicationWizardModel> + implements INewWizard { public CreateNewApplicationWizard() { setWizardModel(new CreateNewApplicationWizardModel()); @@ -45,7 +47,17 @@ @Override public void addPages() { - addPage(new CredentialsWizardPage(this, getWizardModel())); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + try { + if (user == null || !user.isValid()) { + addPage(new CredentialsWizardPage(this)); + } else { + getWizardModel().setUser(user); + } + } catch (OpenShiftException e) { + // if the user's validity can't be checked, we may want to re-connect.. + addPage(new CredentialsWizardPage(this)); + } addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel())); addPage(new GitCloningSettingsWizardPage(this, getWizardModel())); @@ -66,18 +78,16 @@ if (successfull) { successfull = processCartridges(); } - if(successfull) { + if (successfull) { try { final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - IStatus jobResult = - WizardUtils.runInWizard( - new ImportJob(delegatingMonitor), - delegatingMonitor, getContainer()); + IStatus jobResult = WizardUtils.runInWizard(new ImportJob(delegatingMonitor), delegatingMonitor, + getContainer()); return JobUtils.isOk(jobResult); } catch (Exception e) { - ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", - new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "An exception occurred while creating local git repository.", e)); + ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", new Status( + IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + "An exception occurred while creating local git repository.", e)); return false; } } @@ -129,8 +139,8 @@ } catch (OpenShiftException e) { queue.offer(false); return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind( - "Could not embed cartridges to application {0}", getWizardModel().getApplication() - .getName()), e); + "Could not embed cartridges to application {0}", getWizardModel() + .getApplication().getName()), e); } return Status.OK_STATUS; } @@ -140,5 +150,5 @@ return false; } } - + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.lang.reflect.InvocationTargetException; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; @@ -43,6 +44,7 @@ import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; /** @@ -53,15 +55,15 @@ protected static final String OPENSHIFT_EXPRESS_SIGNUP_URL = "https://openshift.redhat.com/app/user/new/express"; //$NON-NLS-1$ - private final CredentialsWizardPageModel model; + private final CredentialsWizardPageModel pageModel; private Text rhLoginText = null; private Text passwordText = null; - public CredentialsWizardPage(IWizard wizard, AbstractOpenShiftApplicationWizardModel wizardModel) { + public CredentialsWizardPage(IWizard wizard) { super("Server connection", "Please provide your OpenShift Express user credentials, then click 'next'.", "Server Connection", wizard); - this.model = new CredentialsWizardPageModel(wizardModel); + this.pageModel = new CredentialsWizardPageModel(); } protected void doCreateControls(Composite container, DataBindingContext dbc) { @@ -83,7 +85,7 @@ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(rhLoginText); UIUtils.selectAllOnFocus(rhLoginText); final IObservableValue rhLoginObservable = BeanProperties.value(CredentialsWizardPageModel.PROPERTY_RHLOGIN) - .observe(model); + .observe(pageModel); dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(rhLoginText), rhLoginObservable); Label passwordLabel = new Label(container, SWT.NONE); @@ -93,12 +95,12 @@ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).span(2, 1).applyTo(passwordText); UIUtils.selectAllOnFocus(passwordText); final IObservableValue passwordModelObservable = BeanProperties.value(CredentialsWizardPageModel.PROPERTY_PASSWORD) - .observe(model); + .observe(pageModel); final ISWTObservableValue passwordTextObservable = WidgetProperties.text(SWT.Modify).observe(passwordText); dbc.bindValue(passwordTextObservable, passwordModelObservable); IObservableValue credentialsStatusObservable = BeanProperties.value( - CredentialsWizardPageModel.PROPERTY_CREDENTIALS_STATUS).observe(model); + CredentialsWizardPageModel.PROPERTY_CREDENTIALS_STATUS).observe(pageModel); dbc.addValidationStatusProvider(new CredentialsInputValidator(rhLoginObservable, passwordModelObservable)); final CredentialsStatusValidator credentialsStatusValidator = new CredentialsStatusValidator(credentialsStatusObservable, passwordTextObservable); @@ -131,7 +133,7 @@ @Override protected void onPageActivated(DataBindingContext dbc) { super.onPageActivated(dbc); - if (model.getRhLogin() == null || model.getRhLogin().isEmpty() && rhLoginText != null) { + if (pageModel.getRhLogin() == null || pageModel.getRhLogin().isEmpty() && rhLoginText != null) { rhLoginText.setFocus(); } else if (passwordText != null) { passwordText.setFocus(); @@ -143,31 +145,36 @@ if (direction == Direction.BACKWARDS) { return; } + if (!pageModel.areCredentialsValid()) { + event.doit = performAuthentication(); + if (!event.doit) { + passwordText.setFocus(); + passwordText.selectAll(); + } + } + } - if (!model.areCredentialsValid()) { - try { - final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1); - WizardUtils.runInWizard(new Job("Verifying user credentials...") { - @Override - protected IStatus run(IProgressMonitor monitor) { - IStatus status = model.validateCredentials(); - queue.offer(status); - monitor.done(); - return Status.OK_STATUS; - } - }, new DelegatingProgressMonitor(), getContainer(), getDatabindingContext()); - queue.poll(10, TimeUnit.SECONDS); - event.doit = model.areCredentialsValid(); - if(!event.doit) { - passwordText.setFocus(); - passwordText.selectAll(); + public boolean performAuthentication() { + try { + final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1); + WizardUtils.runInWizard(new Job("Verifying user credentials...") { + @Override + protected IStatus run(IProgressMonitor monitor) { + IStatus status = pageModel.validateCredentials(); + queue.offer(status); + monitor.done(); + return Status.OK_STATUS; } - } catch (Exception ex) { - event.doit = false; - } finally { - } - + }, new DelegatingProgressMonitor(), getContainer(), getDatabindingContext()); + queue.poll(10, TimeUnit.SECONDS); + } catch (InterruptedException e) { + Logger.error("Failed to authenticate on OpenShift", e); + return false; + } catch (InvocationTargetException e) { + Logger.error("Failed to authenticate on OpenShift", e); + return false; } + return pageModel.areCredentialsValid(); } class CredentialsInputValidator extends MultiValidator { @@ -210,7 +217,7 @@ final IStatus credentialsValidityStatus = (IStatus) credentialsStatusObservable.getValue(); if (credentialsValidityStatus != null) { - final IStatus credentialsValidity = model.getCredentialsStatus(); + final IStatus credentialsValidity = pageModel.getCredentialsStatus(); return credentialsValidity; } return ValidationStatus.ok(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -47,10 +47,7 @@ private IUser user; private StringPreferenceValue rhLoginPreferenceValue; - private AbstractOpenShiftApplicationWizardModel wizardModel; - - public CredentialsWizardPageModel(AbstractOpenShiftApplicationWizardModel model) { - this.wizardModel = model; + public CredentialsWizardPageModel() { this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID); this.rhLogin = initRhLogin(); resetCredentialsStatus(); @@ -136,6 +133,7 @@ this.user = new User(getRhLogin(), getPassword(), CLIENT_ID); if (user.isValid()) { status = Status.OK_STATUS; + OpenShiftUIActivator.getDefault().setUser(user); } } catch (NotFoundOpenShiftException e) { // valid user without domain @@ -145,8 +143,7 @@ } catch (Exception e) { this.user = null; } - if( wizardModel != null ) - wizardModel.setUser(user); + setCredentialsStatus(status); return status; } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,60 @@ +/******************************************************************************* + * 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.wizard; + +import org.eclipse.jface.wizard.Wizard; + +import com.openshift.express.client.IUser; + +/** + * @author Andre Dietisheim + * @author Xavier Coulon + */ +public class EditDomainDialog extends Wizard { + + private EditDomainWizardPageModel model; + + public EditDomainDialog(IUser user) { + this.model = new EditDomainWizardPageModel(user); + setNeedsProgressMonitor(true); + } + + @Override + public boolean performFinish() { +// final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); +// try { +// WizardUtils.runInWizard(new Job("Renaming domain...") { +// +// @Override +// protected IStatus run(IProgressMonitor monitor) { +// try { +// model.renameDomain(); +// queue.offer(true); +// } catch (Exception e) { +// queue.offer(false); +// return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, +// NLS.bind("Could not create domain \"{0}\"", model.getNamespace()), e); +// } +// return Status.OK_STATUS; +// } +// }, getContainer()); +// } catch (Exception e) { +// // ignore +// } +// return queue.poll(); + return true; + } + + @Override + public void addPages() { + addPage(new EditDomainWizardPage(model, this)); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,149 @@ +/******************************************************************************* + * 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.wizard; + +import org.eclipse.core.databinding.Binding; +import org.eclipse.core.databinding.DataBindingContext; +import org.eclipse.core.databinding.UpdateValueStrategy; +import org.eclipse.core.databinding.beans.BeanProperties; +import org.eclipse.core.databinding.conversion.Converter; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.databinding.swt.WidgetProperties; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.common.ui.databinding.DataBindingUtils; +import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; + +import com.openshift.express.client.IDomain; +import com.openshift.express.client.OpenShiftException; + +/** + * @author André Dietisheim + */ +public class EditDomainWizardPage extends AbstractOpenShiftWizardPage { + + private EditDomainWizardPageModel model; + + public EditDomainWizardPage(EditDomainWizardPageModel model, IWizard wizard) { + super("Domain", "Create a new domain", "New Domain", wizard); + this.model = model; + } + + protected void doCreateControls(Composite container, DataBindingContext dbc) { + GridLayoutFactory.fillDefaults().numColumns(3).applyTo(container); + createDomainGroup(container, dbc); + } + + private void createDomainGroup(Composite container, DataBindingContext dbc) { + Group domainGroup = new Group(container, SWT.BORDER); + domainGroup.setText("Domain"); + GridDataFactory.fillDefaults() + .grab(true, false).align(SWT.FILL, SWT.TOP).span(3, 1).applyTo(domainGroup); + GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(4).applyTo(domainGroup); + Label namespaceLabel = new Label(domainGroup, SWT.NONE); + namespaceLabel.setText("&Domain name"); + GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(namespaceLabel); + Text namespaceText = new Text(domainGroup, SWT.BORDER); + GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(namespaceText); + Binding namespaceBinding = DataBindingUtils.bindMandatoryTextField( + namespaceText, "Domain", ApplicationWizardPageModel.PROPERTY_NAMESPACE, model, dbc); + Button createRenameButton = new Button(domainGroup, SWT.PUSH); + DataBindingUtils.bindEnablementToValidationStatus(createRenameButton, IStatus.OK, dbc, namespaceBinding); + dbc.bindValue(WidgetProperties.text().observe(createRenameButton) + , BeanProperties.value(ApplicationWizardPageModel.PROPERTY_DOMAIN).observe(model) + , new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER) + , new UpdateValueStrategy().setConverter(new Converter(IDomain.class, String.class) { + + @Override + public Object convert(Object fromObject) { + if (fromObject instanceof IDomain) { + return "&Rename"; + } else { + return "&Create"; + } + } + })); + GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).hint(80, SWT.DEFAULT).applyTo(createRenameButton); + createRenameButton.addSelectionListener(onCreateRenameDomain(dbc)); + } + + private SelectionListener onCreateRenameDomain(DataBindingContext dbc) { + return new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + if (model.hasDomain()) { + renameDomain(); + } else { + try { + createDomain(); + } catch (OpenShiftException ex) { + IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, ex.getMessage(), ex); + OpenShiftUIActivator.getDefault().getLog().log(status); + ErrorDialog.openError(getShell(), "Error creating domain", + "An error occurred while creating the domain.", status); + } + } + } + }; + } + + private void createDomain() throws OpenShiftException { +// if (WizardUtils.openWizardDialog( +// new NewDomainDialog(model.getNamespace(), wizardModel), getContainer().getShell()) == Dialog.OK) { +// model.loadDomain(); +// } + } + + private void renameDomain() { + try { + WizardUtils.runInWizard( + new Job("Renaming domain...") { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + model.renameDomain(); + return Status.OK_STATUS; + } catch (Exception e) { + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + "Could not rename domain", e); + } + } + }, getContainer(), getDataBindingContext()); + } catch (Exception ex) { + // ignore + } + } + + + @Override + protected void setupWizardPageSupport(DataBindingContext dbc) { + ParametrizableWizardPageSupport.create(IStatus.ERROR, this, dbc); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -0,0 +1,66 @@ +/******************************************************************************* + * 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.wizard; + +import org.jboss.tools.common.ui.databinding.ObservableUIPojo; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.express.client.IDomain; +import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; + +/** + * @author André Dietisheim + * @author Xavier Coulon + */ +public class EditDomainWizardPageModel extends ObservableUIPojo { + + public static final String PROPERTY_NAMESPACE = "namespace"; + public static final String PROPERTY_DOMAIN = "domain"; + + private String namespace; + private IDomain domain; + + public EditDomainWizardPageModel(IUser user) { + try { + setDomain(user.getDomain()); + } catch (OpenShiftException e) { + Logger.error("Fail to retrieve OpenShift domain", e); + } + } + + public String getNamespace() { + return this.namespace; + } + + public void setNamespace(String namespace) { + firePropertyChange(PROPERTY_NAMESPACE, this.namespace, this.namespace = namespace); + } + + public boolean hasDomain() { + return domain != null; + } + + public IDomain getDomain() { + return domain; + } + + public void setDomain(IDomain domain) { + firePropertyChange(PROPERTY_DOMAIN, this.domain, this.domain = domain); + if (domain != null) { + setNamespace(domain.getNamespace()); + } + } + + public void renameDomain() throws OpenShiftException { + domain.setNamespace(namespace); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -80,7 +80,7 @@ Group embedGroup = new Group(parent, SWT.NONE); embedGroup.setText("Embeddable Cartridges"); GridDataFactory.fillDefaults() - .hint(200, 150).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(embedGroup); + .hint(200, 200).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(embedGroup); GridLayoutFactory.fillDefaults() .numColumns(3).margins(6, 6).applyTo(embedGroup); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -32,6 +32,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; +import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** @@ -70,7 +71,17 @@ @Override public void addPages() { setWizardModel(new ImportExistingApplicationWizardModel()); - addPage(new CredentialsWizardPage(this, getWizardModel())); + final IUser user = OpenShiftUIActivator.getDefault().getUser(); + try { + if(user == null || !user.isValid()) { + addPage(new CredentialsWizardPage(this)); + } else { + getWizardModel().setUser(user); + } + } catch (OpenShiftException e) { + // if the user's validity can't be checked, we may want to re-connect.. + addPage(new CredentialsWizardPage(this)); + } addPage(new ApplicationSelectionWizardPage(this, getWizardModel())); addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel())); addPage(new GitCloningSettingsWizardPage(this, getWizardModel())); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2012-02-03 16:20:53 UTC (rev 38418) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2012-02-03 17:32:06 UTC (rev 38419) @@ -27,8 +27,8 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.AdapterWizardPageModel; -import org.jboss.tools.openshift.express.internal.ui.wizard.CreateNewApplicationWizard; -import org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizard; +import org.jboss.tools.openshift.express.internal.ui.wizard.CreateNewApplicationWizardModel; +import org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizardModel; import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge;