diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java index ccd7f0b5..6b78271b 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java @@ -51,7 +51,6 @@ public class PhabricatorNotifier extends Notifier { // Post a comment on success. Useful for lengthy builds. private final boolean commentOnSuccess; private final boolean uberallsEnabled; - private final String coberturaReportFile; private final boolean commentWithConsoleLinkOnFailure; private final String commentFile; private final String commentSize; @@ -60,10 +59,9 @@ public class PhabricatorNotifier extends Notifier { // Fields in config.jelly must match the parameter names in the "DataBoundConstructor" @DataBoundConstructor - public PhabricatorNotifier(boolean commentOnSuccess, String coberturaReportFile, boolean uberallsEnabled, + public PhabricatorNotifier(boolean commentOnSuccess, boolean uberallsEnabled, String commentFile, String commentSize, boolean commentWithConsoleLinkOnFailure) { this.commentOnSuccess = commentOnSuccess; - this.coberturaReportFile = coberturaReportFile; this.uberallsEnabled = uberallsEnabled; this.commentFile = commentFile; this.commentSize = commentSize; @@ -328,11 +326,6 @@ public boolean isUberallsEnabled() { return uberallsEnabled; } - @SuppressWarnings("UnusedDeclaration") - public String getCoberturaReportFile () { - return coberturaReportFile; - } - @SuppressWarnings("UnusedDeclaration") public boolean isCommentWithConsoleLinkOnFailure() { return commentWithConsoleLinkOnFailure; diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java index f9ad7254..4f476adb 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java @@ -22,7 +22,6 @@ import hudson.Plugin; import hudson.PluginWrapper; -import hudson.model.Hudson; import jenkins.model.Jenkins; import java.io.File; @@ -42,6 +41,6 @@ public static String getIconPath(String icon) { PluginWrapper wrapper = Jenkins.getInstance().getPluginManager().getPlugin(PhabricatorPlugin.class); boolean pluginIconExists = (wrapper != null) && new File(wrapper.baseResourceURL.getPath() + "/images/" + icon).exists(); - return pluginIconExists ? "/plugin/" + wrapper.getShortName() + "/images/" + icon : Hudson.RESOURCE_PATH + "/images/16x16/" + icon; + return pluginIconExists ? "/plugin/" + wrapper.getShortName() + "/images/" + icon : Jenkins.RESOURCE_PATH + "/images/16x16/" + icon; } } \ No newline at end of file diff --git a/src/main/resources/com/uber/jenkins/phabricator/PhabricatorNotifier/config.jelly b/src/main/resources/com/uber/jenkins/phabricator/PhabricatorNotifier/config.jelly index 996a044a..40baff52 100644 --- a/src/main/resources/com/uber/jenkins/phabricator/PhabricatorNotifier/config.jelly +++ b/src/main/resources/com/uber/jenkins/phabricator/PhabricatorNotifier/config.jelly @@ -13,9 +13,6 @@ description="Post a differential comment on successful builds"> - - -