TEIIDDEs-1528

- fixed core arg check in ModelNameChecker - added initialized check in GenerateXsdWizardOptionsPage to prevent validating fields before page is fully initialized.
Teiid-Designer · Nov 1, 2012 · 1b39cdc · 1b39cdc
1 parent 58a870e
commit 1b39cdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/viewsupport/ModelNameChecker.java b/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/viewsupport/ModelNameChecker.java
@@ -62,7 +62,7 @@ private static String getString( final String id , final String param) {
 	 */
 	public ModelNameChecker(String modelName, String fileExtension, IContainer targetContainer, int flags) {
 		super();
-		CoreArgCheck.isNotNull(fileExtension, "modelName"); //$NON-NLS-1$
+		CoreArgCheck.isNotNull(modelName, "modelName"); //$NON-NLS-1$
 		CoreArgCheck.isNotNull(fileExtension, "fileExtension"); //$NON-NLS-1$
 
 		setFlags(flags);

diff --git a/...rg.teiid.designer.ui/src/org/teiid/designer/ui/wizards/GenerateXsdWizardOptionslPage.java b/...rg.teiid.designer.ui/src/org/teiid/designer/ui/wizards/GenerateXsdWizardOptionslPage.java
@@ -100,6 +100,8 @@ public class GenerateXsdWizardOptionslPage extends WizardPage
     private ISelection selection;
 
     private IContainer folder;
+
+    private boolean initializing = false;
 
     /**
      * Constructor for NewModelWizardSpecifyModelPage
@@ -332,6 +334,7 @@ void handleGenInputButton() {
      * building.
      */
     private void initialize() {
+    	initializing = true;
         roots = new LinkedHashSet();
         if (SelectionUtilities.isEmptySelection(selection)) {
             return;
@@ -404,6 +407,8 @@ private void initialize() {
                 processRootObject(selections.next(), true);
             }// end while
         }// end else
+
+        initializing = false;
     }
 
     /**
@@ -574,6 +579,10 @@ private boolean isRelationalModel( Resource rsrc ) {
      * must select at least one of genOut or genInput
      */
     void checkStatus() {
+    	if( initializing ) {
+    		return;
+    	}
+
         boolean hasWarnings = false;
         if (!unsavedResources.isEmpty()) {
         	setErrorMessage(Util.getString("GenerateXsdWizard.unsavedModels")); //$NON-NLS-1$