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

use viewable for repository root resource

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-12 21:36:02 +02:00
parent 442c157c79
commit 73a8b8bec7
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
*/
package sonia.scm.api.rest.resources;
//~--- non-JDK imports --------------------------------------------------------
@@ -43,15 +44,15 @@ import com.google.inject.Inject;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryTypePredicate;
import sonia.scm.template.TemplateHandler;
import sonia.scm.url.UrlProvider;
import sonia.scm.url.UrlProviderFactory;
import sonia.scm.util.HttpUtil;
//~--- JDK imports ------------------------------------------------------------
import com.sun.jersey.api.view.Viewable;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Collection;
import java.util.Comparator;
@@ -76,7 +77,7 @@ public class RepositoryRootResource
{
/** Field description */
public static final String TEMPLATE = "/repository-root";
public static final String TEMPLATE = "/templates/repository-root.ftl";
//~--- constructors ---------------------------------------------------------
@@ -89,10 +90,8 @@ public class RepositoryRootResource
* @param repositoryManager
*/
@Inject
public RepositoryRootResource(TemplateHandler templateHandler,
RepositoryManager repositoryManager)
public RepositoryRootResource(RepositoryManager repositoryManager)
{
this.templateHandler = templateHandler;
this.repositoryManager = repositoryManager;
}
@@ -112,7 +111,7 @@ public class RepositoryRootResource
*/
@GET
@Produces(MediaType.TEXT_HTML)
public String renderRepositoriesRoot(@Context HttpServletRequest request,
public Viewable renderRepositoriesRoot(@Context HttpServletRequest request,
@PathParam("type") final String type)
throws IOException
{
@@ -135,11 +134,7 @@ public class RepositoryRootResource
environment.put("repositories", repositories);
StringWriter writer = new StringWriter();
templateHandler.render(TEMPLATE, writer, environment);
return writer.toString();
return new Viewable(TEMPLATE, environment);
}
//~--- inner classes --------------------------------------------------------
@@ -341,7 +336,4 @@ public class RepositoryRootResource
/** Field description */
private RepositoryManager repositoryManager;
/** Field description */
private TemplateHandler templateHandler;
}