Author: adietish Date: 2011-09-30 19:04:48 -0400 (Fri, 30 Sep 2011) New Revision: 35247 Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/common/databinding/validator/MandatoryStringValidator.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 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/ManageKeysHandler.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/wizards/CloudConnectionPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java Log: [JBIDE-9805] moved MandatoryStringValidator, WizardUtils, etc. to org.jboss.tools.common.ui Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2011-09-30 23:04:48 UTC (rev 35247) @@ -29,4 +29,5 @@ org.jboss.tools.deltacloud.ui.preferences, org.jboss.tools.deltacloud.ui.wizard, org.jboss.tools.internal.deltacloud.ui.utils;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.integration" -Import-Package: org.jboss.tools.common.ui.databinding +Import-Package: org.jboss.tools.common.ui, + org.jboss.tools.common.ui.databinding 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-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilterWizard; 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-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterInstancesHandler.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.InstanceFilterWizard; Modified: 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 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ManageKeysHandler.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.ManageKeysWizard; 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-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/NewConnectionHandler.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -19,7 +19,7 @@ import org.eclipse.ui.IWorkbenchWizard; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.HandlerUtil; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.internal.deltacloud.ui.utils.WorkbenchUtils; import org.jboss.tools.internal.deltacloud.ui.wizards.NewCloudConnectionWizard; Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/common/databinding/validator/MandatoryStringValidator.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/common/databinding/validator/MandatoryStringValidator.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/common/databinding/validator/MandatoryStringValidator.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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.common.databinding.validator; - -import org.eclipse.core.databinding.validation.IValidator; -import org.eclipse.core.databinding.validation.ValidationStatus; -import org.eclipse.core.runtime.IStatus; - -/** - * A {@link IValidator} that validates ok if the string it shall validate is not empty. - */ -public class MandatoryStringValidator implements IValidator { - - private String errorMessage; - - public MandatoryStringValidator(String errorMessage) { - this.errorMessage = errorMessage; - } - - /** - * - * validates the given string. Validation passes only if the given value is - * not <tt>null</tt> and it's length's larger than 0 - * - */ - public IStatus validate(Object value) { - if (!((value instanceof String) && ((String) value).length() > 0)) { - return ValidationStatus.error(errorMessage); - } - return ValidationStatus.ok(); - } -} Deleted: 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-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/WizardUtils.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -1,126 +0,0 @@ -/******************************************************************************* - * 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.utils; - -import java.lang.reflect.InvocationTargetException; -import java.util.concurrent.CountDownLatch; - -import org.eclipse.core.databinding.DataBindingContext; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.runtime.jobs.JobChangeAdapter; -import org.eclipse.jface.operation.IRunnableWithProgress; -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 - */ -public class WizardUtils { - - /** - * Runs the given job in the given wizard container. In order to have the - * wizard displaying a progress bar, you need to set - * Wizard#setNeedsProgressMonitor to <code>true</code>. - * - * - * @param job - * the job to run - * @param container - * the wizard container to run the job in - * @throws InvocationTargetException - * the invocation target exception - * @throws InterruptedException - * the interrupted exception - * - * @author André Dietisheim - * - * @see IWizardContainer#run(boolean, boolean, IRunnableWithProgress) - * @see Job - */ - public static void runInWizard(final Job job, IWizardContainer container) throws InvocationTargetException, - InterruptedException { - container.run(true, false, new IRunnableWithProgress() { - @Override - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask(job.getName(), IProgressMonitor.UNKNOWN); - final CountDownLatch latch = new CountDownLatch(1); - job.addJobChangeListener(new JobChangeAdapter() { - - @Override - public void done(IJobChangeEvent event) { - latch.countDown(); - } - }); - job.schedule(); - latch.await(); - monitor.done(); - } - }); - } - - /** - * Runs the given job in the given wizard container. - * <p> - * Furhtermore it updates the models and targets of the given data binding - * context. This might be necessary if the given job will change widget - * enablements in the calling wizard page. The reason for is that the runner - * saves the widget enablement states when it's up to execute the runnable. - * It then restores those states once he finished executing the runnable. It - * may therefore restore incorrect states since the job changed the - * enablements when it was run. - * - * @param job - * the job - * @param container - * the container - * @param dbc - * the dbc - * @throws InvocationTargetException - * the invocation target exception - * @throws InterruptedException - * the interrupted exception - */ - public static void runInWizard(final Job job, IWizardContainer container, final DataBindingContext dbc) - throws InvocationTargetException, InterruptedException { - runInWizard(job, container); - dbc.updateTargets(); - dbc.updateModels(); - } - - /** - * Flips to the next wizard page or finishes the current wizard. - * - * @param wizardPage - * the wizard page this call is executed in - */ - public static void nextPageOrFinish(IWizardPage wizardPage) { - IWizard wizard = wizardPage.getWizard(); - if (wizardPage.canFlipToNextPage()) { - IWizardPage nextPage = wizard.getNextPage(wizardPage); - wizard.getContainer().showPage(nextPage); - } else if (wizard.canFinish()) { - if (wizard.performFinish()) { - wizard.getContainer().getShell().close(); - } - } - } - - public static void openWizardDialog(IWizard wizard, Shell shell) { - WizardDialog dialog = new WizardDialog(shell, wizard); - dialog.create(); - dialog.open(); - } -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -56,6 +56,7 @@ import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.log.LogHelper; +import org.jboss.tools.common.ui.databinding.MandatoryStringValidator; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudDriver; import org.jboss.tools.deltacloud.core.DeltaCloudException; @@ -65,7 +66,6 @@ import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.deltacloud.ui.preferences.StringPreferenceValue; import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.CompositeValidator; -import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator; import org.jboss.tools.internal.deltacloud.ui.common.swt.JFaceUtils; import org.jboss.tools.internal.deltacloud.ui.utils.ControlDecorationAdapter; import org.jboss.tools.internal.deltacloud.ui.utils.DataBindingUtils; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -16,13 +16,13 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudDriver; import org.jboss.tools.deltacloud.core.job.AbstractCloudJob; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; import org.jboss.tools.deltacloud.ui.preferences.StringPreferenceValue; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; /** * @author Jeff Johnston Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudImage; @@ -51,7 +52,6 @@ import org.jboss.tools.deltacloud.ui.views.Columns.Column; import org.jboss.tools.deltacloud.ui.views.cloudelements.ITableContentAndLabelProvider; import org.jboss.tools.deltacloud.ui.views.cloudelements.TableViewerColumnComparator; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; /** * @author Jeff Johnston Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -51,6 +51,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.log.StatusFactory; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudKey; @@ -61,7 +62,6 @@ import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.ObjectNotNullToBoolean; import org.jboss.tools.internal.deltacloud.ui.utils.LayoutUtils; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; /** * @author Jeff Johnston Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -19,6 +19,7 @@ import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.jboss.tools.common.log.StatusFactory; +import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudDriver; import org.jboss.tools.deltacloud.core.DeltaCloudException; @@ -27,7 +28,6 @@ import org.jboss.tools.deltacloud.ui.ErrorUtils; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; import org.jboss.tools.deltacloud.ui.preferences.StringPreferenceValue; -import org.jboss.tools.internal.deltacloud.ui.utils.WizardUtils; /** * @author Jeff Johnston Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-09-30 22:54:43 UTC (rev 35246) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-09-30 23:04:48 UTC (rev 35247) @@ -63,6 +63,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.PreferencesUtil; import org.jboss.tools.common.log.StatusFactory; +import org.jboss.tools.common.ui.databinding.MandatoryStringValidator; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; @@ -74,7 +75,6 @@ import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; -import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator; import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.SelectedComboItemValidator; import org.jboss.tools.internal.deltacloud.ui.utils.DataBindingUtils; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;