(refs #341)Fix compilation error of delete statements

This commit is contained in:
Naoki Takezoe
2014-07-06 15:42:45 +09:00
parent 606cd83f44
commit cce0b67871
13 changed files with 480 additions and 483 deletions

View File

@@ -1,6 +1,7 @@
package object model extends {
// TODO
val profile = slick.driver.H2Driver
val simple = profile.simple
} with AccountComponent
with ActivityComponent

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
import service.SystemSettingsService.SystemSettings
import util.StringUtil._
import util.LDAPUtil

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
trait ActivityService {

View File

@@ -4,7 +4,7 @@ import scala.slick.jdbc.{StaticQuery => Q}
import Q.interpolation
import model._
import profile.simple._
import simple._
import util.Implicits._
import util.StringUtil._

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
trait LabelsService {

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
trait MilestonesService {

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
trait PullRequestService { self: IssuesService =>
import PullRequestService._

View File

@@ -3,12 +3,12 @@ package service
import util.{FileUtil, StringUtil, JGitUtil}
import util.Directory._
import util.ControlUtil._
import model.Issue
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.treewalk.TreeWalk
import org.eclipse.jgit.lib.FileMode
import org.eclipse.jgit.api.Git
import model.profile.simple.Session
import model._
import simple._
trait RepositorySearchService { self: IssuesService =>
import RepositorySearchService._

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
import util.JGitUtil
trait RepositoryService { self: AccountService =>

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
trait SshKeyService {

View File

@@ -1,7 +1,7 @@
package service
import model._
import profile.simple._
import simple._
import org.slf4j.LoggerFactory
import service.RepositoryService.RepositoryInfo
import util.JGitUtil

View File

@@ -2,22 +2,18 @@ package service
import java.util.Date
import org.eclipse.jgit.api.Git
import org.apache.commons.io.FileUtils
import util._
import _root_.util.ControlUtil._
import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
import org.eclipse.jgit.treewalk.CanonicalTreeParser
import org.eclipse.jgit.lib._
import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry}
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.dircache.DirCache
import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
import java.io.ByteArrayInputStream
import org.eclipse.jgit.patch._
import org.eclipse.jgit.api.errors.PatchFormatException
import scala.collection.JavaConverters._
import scala.Some
import service.RepositoryService.RepositoryInfo
object WikiService {
/**