Minor refactoring

This commit is contained in:
Alexandre Archambault 2015-07-04 15:19:41 +01:00
parent be3fa1b94f
commit 6ed8f6e2d1
2 changed files with 74 additions and 74 deletions

View File

@ -105,25 +105,7 @@ object Repository {
}
}
object BaseMavenRepository {
def ivyLikePath(
org: String,
name: String,
version: String,
subDir: String,
baseSuffix: String,
ext: String
) =
Seq(
org,
name,
version,
subDir,
s"$name$baseSuffix.$ext"
)
case class Source(root: String, ivyLike: Boolean) extends Artifact.Source {
case class MavenSource(root: String, ivyLike: Boolean) extends Artifact.Source {
import Repository._
def artifacts(
@ -191,6 +173,24 @@ object BaseMavenRepository {
}
}
object BaseMavenRepository {
def ivyLikePath(
org: String,
name: String,
version: String,
subDir: String,
baseSuffix: String,
ext: String
) =
Seq(
org,
name,
version,
subDir,
s"$name$baseSuffix.$ext"
)
}
abstract class BaseMavenRepository(
@ -206,7 +206,7 @@ abstract class BaseMavenRepository(
import Repository._
import BaseMavenRepository._
val source = BaseMavenRepository.Source(root, ivyLike)
val source = MavenSource(root, ivyLike)
def projectArtifact(module: Module, version: String): Artifact = {

View File

@ -1,7 +1,7 @@
package coursier
package web
import coursier.core.{Repository, BaseMavenRepository, MavenRepository}
import coursier.core.{ Repository, MavenRepository, MavenSource }
import japgolly.scalajs.react.vdom.{ TagMod, Attr }
import japgolly.scalajs.react.vdom.Attrs.dangerouslySetInnerHtml
import japgolly.scalajs.react.{ ReactEventI, ReactComponentB, BackendScope }
@ -248,7 +248,7 @@ object App {
)),
<.td(Seq[Seq[TagMod]](
res.projectCache.get(dep.moduleVersion) match {
case Some((source: BaseMavenRepository.Source, proj)) if !source.ivyLike =>
case Some((source: MavenSource, proj)) if !source.ivyLike =>
// FIXME Maven specific, generalize with source.artifacts
val version0 = finalVersionOpt getOrElse dep.version
val relPath =