Author: scabanovich Date: 2008-06-20 07:39:28 -0400 (Fri, 20 Jun 2008) New Revision: 8867 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java Log: JBIDE-2353 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java 2008-06-20 10:58:55 UTC (rev 8866) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/standard/DefaultStandardWizard.java 2008-06-20 11:39:28 UTC (rev 8867) @@ -110,6 +110,7 @@ if(validator == null) return; validator.validate(data); String message = validator.getErrorMessage(); + isFinishEnabled = validator.isCommandEnabled(SpecialWizardSupport.FINISH); DefaultStandardStep wizardStep = steps[support.getStepId()]; if(wizardStep != null && !wizardStep.isDataChanged()) { String m = support.getMessage(support.getStepId()); @@ -118,9 +119,11 @@ wizardStep.setErrorMessage(null); } else { wizardStep.setDescription(null); + if(message == null && !isFinishEnabled) { + message = support.getMessage(support.getStepId()); + } wizardStep.setErrorMessage(message); } - isFinishEnabled = validator.isCommandEnabled(SpecialWizardSupport.FINISH); boolean isNextEnabled = validator.isCommandEnabled(SpecialWizardSupport.NEXT); wizardStep.isNextEnabled = isNextEnabled; getContainer().updateButtons();