Skip to content

Commit

Permalink
fixed compilation error due to getPlugin() which appeared in Descript…
Browse files Browse the repository at this point in the history
…or class
  • Loading branch information
fcamblor committed Oct 22, 2012
1 parent 136e179 commit c1ed3d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public ScmSyncConfigurationPageDecorator(){
super(ScmSyncConfigurationPageDecorator.class);
}

public ScmSyncConfigurationPlugin getPlugin(){
public ScmSyncConfigurationPlugin getScmSyncConfigPlugin(){
return ScmSyncConfigurationPlugin.getInstance();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">

<j:set var="url" value="${request.requestURL}" />
<j:if test="${it.getPlugin().shouldDecorationOccursOnURL(url.toString())}">
<j:set var="scmStrategy" value="${it.getPlugin().getStrategyForURL(url.toString())}" />
<j:if test="${it.getScmSyncConfigPlugin().shouldDecorationOccursOnURL(url.toString())}">
<j:set var="scmStrategy" value="${it.getScmSyncConfigPlugin().getStrategyForURL(url.toString())}" />
<j:set var="pageMatcher" value="${scmStrategy.getPageMatcherMatching(url.toString())}" />
<!-- Adding scm-sync-configuration header file to the page -->
<script src="${rootURL}/plugin/scm-sync-configuration/scripts/scm-sync-configuration/scm-sync-configuration-page-handler.js"></script>
Expand Down Expand Up @@ -43,18 +43,18 @@

</j:if>

<j:set var="success" value="${it.getPlugin().getScmSyncConfigurationStatusManager().getLastSuccess()}"/>
<j:set var="success" value="${it.getScmSyncConfigPlugin().getScmSyncConfigurationStatusManager().getLastSuccess()}"/>
<j:if test="${success != null}">
<j:set var="icon" value="health-80plus" />
<j:set var="msg" value="Last operation @ ${success}" />
</j:if>
<j:set var="fail" value="${it.getPlugin().getScmSyncConfigurationStatusManager().getLastFail()}"/>
<j:set var="fail" value="${it.getScmSyncConfigPlugin().getScmSyncConfigurationStatusManager().getLastFail()}"/>
<j:if test="${fail != null}">
<j:set var="icon" value="error" />
<j:set var="msg" value="&lt;br/&gt;${fail}&lt;br/&gt;To remove this message, please remove JENKINS_HOME/scm-sync-configuration.*.log files" />
</j:if>

<j:if test="${it.getPlugin().displayStatus}">
<j:if test="${it.getScmSyncConfigPlugin().displayStatus}">
<table width="100%">
<tr><td id="footer">
<span style="color:gray">SCM Sync status : <img src="${imagesURL}/16x16/${icon}.png" alt="" height="16" width="16"/>
Expand Down

0 comments on commit c1ed3d7

Please sign in to comment.