Merge pull request #4 from mixalturek/master

[JENKINS-18029] Selected line with static analysis violation is hidden because breadcrumb covers it
jenkinsci · Mar 8, 2014 · 5ba9108 · 5ba9108
2 parents 2962a47 + 70008f0
commit 5ba9108
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/CppcheckSource.java
@@ -229,7 +229,6 @@ public final String highlightSource(final InputStream file) throws IOException {
      *
      * @return the source code content as a String object
      */
-    @SuppressWarnings("unused")
     public String getSourceCode() {
         return sourceCode;
     }
@@ -239,7 +238,6 @@ public String getSourceCode() {
      *
      * @return the workspace file
      */
-    @SuppressWarnings("unused")
     public CppcheckWorkspaceFile getCppcheckWorkspaceFile() {
         return cppcheckWorkspaceFile;
     }

diff --git a/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java b/src/main/java/com/thalesgroup/hudson/plugins/cppcheck/model/CppcheckFile.java
@@ -60,6 +60,15 @@ public int getLineNumber() {
         return lineNumber;
     }
 
+    /**
+     * Returns the line number that should be shown on top of the source code view.
+     *
+     * @return the line number
+     */
+    public int getLinkLineNumber() {
+        return Math.max(1, lineNumber - 10);
+    }
+
     public void setLineNumber(int lineNumber) {
         this.lineNumber = lineNumber;
     }
@@ -92,7 +101,6 @@ public void setSeverity(String severity) {
     }
 
     @Exported
-    @SuppressWarnings("unused")
     public Integer getKey() {
         return key;
     }

diff --git a/src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckResult/details.jelly b/src/main/resources/org/jenkinsci/plugins/cppcheck/CppcheckResult/details.jelly
@@ -39,7 +39,7 @@
                                 ${cppcheckfile.lineNumber}
                             </j:if>
                             <j:if test="${not elt.isSourceIgnored()}">
-                                <a href="source.${cppcheckfile.key}#${cppcheckfile.lineNumber}">${cppcheckfile.lineNumber}</a>
+                                <a href="source.${cppcheckfile.key}#${cppcheckfile.linkLineNumber}">${cppcheckfile.lineNumber}</a>
                             </j:if>
                         </td>
                         <td class="pane">${cppcheckfile.severity}</td>