| author | xwu | 2013-01-29 04:39:11 (EST) |
|---|---|---|
| committer | lzhu | 2013-01-29 04:39:11 (EST) |
| commit | dbde8db32785f77861505e4e4787676db1300a99 (patch) (side-by-side diff) | |
| tree | 905e4e0f2feea9aa02acdacbd06050a81eab7d6c | |
| parent | 0134c388a000458fa83c04fc755ff35ad18bef16 (diff) | |
| download | org.eclipse.datatools.enablement.oda-dbde8db32785f77861505e4e4787676db1300a99.zip org.eclipse.datatools.enablement.oda-dbde8db32785f77861505e4e4787676db1300a99.tar.gz org.eclipse.datatools.enablement.oda-dbde8db32785f77861505e4e4787676db1300a99.tar.bz2 | |
CheckIn: Code refactoring for the XML data source definition page.v201301291739
| -rw-r--r-- | plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/XMLSelectionPageHelper.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/XMLSelectionPageHelper.java b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/XMLSelectionPageHelper.java index 0c13725..f086f6c 100644 --- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/XMLSelectionPageHelper.java +++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/XMLSelectionPageHelper.java @@ -411,14 +411,30 @@ public class XMLSelectionPageHelper { if ( getFolderLocation( ).trim( ).length( ) == 0 ) { - m_wizardPage.setMessage( Messages.getString( "XMLSelectionWizardPage.message.error.emptyXMLSource" ),//$NON-NLS-1$ - IMessageProvider.ERROR ); - m_wizardPage.setPageComplete( false ); + if ( m_wizardPage != null ) + { + m_wizardPage.setMessage( Messages.getString( "XMLSelectionWizardPage.message.error.emptyXMLSource" ),//$NON-NLS-1$ + IMessageProvider.ERROR ); + m_wizardPage.setPageComplete( false ); + } + else if ( m_propertyPage != null ) + { + m_propertyPage.setMessage( Messages.getString( "XMLSelectionWizardPage.message.error.emptyXMLSource" ),//$NON-NLS-1$ + IMessageProvider.ERROR ); + } } - else + else { - m_wizardPage.setMessage( DEFAULT_MESSAGE ); - m_wizardPage.setPageComplete( true ); + if ( m_wizardPage != null ) + { + m_wizardPage.setMessage( DEFAULT_MESSAGE ); + m_wizardPage.setPageComplete( true ); + } + else if ( m_propertyPage != null ) + { + m_propertyPage.setMessage( DEFAULT_MESSAGE ); + } + } } |