TEIIDDES-2444 fixed couple issues with setting initial values and

validation including the check on viewAlreadyExists()
Teiid-Designer · Mar 26, 2015 · 67b6f54 · 67b6f54
1 parent 4c995ec
commit 67b6f54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ion.ui/src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportInfo.java b/...ion.ui/src/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportInfo.java
@@ -386,7 +386,7 @@ public void clearXmlFileInfos() {
 	 * Analyzes this object's data values and sets the current <code>IStatus</code>
 	 */
 	public void validate() {
-		if( isFlatFileLocalMode() ) {
+		if( isFlatFileLocalMode() || isFlatFileUrlMode() ) {
 			if( this.fileInfoMap.isEmpty() ) {
 				setStatus(new Status(IStatus.ERROR, PLUGIN_ID, getString("noDataFilesFound"))); //$NON-NLS-1$
 				return;

diff --git a/...c/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportViewModelPage.java b/...c/org/teiid/designer/transformation/ui/wizards/file/TeiidMetadataImportViewModelPage.java
@@ -512,6 +512,7 @@ private void synchronizeUI() {
 
 		if (this.info.getViewModelLocation() != null) {
 			viewModelContainerText.setText(this.info.getViewModelLocation().makeRelative().toString());
+			this.viewModelFilePath = this.info.getViewModelLocation();
 		} else {
 			this.viewModelContainerText.setText(StringUtilities.EMPTY_STRING);
 		}
@@ -619,7 +620,7 @@ public boolean select(final Viewer viewer, final Object parent,
 	};
 
 	private boolean viewAlreadyExists() {
-		if( !info.viewModelExists() ) {
+		if( info == null && !info.viewModelExists() ) {
 			return false;
 		}