[JENKINS-21486] Follow-up

Display of shortName of disabled plugin is enough. Fix copy-paste error
in the message for disabled dependencies
This commit is contained in:
Vincent Latombe committed 2016-04-06 14:12:33 +02:00
1 parent 4515625ab2
commit 5ebf6b8bde
1 file changed
+2 -2
+2 -2
View File
@@ -573,7 +573,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
obsoleteDependencies.add(dependency.getShortName() + "(" + dependency.getVersion() + " < " + d.version + ")");
}
} else {
disabledDependencies.add(d.toString());
disabledDependencies.add(d.shortName);
}
}
@@ -600,7 +600,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
if (!disabledDependencies.isEmpty()) {
boolean plural = disabledDependencies.size() > 1;
messageBuilder.append(plural ? "Dependencies " : "Dependency ")
.append(Util.join(missingDependencies, ", "))
.append(Util.join(disabledDependencies, ", "))
.append(" ").append(plural ? "are" : "is")
.append(" disabled. ");
}