[189101] Ensuring package file names are set even when warnings occur.
diff --git a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
index 0501f3a..f87e182 100644
--- a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
+++ b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UMLImporter.java,v 1.10 2007/04/04 22:16:28 khussey Exp $
+ * $Id: UMLImporter.java,v 1.11 2007/05/30 20:11:19 khussey Exp $
*/
package org.eclipse.uml2.uml.ecore.importer;
@@ -233,6 +233,10 @@
if (Diagnostic.INFO < diagnostics.getSeverity()) {
diagnostic = diagnostics;
}
+
+ if (Diagnostic.ERROR > diagnostics.getSeverity()) {
+ adjustEPackages(monitor);
+ }
}
return diagnostic;
diff --git a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/ui/UMLImporterWizard.java b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/ui/UMLImporterWizard.java
index 0af77f9..a87b514 100644
--- a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/ui/UMLImporterWizard.java
+++ b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/ui/UMLImporterWizard.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UMLImporterWizard.java,v 1.3 2007/05/16 18:38:21 khussey Exp $
+ * $Id: UMLImporterWizard.java,v 1.4 2007/05/30 20:11:19 khussey Exp $
*/
package org.eclipse.uml2.uml.ecore.importer.ui;
@@ -33,11 +33,6 @@
ModelImporterPackagePage packagePage = new ModelImporterPackagePage(
getModelImporter(), "UMLImporterPackagePage") { //$NON-NLS-1$
-
- @Override
- protected boolean supportsNestedPackages() {
- return false;
- }
};
packagePage.setShowReferencedGenModels(true);
