Author: xcoulon Date: 2012-06-01 03:59:31 -0400 (Fri, 01 Jun 2012) New Revision: 41612 Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java Log: Fixed - JBIDE-11958 OpenShift wizard: fields are not in synch when importing app Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-06-01 05:54:34 UTC (rev 41611) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-06-01 07:59:31 UTC (rev 41612) @@ -74,12 +74,12 @@ return new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if(!wizardModel.isNewProject() && isUseDefaultRepoPath()) { + if(isUseDefaultRepoPath()) { final IProject project = wizardModel.getProject(); if(project != null && project.exists()) { setRepositoryPath(project.getLocation().toOSString()); } else { - setRepositoryPath(""); + setRepositoryPath(IOpenShiftExpressWizardModel.DEFAULT_REPOSITORY_PATH); } } } Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java =================================================================== --- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-06-01 05:54:34 UTC (rev 41611) +++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-06-01 07:59:31 UTC (rev 41612) @@ -48,6 +48,9 @@ public void setNewProject(boolean newProject) { firePropertyChange(PROPERTY_IS_NEW_PROJECT, wizardModel.isNewProject(), wizardModel.setNewProject(newProject)); + if(wizardModel.isNewProject()) { + setProjectName(null); + } validateExistingProject(); }