Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix some other freemarker expression errors

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-05-29 10:19:07 +02:00
parent 28e8e2d582
commit b2dc85636c
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryRootResource.java
View File

@@ -43,6 +43,7 @@ import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryTypePredicate;
import sonia.scm.repository.RepositoryUtil;
import sonia.scm.template.TemplateHandler;
import sonia.scm.url.UrlProvider;
import sonia.scm.url.UrlProviderFactory;
@@ -120,7 +121,7 @@ public class RepositoryRootResource
Collections2.transform(
Collections2.filter(
repositoryManager.getAll(), new RepositoryTypePredicate(type))
, new RepositoryTransformFunction(uiUrlProvider)
, new RepositoryTransformFunction(configuration, repositoryManager, uiUrlProvider)
);
List<RepositoryTemplateElement> repositories = Ordering.from(
@@ -155,13 +156,13 @@ public class RepositoryRootResource
*
*
* @param repository
* @param urlProvider
* @param uiUrlProvider
*/
public RepositoryTemplateElement(Repository repository,
UrlProvider urlProvider)
UrlProvider uiUrlProvider)
{
this.repository = repository;
this.urlProvider = urlProvider;
this.urlProvider = uiUrlProvider;
}
//~--- get methods --------------------------------------------------------
@@ -175,7 +176,7 @@ public class RepositoryRootResource
public String getCommitUrl()
{
return urlProvider.getRepositoryUrlProvider().getChangesetUrl(
repository.getId(), null);
repository.getId(), 0, 20);
}
/**
@@ -218,7 +219,7 @@ public class RepositoryRootResource
*
* @return
*/
public String getUIUrl()
public String getDetailUrl()
{
return urlProvider.getRepositoryUrlProvider().getDetailUrl(
repository.getId());
@@ -289,10 +290,17 @@ public class RepositoryRootResource
* Constructs ...
*
*
*
* @param configuration
* @param repositoryManager
* @param urlProvider
*/
public RepositoryTransformFunction(UrlProvider urlProvider)
public RepositoryTransformFunction(ScmConfiguration configuration,
RepositoryManager repositoryManager,
UrlProvider urlProvider)
{
this.configuration = configuration;
this.repositoryManager = repositoryManager;
this.urlProvider = urlProvider;
}
@@ -309,11 +317,19 @@ public class RepositoryRootResource
@Override
public RepositoryTemplateElement apply(Repository repository)
{
RepositoryUtil.appendUrl(configuration, repositoryManager, repository);
return new RepositoryTemplateElement(repository, urlProvider);
}
//~--- fields -------------------------------------------------------------
/** Field description */
private ScmConfiguration configuration;
/** Field description */
private RepositoryManager repositoryManager;
/** Field description */
private UrlProvider urlProvider;
}