From 78ad794613f4b8e5346e29c6bf856aa34589c7f8 Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 4 Jun 2013 01:14:27 +0900 Subject: [PATCH] Rename ProjectService to RepositoryService. --- src/main/scala/app/CreateRepositoryController.scala | 6 +++--- src/main/scala/app/IndexController.scala | 4 ++-- src/main/scala/app/RepositoryViewerController.scala | 6 ++++-- src/main/scala/app/SettingsController.scala | 4 ++-- src/main/scala/app/WikiController.scala | 5 +++-- .../{ProjectService.scala => RepositoryService.scala} | 10 +++++----- src/main/scala/view/helpers.scala | 4 ++-- 7 files changed, 21 insertions(+), 18 deletions(-) rename src/main/scala/service/{ProjectService.scala => RepositoryService.scala} (94%) diff --git a/src/main/scala/app/CreateRepositoryController.scala b/src/main/scala/app/CreateRepositoryController.scala index af0373b2e..b2419d000 100644 --- a/src/main/scala/app/CreateRepositoryController.scala +++ b/src/main/scala/app/CreateRepositoryController.scala @@ -9,12 +9,12 @@ import org.apache.commons.io._ import jp.sf.amateras.scalatra.forms._ class CreateRepositoryController extends CreateRepositoryControllerBase - with ProjectService with AccountService with WikiService + with RepositoryService with AccountService with WikiService /** * Creates new repository. */ -trait CreateRepositoryControllerBase extends ControllerBase { self: ProjectService with WikiService => +trait CreateRepositoryControllerBase extends ControllerBase { self: RepositoryService with WikiService => case class RepositoryCreationForm(name: String, description: String) // TODO Option @@ -37,7 +37,7 @@ trait CreateRepositoryControllerBase extends ControllerBase { self: ProjectServi val loginUserName = context.loginAccount.get.userName // Insert to the database at first - createProject(form.name, loginUserName, Some(form.description)) + createRepository(form.name, loginUserName, Some(form.description)) // Create the actual repository val gitdir = getRepositoryDir(loginUserName, form.name) diff --git a/src/main/scala/app/IndexController.scala b/src/main/scala/app/IndexController.scala index 46fe857d5..8b51091b8 100644 --- a/src/main/scala/app/IndexController.scala +++ b/src/main/scala/app/IndexController.scala @@ -2,9 +2,9 @@ package app import service._ -class IndexController extends IndexControllerBase with ProjectService with AccountService +class IndexController extends IndexControllerBase with RepositoryService with AccountService -trait IndexControllerBase extends ControllerBase { self: ProjectService => +trait IndexControllerBase extends ControllerBase { self: RepositoryService => get("/"){ html.index(getAccessibleRepositories(context.loginAccount, servletContext)) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 196f63967..285c50ef9 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -11,12 +11,14 @@ import org.eclipse.jgit.lib._ import org.apache.commons.io.FileUtils import org.eclipse.jgit.treewalk._ -class RepositoryViewerController extends RepositoryViewerControllerBase with ProjectService with AccountService +class RepositoryViewerController extends RepositoryViewerControllerBase + with RepositoryService with AccountService /** * The repository viewer. */ -trait RepositoryViewerControllerBase extends ControllerBase { self: ProjectService with AccountService => +trait RepositoryViewerControllerBase extends ControllerBase { + self: RepositoryService with AccountService => // TODO separate to AccountController? /** diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala index a6a9b6270..b57e2be50 100644 --- a/src/main/scala/app/SettingsController.scala +++ b/src/main/scala/app/SettingsController.scala @@ -2,10 +2,10 @@ package app import service._ -class SettingsController extends SettingsControllerBase with ProjectService with AccountService +class SettingsController extends SettingsControllerBase with RepositoryService with AccountService -trait SettingsControllerBase extends ControllerBase { self: ProjectService => +trait SettingsControllerBase extends ControllerBase { self: RepositoryService => get("/:owner/:repository/settings") { val owner = params("owner") diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala index c26795478..c8483a9c4 100644 --- a/src/main/scala/app/WikiController.scala +++ b/src/main/scala/app/WikiController.scala @@ -5,9 +5,10 @@ import util.JGitUtil import util.Directory._ import jp.sf.amateras.scalatra.forms._ -class WikiController extends WikiControllerBase with WikiService with ProjectService with AccountService +class WikiController extends WikiControllerBase + with WikiService with RepositoryService with AccountService -trait WikiControllerBase extends ControllerBase { self: WikiService with ProjectService => +trait WikiControllerBase extends ControllerBase { self: WikiService with RepositoryService => case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String) diff --git a/src/main/scala/service/ProjectService.scala b/src/main/scala/service/RepositoryService.scala similarity index 94% rename from src/main/scala/service/ProjectService.scala rename to src/main/scala/service/RepositoryService.scala index d3be1e440..ef57982b1 100644 --- a/src/main/scala/service/ProjectService.scala +++ b/src/main/scala/service/RepositoryService.scala @@ -6,11 +6,11 @@ import Database.threadLocalSession import util.JGitUtil import javax.servlet.ServletContext -trait ProjectService { self: AccountService => - import ProjectService._ +trait RepositoryService { self: AccountService => + import RepositoryService._ /** - * Creates a new project. + * Creates a new repository. * * The project is created as public repository at first. Users can modify the project type at the repository settings * page after the project creation to configure the project as the private repository. @@ -20,7 +20,7 @@ trait ProjectService { self: AccountService => * @param description the project description * @return the created project id */ - def createProject(repositoryName: String, userName: String, description: Option[String]): Long = { + def createRepository(repositoryName: String, userName: String, description: Option[String]): Long = { // TODO create a git repository also here? // TODO insert default labels. @@ -103,7 +103,7 @@ trait ProjectService { self: AccountService => } -object ProjectService { +object RepositoryService { val Public = 0 val Private = 1 diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala index 098c33b80..7c82131f5 100644 --- a/src/main/scala/view/helpers.scala +++ b/src/main/scala/view/helpers.scala @@ -25,7 +25,7 @@ object helpers { /** * Converts the issue number and the commit id to the link. */ - private def markdownFilter(value: String, repository: service.ProjectService.RepositoryInfo)(implicit context: app.Context): String = { + private def markdownFilter(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = { value .replaceAll("#([0-9]+)", "[$0](%s/%s/%s/issue/$1)".format(context.path, repository.owner, repository.name)) .replaceAll("[0-9a-f]{40}", "[$0](%s/%s/%s/commit/$0)".format(context.path, repository.owner, repository.name)) @@ -34,7 +34,7 @@ object helpers { /** * Converts Markdown of Wiki pages to HTML. */ - def markdown(value: String, repository: service.ProjectService.RepositoryInfo, wikiLink: Boolean)(implicit context: app.Context): twirl.api.Html = { + def markdown(value: String, repository: service.RepositoryService.RepositoryInfo, wikiLink: Boolean)(implicit context: app.Context): twirl.api.Html = { import org.pegdown._ val html = new PegDownProcessor(Extensions.AUTOLINKS|Extensions.WIKILINKS|Extensions.FENCED_CODE_BLOCKS) .markdownToHtml(markdownFilter(value, repository), new LinkRenderer(){