[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards ImportCIMMOFWizardPage.java,1.18,1.19

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16123/Plugin/com/ibm/ecute/rsa/ui/internal/wizards

Modified Files:
	ImportCIMMOFWizardPage.java 
Log Message:
Version 2.1 beta 1d:
Various changes in the edit qualifiers dialog (BB)

Index: ImportCIMMOFWizardPage.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/ImportCIMMOFWizardPage.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ImportCIMMOFWizardPage.java	31 May 2005 15:48:50 -0000	1.18
+++ ImportCIMMOFWizardPage.java	15 Jun 2005 09:41:48 -0000	1.19
@@ -807,7 +807,7 @@
         modelName = modelName.trim();
         
         if (modelName.length() > 0) {
-            Object models[] = getUML2Projects(getContainer(containerNameField.getText()));
+        	Object models[] = getUML2Projects(getContainer(containerNameField.getText()));
             if(models != null){
 	        	for(int i = 0; i<models.length; i++){
 		            if(((IFile)models[i]).getName().equalsIgnoreCase(modelName)){
@@ -1037,8 +1037,9 @@
         try {
             IResource resources[] = container.members();
             for(int i = 0; i<resources.length; i++){
-                if(resources[i].getFileExtension().equalsIgnoreCase(FILE_EXT_MODEL)
-                        || resources[i].getFileExtension().equalsIgnoreCase("uml2")){
+                if(resources[i].getFileExtension() != null &&
+                	(resources[i].getFileExtension().equalsIgnoreCase(FILE_EXT_MODEL)
+                     || resources[i].getFileExtension().equalsIgnoreCase("uml2"))){
                     if (resources[i] instanceof IFile) {
                         models.add((IFile) resources[i]);
                     }