[jbosstools-commits] JBoss Tools SVN: r39820 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 26 03:44:13 EDT 2012
Author: adietish
Date: 2012-03-26 03:44:12 -0400 (Mon, 26 Mar 2012)
New Revision: 39820
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-11362] removed NewApplicationWizard, NewApplicationWizardPage and NewApplicationWizardPageModel
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-26 01:50:28 UTC (rev 39819)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-26 07:44:12 UTC (rev 39820)
@@ -258,7 +258,7 @@
final ISWTObservableValue selectedCartridgeComboObservable =
WidgetProperties.selection().observe(newAppCartridgeCombo);
final IObservableValue selectedCartridgeModelObservable = BeanProperties.value(
- NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel);
+ ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel);
ValueBindingBuilder.bind(selectedCartridgeComboObservable).converting(new StringToCartridgeConverter())
.to(selectedCartridgeModelObservable).converting(new CartridgeToStringConverter()).in(dbc);
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-26 01:50:28 UTC (rev 39819)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-26 07:44:12 UTC (rev 39820)
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
-
-import com.openshift.express.client.IApplication;
-
-/**
- * @author André Dietisheim
- */
-public class NewApplicationWizard extends Wizard {
-
- private ApplicationWizardModel wizardModel;
- private NewApplicationWizardPage applicationPage;
- private EmbedCartridgeWizardPage embedCartridgePage;
-
- public NewApplicationWizard(UserDelegate user) {
- this.wizardModel = new ApplicationWizardModel(user);
- setNeedsProgressMonitor(true);
- }
-
- @Override
- public boolean performFinish() {
- boolean successfull = true;
- if (wizardModel.getApplication() == null) {
- successfull = applicationPage.createApplication();
- }
- if (successfull) {
- successfull = embedCartridgePage.processCartridges();
- }
- return successfull;
- }
-
- @Override
- public void addPages() {
- addPage(this.applicationPage = new NewApplicationWizardPage(wizardModel, this));
- addPage(this.embedCartridgePage = new EmbedCartridgeWizardPage(wizardModel, this));
- }
-
- public IApplication getApplication() {
- return wizardModel.getApplication();
- }
-}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2012-03-26 01:50:28 UTC (rev 39819)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2012-03-26 07:44:12 UTC (rev 39820)
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import org.eclipse.core.databinding.Binding;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.UpdateListStrategy;
-import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.conversion.Converter;
-import org.eclipse.core.databinding.validation.IValidator;
-import org.eclipse.core.databinding.validation.ValidationStatus;
-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.fieldassist.ControlDecorationSupport;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.dialogs.PageChangingEvent;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.common.ui.DelegatingProgressMonitor;
-import org.jboss.tools.common.ui.JobUtils;
-import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-
-import com.openshift.express.client.Cartridge;
-import com.openshift.express.client.ICartridge;
-import com.openshift.express.client.OpenShiftApplicationNotAvailableException;
-import com.openshift.express.client.OpenShiftException;
-
-/**
- * @author André Dietisheim
- */
-public class NewApplicationWizardPage extends AbstractOpenShiftWizardPage {
-
- private NewApplicationWizardPageModel model;
- private ApplicationWizardModel wizardModel;
-
- public NewApplicationWizardPage(ApplicationWizardModel wizardModel, IWizard wizard) {
- super("New OpenShift Express Application",
- "Enter a name and select a type for your new OpenShift Express application",
- "NewOpenShiftExpressApplication", wizard);
- this.wizardModel = wizardModel;
- this.model = new NewApplicationWizardPageModel(wizardModel);
- }
-
- @Override
- protected void doCreateControls(Composite parent, DataBindingContext dbc) {
- GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(parent);
-
- Label nameLabel = new Label(parent, SWT.NONE);
- nameLabel.setText("Na&me");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(nameLabel);
- Text nameText = new Text(parent, SWT.BORDER);
- nameText.setTextLimit(13);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(nameText);
- Binding nameBinding = dbc.bindValue(
- WidgetProperties.text(SWT.Modify).observe(nameText)
- , BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_NAME).observe(model)
- , new UpdateValueStrategy().setAfterGetValidator(new ApplicationNameValidator())
- , null);
- ControlDecorationSupport.create(nameBinding, SWT.LEFT | SWT.TOP);
-
- Label cartridgeLabel = new Label(parent, SWT.WRAP);
- cartridgeLabel.setText("&Application Type");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(cartridgeLabel);
- Combo cartridgesCombo = new Combo(parent, SWT.BORDER |
- SWT.READ_ONLY);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cartridgesCombo);
- dbc.bindList(
- WidgetProperties.items().observe(cartridgesCombo)
- , BeanProperties.list(NewApplicationWizardPageModel.PROPERTY_CARTRIDGES).observe(model)
- , new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER)
- , new UpdateListStrategy().setConverter(new Converter(Object.class, String.class) {
-
- @Override
- public Object convert(Object fromObject) {
- if (!(fromObject instanceof ICartridge)) {
- return null;
- }
- return ((ICartridge) fromObject).getName();
- }
- }));
- Binding comboSelectionBinding = dbc.bindValue(
- WidgetProperties.selection().observe(cartridgesCombo)
- , BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(model)
- , new UpdateValueStrategy().setConverter(new Converter(String.class, ICartridge.class) {
-
- @Override
- public Object convert(Object fromObject) {
- if (fromObject instanceof String
- && ((String) fromObject).length() > 0) {
- return new Cartridge(((String) fromObject));
- }
- return null;
- }
- }).setAfterGetValidator(
- new IValidator() {
-
- @Override
- public IStatus validate(Object value) {
- if (!(value instanceof String)
- || ((String) value).length() == 0) {
- return ValidationStatus.error("You have to select a type");
- } else {
- return ValidationStatus.ok();
- }
- }
- })
- , new UpdateValueStrategy().setConverter(new Converter(ICartridge.class, String.class) {
-
- @Override
- public Object convert(Object fromObject) {
- if (fromObject instanceof ICartridge) {
- return ((ICartridge) fromObject).getName();
- }
- return null;
- }
- }));
- ControlDecorationSupport.create(comboSelectionBinding, SWT.LEFT | SWT.TOP);
- }
-
- @Override
- protected void onPageActivated(DataBindingContext dbc) {
- try {
- WizardUtils.runInWizard(new Job("Loading cartridges...") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- model.loadCartridges();
- } catch (OpenShiftException e) {
- return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not load cartridges", e);
- }
- return Status.OK_STATUS;
- }
- }, getContainer());
- } catch (Exception e) {
- // ignore
- }
- }
-
- @Override
- protected void onPageWillGetDeactivated(Direction progress, final PageChangingEvent event, DataBindingContext dbc) {
- boolean applicationCreated = createApplication();
- if (!applicationCreated) {
- event.doit = false;
- }
- }
-
- public boolean createApplication() {
- final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor();
- Job job = new Job(NLS.bind("Creating new application {0}", wizardModel.getName())) {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- delegatingMonitor.add(monitor);
- try {
- wizardModel.createApplication(delegatingMonitor);
- return Status.OK_STATUS;
- } catch (OpenShiftApplicationNotAvailableException e) {
- return OpenShiftUIActivator.createErrorStatus(
- e.getMessage(), e, wizardModel.getName());
- } catch (OpenShiftException e) {
- return OpenShiftUIActivator.createErrorStatus(
- "Could not create application \"{0}\"",
- (Throwable) e, wizardModel.getName());
- } finally {
- delegatingMonitor.done();
- }
- }
- };
- try {
- IStatus jobResult = WizardUtils.runInWizard(job, delegatingMonitor, getContainer());
- return JobUtils.isOk(jobResult);
- } catch (Exception e) {
- OpenShiftUIActivator.log(e);
- return false;
- }
- }
-
- private class ApplicationNameValidator implements IValidator {
-
- @Override
- public IStatus validate(Object value) {
- String name = (String) value;
- if (name.length() == 0) {
- return ValidationStatus.error("You have to provide a name");
- } else if (model.hasApplication(name)) {
- return ValidationStatus.error(NLS.bind(
- "Names must be unique. You already have an application named \"{0}\"", name));
- }
- return ValidationStatus.ok();
- }
- }
-
-}
\ No newline at end of file
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2012-03-26 01:50:28 UTC (rev 39819)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2012-03-26 07:44:12 UTC (rev 39820)
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
-import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-
-import com.openshift.express.client.ICartridge;
-import com.openshift.express.client.OpenShiftException;
-
-/**
- * @author André Dietisheim
- */
-public class NewApplicationWizardPageModel extends ObservableUIPojo {
-
- public static final String PROPERTY_APPLICATION = "application";
- public static final String PROPERTY_NAME = "name";
- public static final String PROPERTY_CARTRIDGES = "cartridges";
- public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge";
-
- private ApplicationWizardModel wizardModel;
-
- private List<ICartridge> cartridges = new ArrayList<ICartridge>();
- private ICartridge selectedCartridge;
- private StringPreferenceValue selectedCartridgePreference;
-
- public NewApplicationWizardPageModel(ApplicationWizardModel wizardModel) {
- this.wizardModel = wizardModel;
- this.selectedCartridgePreference = new StringPreferenceValue(
- "org.jboss.tools.openshift.express.internal.ui.wizard.NewApplicationWizard.selectedCartridge",
- OpenShiftUIActivator.PLUGIN_ID);
- }
-
- private ICartridge initSelectedCartridge() {
- String selectedCartridgeName = selectedCartridgePreference.get();
- if (getSelectedCartridge() != null) {
- selectedCartridgeName = getSelectedCartridge().getName();
- }
- if (selectedCartridgeName == null
- || selectedCartridgeName.length() == 0) {
- selectedCartridgeName = ICartridge.JBOSSAS_7.getName();
- }
- ICartridge selectedCartridge = getCartridgeByName(selectedCartridgeName);
- if (selectedCartridge == null
- && getCartridges().size() > 0) {
- selectedCartridge = getCartridges().get(0);
- }
- return selectedCartridge;
- }
-
- public String getName() {
- return wizardModel.getName();
- }
-
- public void setName(String name) {
- wizardModel.setName(name);
- firePropertyChange(PROPERTY_NAME, wizardModel.getName(), wizardModel.setName(name));
- }
-
- public void loadCartridges() throws OpenShiftException {
- setCartridges(wizardModel.getUser().getCartridges());
- }
-
- public void setCartridges(List<ICartridge> cartridges) {
- firePropertyChange(PROPERTY_CARTRIDGES, this.cartridges, this.cartridges = cartridges);
- setSelectedCartridge(initSelectedCartridge());
- }
-
- public List<ICartridge> getCartridges() {
- return cartridges;
- }
-
- public ICartridge getSelectedCartridge() {
- return selectedCartridge;
- }
-
-
- public void setSelectedCartridge(ICartridge cartridge) {
- wizardModel.setCartridge(cartridge);
- if (cartridge != null) {
- selectedCartridgePreference.store(cartridge.getName());
- }
- firePropertyChange(PROPERTY_SELECTED_CARTRIDGE, selectedCartridge, this.selectedCartridge = cartridge);
- }
-
- private ICartridge getCartridgeByName(String name) {
- ICartridge matchingCartridge = null;
- for (ICartridge cartridge : getCartridges()) {
- if (name.equals(cartridge.getName())) {
- matchingCartridge = cartridge;
- break;
- }
- }
- return matchingCartridge;
- }
-
- public boolean hasApplication(String name) {
- try {
- return wizardModel.hasApplication(name);
- } catch (OpenShiftException e) {
- OpenShiftUIActivator.log(
- OpenShiftUIActivator.createErrorStatus("Could not get application by name", e));
- return false;
- }
- }
-}
More information about the jbosstools-commits
mailing list