[JENKINS-21486] Fix up messages and show plugin version

This commit is contained in:
Vincent Latombe committed 2016-07-29 14:33:55 +02:00
1 parent 99fa5f7a49
commit 6bf02d514d
3 files changed
+10 -9

No files matched your search

+2 -2
View File
@@ -576,7 +576,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
if (dependency == null) {
PluginWrapper failedDependency = NOTICE.getPlugin(d.shortName);
if (failedDependency != null) {
dependencyErrors.add(Messages.PluginWrapper_failed_to_load(failedDependency.getLongName(), d.version));
dependencyErrors.add(Messages.PluginWrapper_failed_to_load_dependency(failedDependency.getLongName(), d.version));
break;
} else {
dependencyErrors.add(Messages.PluginWrapper_missing(d.shortName, d.version));
@@ -610,7 +610,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
if (!dependencyErrors.isEmpty()) {
NOTICE.addPlugin(this);
StringBuilder messageBuilder = new StringBuilder();
messageBuilder.append("Failed to load ").append(getLongName()).append(System.lineSeparator());
messageBuilder.append(Messages.PluginWrapper_failed_to_load_plugin(getLongName(), getVersion())).append(System.lineSeparator());
for (Iterator<String> iterator = dependencyErrors.iterator(); iterator.hasNext(); ) {
String dependencyError = iterator.next();
messageBuilder.append(" - ").append(dependencyError);