diff --git a/README.adoc b/README.adoc index d40f42a..e80d190 100644 --- a/README.adoc +++ b/README.adoc @@ -55,7 +55,6 @@ nextBuilds: filterByView: false showPossibleWidget: false showParameterizedWidget: false - displayMode: 1 ---- diff --git a/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java b/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java index c0371da..d8498f6 100644 --- a/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java +++ b/src/main/java/hudson/plugins/nextexecutions/NextBuilds.java @@ -115,7 +115,6 @@ public static class DescriptorImpl extends Descriptor { private Boolean filterByView; private Boolean showPossibleWidget; private Boolean showParameterizedWidget; - private Integer displayMode; public DescriptorImpl() { load(); @@ -161,17 +160,6 @@ public void setShowParameterizedWidget(boolean showParameterizedWidget) { this.showParameterizedWidget = showParameterizedWidget; } - public Integer getDisplayMode() { - if (displayMode == null) { - return 1; - } - return displayMode; - } - - public void setDisplayMode(Integer displayMode) { - this.displayMode = displayMode; - } - public String getDefault() { return "dd/MM/yyyy HH:mm z"; } @@ -186,7 +174,6 @@ public boolean configure(StaplerRequest req, JSONObject json) throws hudson.mode filterByView = json.getBoolean("filterByView"); showPossibleWidget = json.getBoolean("showPossibleWidget"); showParameterizedWidget = json.getBoolean("showParameterizedWidget"); - displayMode = json.getInt("displayMode"); save(); return true; } diff --git a/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java b/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java index e8816e0..4880216 100755 --- a/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java +++ b/src/main/java/hudson/plugins/nextexecutions/NextExecutionsWidget.java @@ -141,17 +141,6 @@ public boolean showWidget() { return true; } - // Default displayMode will be 1 - public int getDisplayMode() { - Jenkins j = Jenkins.getInstanceOrNull(); - DescriptorImpl d = j != null ? (DescriptorImpl) (j.getDescriptorOrDie(NextBuilds.class)) : null; - - if (d == null) { - return 1; - } - return d.getDisplayMode(); - } - public boolean getShowParameterizedWidget() { Jenkins j = Jenkins.getInstanceOrNull(); DescriptorImpl d = j != null ? (DescriptorImpl) (j.getDescriptorOrDie(NextBuilds.class)) : null; diff --git a/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly b/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly index ae39e98..b2bd07e 100755 --- a/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly +++ b/src/main/resources/hudson/plugins/nextexecutions/NextBuilds/global.jelly @@ -13,10 +13,5 @@ - - - - - diff --git a/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly b/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly index e27ab6e..8d0f638 100755 --- a/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly +++ b/src/main/resources/hudson/plugins/nextexecutions/NextExecutionsWidget/index.jelly @@ -1,26 +1,6 @@ - diff --git a/src/main/webapp/displayMode.html b/src/main/webapp/displayMode.html deleted file mode 100755 index 6063097..0000000 --- a/src/main/webapp/displayMode.html +++ /dev/null @@ -1,8 +0,0 @@ -
-Display Modes: -
    -
  • Truncate Mode: if the job name is too long, truncate it.
  • -
  • Fixed Width Mode: if the job name is too long, it wraps to next line.
  • -
  • Jenkins Mode: if the job name is too long, extend the widget's width.
  • -
-