Author: adietish Date: 2012-04-25 07:49:31 -0400 (Wed, 25 Apr 2012) New Revision: 40483 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java Log: fixed databinding error, renamed instance variables, properties and labels domain namespace -> domain id Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-25 11:43:57 UTC (rev 40482) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-04-25 11:49:31 UTC (rev 40483) @@ -47,10 +47,10 @@ result[0] = true; } catch (OpenShiftEndpointException e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getRestResponseMessages()), e); + "Could not create domain \"{0}\": {1}", model.getDomainId(), e.getRestResponseMessages()), e); } catch (Exception e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( - "Could not create domain \"{0}\"", model.getNamespace()), e); + "Could not create domain \"{0}\"", model.getDomainId()), e); } return Status.OK_STATUS; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-25 11:43:57 UTC (rev 40482) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-04-25 11:49:31 UTC (rev 40483) @@ -90,7 +90,7 @@ ControlDecorationSupport.create(namespaceValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); final IObservableValue namespaceModelObservable = BeanProperties.value( - EditDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel); + NewDomainWizardPageModel.PROPERTY_DOMAIN_ID).observe(pageModel); ValueBindingBuilder.bind(namespaceTextObservable).to(namespaceModelObservable).in(dbc); /*DataBindingUtils.bindMandatoryTextField( Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-25 11:43:57 UTC (rev 40482) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-04-25 11:49:31 UTC (rev 40483) @@ -35,10 +35,10 @@ public static final String LIBRA_KEY = "libra_id_rsa"; private static final String PUBLIC_KEY_SUFFIX = ".pub"; - public static final String PROPERTY_NAMESPACE = "namespace"; + public static final String PROPERTY_DOMAIN_ID = "domainId"; public static final String PROPERTY_SSHKEY = "sshKey"; - private String namespace; + private String domainId; private IDomain domain; private String sshKey; private UserDelegate user; @@ -94,12 +94,12 @@ return ssh2Home; } - public String getNamespace() { - return this.namespace; + public String getDomainId() { + return this.domainId; } public void createDomain() throws OpenShiftException, IOException { - IDomain domain = user.createDomain(namespace); + IDomain domain = user.createDomain(domainId); } public String getSshKey() { @@ -176,8 +176,8 @@ return new SSHPublicKey(new File(sshKey)); } - public void setNamespace(String namespace) { - firePropertyChange(PROPERTY_NAMESPACE, this.namespace, this.namespace = namespace); + public void setDomainId(String domainId) { + firePropertyChange(PROPERTY_DOMAIN_ID, this.domainId, this.domainId = domainId); } public boolean hasDomain() {