phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid NPE

Browse Source 
- Fix a bunch of errors in message building along the way
This commit is contained in:
Juan Martín Sotuyo Dodero
2018-05-20 02:25:58 -03:00
parent 25f51db8d7
commit 7a23ca638a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSimple.java
+9 -6
View File
@@ -100,7 +100,7 @@ import java.util.logging.Logger;
@Override
public JavaTypeDefinition getGenericType(final String parameterName) {
for (JavaTypeDefinition currTypeDef = this; currTypeDef != null;
currTypeDef = currTypeDef.getEnclosingClass()) {
currTypeDef = currTypeDef.getEnclosingClass()) {
int paramIndex = getGenericTypeIndex(currTypeDef.getType().getTypeParameters(), parameterName);
if (paramIndex != -1) {
@@ -111,16 +111,16 @@ import java.util.logging.Logger;
// throw because we could not find parameterName
StringBuilder builder = new StringBuilder("No generic parameter by name ").append(parameterName);
for (JavaTypeDefinition currTypeDef = this; currTypeDef != null;
currTypeDef = currTypeDef.getEnclosingClass()) {
currTypeDef = currTypeDef.getEnclosingClass()) {
builder.append("\n on class ");
builder.append(clazz.getSimpleName());
builder.append(currTypeDef.getType().getSimpleName());
}
LOG.log(Level.FINE, builder.toString());
// TODO: throw eventually
//throw new IllegalArgumentException(builder.toString());
return null;
return forClass(Object.class);
}
@Override
@@ -282,8 +282,11 @@ import java.util.logging.Logger;
sb.append(jtd.shallowString()).append(", ");
}
return sb.replace(sb.length() - 3, sb.length() - 1, "]") // last comma to bracket
.append(", isGeneric=").append(isGeneric)
if (!genericArgs.isEmpty()) {
sb.replace(sb.length() - 3, sb.length() - 1, ""); // remove last comma
}
return sb.append("], isGeneric=").append(isGeneric)
.append("]\n").toString();
}