Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #13 from mixalturek/master
[JENKINS-22388] Possible to move cppcheck summary into main job hudson p...
  • Loading branch information
mixalturek committed Apr 28, 2014
2 parents d91aec7 + 5b3b675 commit 1dba0fe
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 4 deletions.
Expand Up @@ -43,6 +43,16 @@ public CppcheckProjectAction(final AbstractProject<?, ?> project,
return lastBuild;
}

/**
* Get build action of the last finished build.
*
* @return the build action or null
*/
public CppcheckBuildAction getLastFinishedBuildAction() {
AbstractBuild<?, ?> lastBuild = getLastFinishedBuild();
return (lastBuild != null) ? lastBuild.getAction(CppcheckBuildAction.class) : null;
}

public final boolean isDisplayGraph() {
//Latest
AbstractBuild<?, ?> b = getLastFinishedBuild();
Expand Down
Expand Up @@ -3,7 +3,7 @@
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Actionable;
import hudson.model.ProminentProjectAction;
import hudson.model.Action;

import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
Expand All @@ -13,7 +13,7 @@
/**
* @author Gregory Boissinot
*/
public abstract class AbstractCppcheckProjectAction extends Actionable implements ProminentProjectAction {
public abstract class AbstractCppcheckProjectAction extends Actionable implements Action {

protected final AbstractProject<?, ?> project;

Expand All @@ -26,7 +26,7 @@ public AbstractCppcheckProjectAction(AbstractProject<?, ?> project) {
}

public String getIconFileName() {
return "/plugin/cppcheck/icons/cppcheck-48.png";
return "/plugin/cppcheck/icons/cppcheck-24.png";
}

public String getSearchUrl() {
Expand Down
Expand Up @@ -7,7 +7,7 @@
xmlns:st="jelly:stapler">

<t:summary icon="/plugin/cppcheck/icons/cppcheck-48.png">
<div><a href="cppcheckResult">${%Cppcheck}</a></div>
<div><a href="${it.urlName}">${it.displayName}</a></div>
<j:set var="stat" value="${it.result.statistics}"/>
<j:set var="diff" value="${it.result.diff}"/>
<st:include page="statistics.jelly" />
Expand Down
@@ -0,0 +1,15 @@
<j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson" xmlns:st="jelly:stapler">
<table style="margin-left:1em;">
<t:summary icon="/plugin/cppcheck/icons/cppcheck-48.png">
<div><a href="${it.urlName}">${it.displayName}</a></div>

<j:set var="lastBuildAction" value="${it.lastFinishedBuildAction}"/>

<j:if test="${lastBuildAction != null}">
<j:set var="stat" value="${lastBuildAction.result.statistics}"/>
<j:set var="diff" value="${lastBuildAction.result.diff}"/>
<st:include page="/org/jenkinsci/plugins/cppcheck/CppcheckBuildAction/statistics.jelly"/>
</j:if>
</t:summary>
</table>
</j:jelly>

0 comments on commit 1dba0fe

Please sign in to comment.