[JENKINS-21295] - Project Description column configs for trim and width

not correctly redisplaying
jenkinsci · Feb 21, 2014 · 1738889 · 1738889
1 parent 2fecff5
commit 1738889
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/src/main/java/jenkins/plugins/extracolumns/BuildDescriptionColumn.java b/src/main/java/jenkins/plugins/extracolumns/BuildDescriptionColumn.java
@@ -34,14 +34,14 @@
 public class BuildDescriptionColumn extends ListViewColumn {
 
     private int columnWidth;
-    private boolean isForceWidth;
+    private boolean forceWidth;
 
 
     @DataBoundConstructor
-    public BuildDescriptionColumn(int columnWidth, boolean isForceWidth) {
+    public BuildDescriptionColumn(int columnWidth, boolean forceWidth) {
         super();
         this.columnWidth = columnWidth;
-        this.isForceWidth = isForceWidth;
+        this.forceWidth = forceWidth;
     }
 
     public BuildDescriptionColumn() {
@@ -53,7 +53,7 @@ public int getColumnWidth() {
     }
 
     public boolean isForceWidth() {
-        return isForceWidth;
+        return forceWidth;
     }
 
     public String getBuildDescription(@SuppressWarnings("rawtypes") Job job) {

diff --git a/src/main/java/jenkins/plugins/extracolumns/BuildDurationColumn.java b/src/main/java/jenkins/plugins/extracolumns/BuildDurationColumn.java
@@ -29,7 +29,6 @@
 
 import hudson.Extension;
 import hudson.Util;
-import hudson.model.Items;
 import hudson.model.Job;
 import hudson.views.ListViewColumn;
 import hudson.views.ListViewColumnDescriptor;

diff --git a/src/main/java/jenkins/plugins/extracolumns/DescriptionColumn.java b/src/main/java/jenkins/plugins/extracolumns/DescriptionColumn.java
@@ -37,19 +37,19 @@ public class DescriptionColumn extends ListViewColumn {
     private boolean trim;
     private int displayLength; //numbers of lines to display
     private int columnWidth;
-    private boolean isForceWidth;
+    private boolean forceWidth;
 
     private final static String SEPARATOR = "<br/>";
     private final static String SEPARATORS_REGEX = "(?i)<br\\s*/>|<br>";
 
     @DataBoundConstructor
-    public DescriptionColumn(boolean displayName, boolean trim, int displayLength, int columnWidth, boolean isForceWidth) {
+    public DescriptionColumn(boolean displayName, boolean trim, int displayLength, int columnWidth, boolean forceWidth) {
         super();
         this.displayName = displayName;
         this.trim = trim;
         this.displayLength = displayLength;
         this.columnWidth = columnWidth;
-        this.isForceWidth = isForceWidth;
+        this.forceWidth = forceWidth;
     }
 
     public DescriptionColumn() {
@@ -73,18 +73,18 @@ public int getColumnWidth() {
     }
 
     public boolean isForceWidth() {
-        return isForceWidth;
+        return forceWidth;
     }
 
-    public String getToolTip(@SuppressWarnings("rawtypes") AbstractItem job) {
+    public String getToolTip(AbstractItem job) {
         return formatDescription(job, false);
     }
 
-    public String getDescription(@SuppressWarnings("rawtypes") AbstractItem job){
+    public String getDescription(AbstractItem job){
         return formatDescription(job, isTrim());
     }
 
-    private String formatDescription(@SuppressWarnings("rawtypes") AbstractItem job, boolean trimIt) {
+    private String formatDescription(AbstractItem job, boolean trimIt) {
         if (job == null) {
             return null;
         }

diff --git a/src/main/resources/jenkins/plugins/extracolumns/BuildDescriptionColumn/config.jelly b/src/main/resources/jenkins/plugins/extracolumns/BuildDescriptionColumn/config.jelly
@@ -31,7 +31,7 @@
             <tr>
                 <td colspan="3">${%This column shows the build description of the last build.}</td>
             </tr>
-            <f:optionalBlock field="isForceWidth" title="${%Force column width}" inline="true">
+            <f:optionalBlock field="forceWidth" title="${%Force column width}" inline="true">
                 <f:entry title="${%Column width}">
                     <f:textbox field="columnWidth" default="80" />
                 </f:entry>

diff --git a/src/main/resources/jenkins/plugins/extracolumns/DescriptionColumn/config.jelly b/src/main/resources/jenkins/plugins/extracolumns/DescriptionColumn/config.jelly
@@ -41,7 +41,7 @@
                     <f:textbox field="displayLength" default="1" />
                 </f:entry>
             </f:optionalBlock>
-            <f:optionalBlock field="isForceWidth" title="${%Force column width}" inline="true">
+            <f:optionalBlock field="forceWidth" title="${%Force column width}" inline="true">
                 <f:entry title="${%Column width}">
                     <f:textbox field="columnWidth" default="80" />
                 </f:entry>