[206505] Corrected superclass validation in the Servlet wizard.
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java index da85b69..4813c53 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
@@ -398,8 +398,9 @@ return WTPCommonPlugin.OK_STATUS; // Check the super class as a java class + IStatus status = null; if (superclassName.trim().length() > 0) { - IStatus status = super.validate(SUPERCLASS); + status = super.validate(SUPERCLASS); if (status.getSeverity() == IStatus.ERROR) return status; } @@ -407,7 +408,7 @@ if (!validator.isServletSuperclass()) return WTPCommonPlugin.createErrorStatus(WebMessages.ERR_SERVLET_INTERFACE); - return WTPCommonPlugin.OK_STATUS; + return status; } /**
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java index c28bc9e..3268f93 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModelProvider.java
@@ -348,7 +348,7 @@ } IStatus status = validateJavaClassName(className); // If unqualified super class name is valid, ensure validity of superclass itself - if (status.isOK()) { + if (status.getSeverity() != IStatus.ERROR) { // If the superclass does not exist, throw an error IJavaProject javaProject = JemProjectUtilities.getJavaProject(getTargetProject()); IType supertype = null;