[92538] Fix for duplicate labels
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java index 2966c37..75f9c06 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java
@@ -462,7 +462,7 @@ } } // Add unimplemented methods defined in the interfaces list - if (model.getBooleanProperty(NewJavaClassDataModel.ABSTRACT_METHODS)) { + if (model.getBooleanProperty(NewJavaClassDataModel.ABSTRACT_METHODS) && superClassType != null) { String methodStub = getUnimplementedMethodsFromSuperclass(superClassType, className); if (methodStub != null && methodStub.trim().length() > 0) sb.append(methodStub); @@ -471,9 +471,11 @@ sb.append(methodStub); } // Add any user defined method stubs - String userDefined = getUserDefinedMethodStubs(superClassType); - if (userDefined != null && userDefined.trim().length() > 0) - sb.append(userDefined); + if (superClassType != null) { + String userDefined = getUserDefinedMethodStubs(superClassType); + if (userDefined != null && userDefined.trim().length() > 0) + sb.append(userDefined); + } // Return the methods string return sb.toString(); }