[jbosstools-commits] JBoss Tools SVN: r28601 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: icons and 3 other directories.

Author: adietish Date: 2011-01-25 12:12:20 -0500 (Tue, 25 Jan 2011) New Revision: 28601 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keys.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keysd.gif trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java Log: [JBIDE-7772] * added command, handler, plugin.xml-declaration and icosn for managing keys in the context-menu of the cloud viewer * extracted common wizard code & moved it to AbstractDeltaCloudWizard * extracted common handler code & moved it to WizardUtils Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-25 17:12:20 UTC (rev 28601) @@ -1,3 +1,23 @@ +2011-01-25 André Dietisheim <André Dietisheim@adietisheim-thinkpad> + + * plugin.xml: + * plugin.properties: + * src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java: + [JBIDE-7772] added command, handler, plugin.xml-declaration and icosn for managing keys in the + context-menu of the cloud viewer + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java: + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java: + * src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java: + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java: + * src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java: + [JBIDE-7772] extracted common wizard code & moved it to AbstractDeltaCloudWizard + * src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java: + * src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java (.run): + * src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java (.run): + * src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java (.run): + * src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java (openWizardDialog): + [JBIDE-7772] extracted common handler code & moved it to WizardUtils + 2011-01-17 André Dietisheim <André Dietisheim@adietisheim-thinkpad> * src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java (nextPageOrFinish): Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keys.gif =================================================================== (Binary files differ) Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keys.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keysd.gif =================================================================== (Binary files differ) Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/keysd.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.properties 2011-01-25 17:12:20 UTC (rev 28601) @@ -43,7 +43,7 @@ command.newconnection.name = New Connection command.editconnection.description = Edits a Connection command.editconnection.name = Edit Connection -command.createinstance.description.0 = Launches an instance +command.createinstance.description = Launches an instance command.createinstance.name = Launch Instance command.startinstance.description = Starts a cloud instance command.startinstance.name = Start @@ -53,6 +53,10 @@ command.rebootinstance.name = Reboot command.destroyinstance.name = Destroy command.destroyinstance.description = Destroys a cloud instance +command.managekeys.description = Manages the keys of a cloud +command.managekeys.name = Manage Keys +command.managekeys.label = Manage Keys +command.managekeys.tooltip = Manage Keys command.filterimages.description = Filters images command.filterimages.name = Filter Images... command.filterinstances.description = Filters instances Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-25 17:12:20 UTC (rev 28601) @@ -269,6 +269,32 @@ </extension> <extension point="org.eclipse.ui.handlers"> + <!-- Manage Keys command handler --> + <handler + class="org.jboss.tools.deltacloud.ui.commands.ManageKeysHandler" + commandId="org.jboss.tools.deltacloud.ui.managekeys"> + <activeWhen> + <with + variable="selection"> + <iterate operator="and"> + <adapt + type="org.jboss.tools.deltacloud.core.DeltaCloud"> + <test property="org.jboss.tools.deltacloud.ui.commands.isValid" + value="true"/> + </adapt> + </iterate> + </with> + </activeWhen> + <enabledWhen> + <with + variable="selection"> + <count value="1" /> + </with> + </enabledWhen> + </handler> + </extension> + <extension + point="org.eclipse.ui.handlers"> <!-- image command handlers --> <handler class="org.jboss.tools.deltacloud.ui.commands.CreateInstanceFromSpecificImageHandler" @@ -489,15 +515,32 @@ name="connections" visible="true" /> <separator + name="keys" + visible="true" /> + <separator name="images" visible="true" /> <separator name="filters" visible="true" /> </menuContribution> - <!-- instance commands --> + <!-- manage keys command --> <menuContribution allPopups="true" + locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView?after=keys"> + <!-- connection commands --> + <command + commandId="org.jboss.tools.deltacloud.ui.managekeys" + icon="icons/keys.gif" + disabledIcon="icons/keysd.gif" + label="%command.managekeys.label" + style="push" + tooltip="%command.managekeys.tooltip"> + </command> + </menuContribution> + <!-- instance commands --> + <menuContribution + allPopups="true" locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView?after=instances"> <command commandId="org.jboss.tools.deltacloud.ui.startinstance" @@ -730,6 +773,12 @@ id="org.jboss.tools.deltacloud.ui.destroyinstance" name="%command.destroyinstance.name"> </command> + <!-- manage keys command --> + <command + description="%command.managekeys.description" + id="org.jboss.tools.deltacloud.ui.managekeys" + name="%command.managekeys.name"> + </command> <!-- filter commands --> <command description="%command.filterimages.description" Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -17,13 +17,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; +import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilterWizard; /** @@ -47,10 +46,7 @@ Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - IWizard wizard = new ImageFilterWizard(cloud); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - dialog.open(); + WizardUtils.openWizardDialog(new ImageFilterWizard(cloud), shell); } }); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -17,13 +17,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; +import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.InstanceFilterWizard; /** @@ -48,10 +47,7 @@ @Override public void run() { - IWizard wizard = new InstanceFilterWizard(cloud); - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - dialog.open(); + WizardUtils.openWizardDialog(new InstanceFilterWizard(cloud), shell); } }); } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2010 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.deltacloud.ui.commands; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.IHandler; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; +import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; +import org.jboss.tools.internal.deltacloud.ui.wizards.ManageKeysWizard; + +/** + * @author Andre Dietisheim + */ +public class ManageKeysHandler extends AbstractHandler implements IHandler { + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof IStructuredSelection) { + DeltaCloud cloud = UIUtils.getFirstAdaptedElement(selection, DeltaCloud.class); + createImagesFilter(cloud, HandlerUtil.getActiveShell(event)); + } + + return Status.OK_STATUS; + } + + private void createImagesFilter(final DeltaCloud cloud, final Shell shell) { + if (cloud != null) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + WizardUtils.openWizardDialog(new ManageKeysWizard(cloud), shell); + } + }); + + } + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -14,9 +14,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.IHandler; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnectionWizard; /** @@ -26,13 +26,8 @@ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - NewCloudConnectionWizard wizard = new NewCloudConnectionWizard(); - wizard.init(PlatformUI.getWorkbench(), new StructuredSelection()); - WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - wizard); - dialog.create(); - dialog.open(); - + Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(); + WizardUtils.openWizardDialog(new NewCloudConnectionWizard(), shell); return Status.OK_STATUS; } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -22,6 +22,8 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Shell; /** * @author André Dietisheim @@ -115,4 +117,10 @@ } } } + + public static void openWizardDialog(IWizard wizard, Shell shell) { + WizardDialog dialog = new WizardDialog(shell, wizard); + dialog.create(); + dialog.open(); + } } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2010 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.internal.deltacloud.ui.wizards; + +import org.eclipse.jface.wizard.Wizard; +import org.jboss.tools.deltacloud.core.DeltaCloud; + +/** + * @author André Dietisheim + */ +public abstract class AbstractDeltaCloudWizard extends Wizard { + + private DeltaCloud cloud; + + public AbstractDeltaCloudWizard(DeltaCloud cloud) { + this.cloud = cloud; + } + + protected DeltaCloud getDeltaCloud() { + return cloud; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/AbstractDeltaCloudWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterWizard.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -10,26 +10,24 @@ ******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.wizards; -import org.eclipse.jface.wizard.Wizard; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.ui.ErrorUtils; /** * @author Jeff Johnston */ -public class ImageFilterWizard extends Wizard { +public class ImageFilterWizard extends AbstractDeltaCloudWizard { - private DeltaCloud cloud; private ImageFilterPage mainPage; public ImageFilterWizard(DeltaCloud cloud) { - this.cloud = cloud; + super(cloud); } @Override public void addPages() { // TODO Auto-generated method stub - mainPage = new ImageFilterPage(cloud); + mainPage = new ImageFilterPage(getDeltaCloud()); addPage(mainPage); } @@ -46,7 +44,7 @@ String descRule = mainPage.getDescRule(); try { - cloud.updateImageFilter( + getDeltaCloud().updateImageFilter( nameRule + ";" + //$NON-NLS-1$ idRule + ";" + //$NON-NLS-1$ archRule + ";" + //$NON-NLS-1$ @@ -55,7 +53,7 @@ // TODO: internationalize strings ErrorUtils.handleError( "Error", - "Cloud not get update filters on cloud " + cloud.getName(), e, getShell()); + "Cloud not get update filters on cloud " + getDeltaCloud().getName(), e, getShell()); } return true; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.wizards; -import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Display; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.ui.ErrorUtils; @@ -18,18 +17,17 @@ /** * @author Jeff Johnston */ -public class InstanceFilterWizard extends Wizard { +public class InstanceFilterWizard extends AbstractDeltaCloudWizard { - private DeltaCloud cloud; private InstanceFilterPage mainPage; public InstanceFilterWizard(DeltaCloud cloud) { - this.cloud = cloud; + super(cloud); } @Override public void addPages() { - mainPage = new InstanceFilterPage(cloud); + mainPage = new InstanceFilterPage(getDeltaCloud()); addPage(mainPage); } @@ -49,7 +47,7 @@ String profileRule = mainPage.getProfileRule(); try { - cloud.updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$ + getDeltaCloud().updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$ idRule + ";" + //$NON-NLS-1$ imageIdRule + ";" + //$NON-NLS-1$ ownerIdRule + ";" + //$NON-NLS-1$ Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysWizard.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.wizards; -import org.eclipse.jface.wizard.Wizard; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudKey; @@ -18,14 +17,13 @@ * @author Jeff Johnston * @author André Dietisheim */ -public class ManageKeysWizard extends Wizard { +public class ManageKeysWizard extends AbstractDeltaCloudWizard { - private DeltaCloud cloud; private ManageKeysPage mainPage; private DeltaCloudKey key; public ManageKeysWizard(DeltaCloud cloud) { - this.cloud = cloud; + super(cloud); } public DeltaCloudKey getKey() { @@ -34,7 +32,7 @@ @Override public void addPages() { - mainPage = new ManageKeysPage(cloud); + mainPage = new ManageKeysPage(getDeltaCloud()); addPage(mainPage); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-25 16:12:23 UTC (rev 28600) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-25 17:12:20 UTC (rev 28601) @@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialogWithToggle; -import org.eclipse.jface.wizard.Wizard; import org.jboss.tools.common.jobs.ChainedJob; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; @@ -36,7 +35,7 @@ * @author Jeff Johnston * @author André Dieitsheim */ -public class NewInstanceWizard extends Wizard { +public class NewInstanceWizard extends AbstractDeltaCloudWizard { private final static String CREATE_INSTANCE_FAILURE_TITLE = "CreateInstanceError.title"; //$NON-NLS-1$ private final static String CREATE_INSTANCE_FAILURE_MSG = "CreateInstanceError.msg"; //$NON-NLS-1$ @@ -47,7 +46,6 @@ protected NewInstancePage mainPage; protected INewInstanceWizardPage[] additionalPages; - protected DeltaCloud cloud; protected DeltaCloudInstance instance; /** * Initial image, may be null @@ -55,7 +53,7 @@ private DeltaCloudImage image; public NewInstanceWizard(DeltaCloud cloud) { - this.cloud = cloud; + super(cloud); try { this.image = cloud.getLastImage(); } catch (DeltaCloudException e) { @@ -70,7 +68,7 @@ @Override public void addPages() { - mainPage = new NewInstancePage(cloud, image); + mainPage = new NewInstancePage(getDeltaCloud(), image); addPage(mainPage); additionalPages = DeltacloudUIExtensionManager.getDefault().loadNewInstanceWizardPages(); for (int i = 0; i < additionalPages.length; i++) { @@ -100,6 +98,7 @@ String name = model.getName(); // Save persistent settings for this particular cloud + DeltaCloud cloud = getDeltaCloud(); cloud.setLastImageId(imageId); cloud.setLastKeyname(keyId);