erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

String fixes.

Browse source
This commit is contained in:
Cedric Beust 2015-10-27 20:33:34 -07:00
parent 949425be99
commit b91579ebf3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
View file

@ -48,13 +48,13 @@ public class RepoFinder @Inject constructor(val http: Http, val executors: Kobal
for (i in 0..Kobalt.repos.size - 1) { for (i in 0..Kobalt.repos.size - 1) {
try { try {
val result = cs.take().get(2000, TimeUnit.MILLISECONDS) val result = cs.take().get(2000, TimeUnit.MILLISECONDS)
log(2, "Result for repo #${i}: ${result}") log(2, "Result for repo #$i: $result")
if (result.found) { if (result.found) {
log(2, "Located ${id} in ${result.repoUrl}") log(2, "Located $id in ${result.repoUrl}")
return result return result
} }
} catch(ex: Exception) { } catch(ex: Exception) {
warn("Error: ${ex}") warn("Error: $ex")
} }
} }
return RepoResult("", false, id) return RepoResult("", false, id)
@ -69,7 +69,7 @@ public class RepoFinder @Inject constructor(val http: Http, val executors: Kobal
inner class RepoFinderCallable(val id: String, val repoUrl: String) : Callable<RepoResult> { inner class RepoFinderCallable(val id: String, val repoUrl: String) : Callable<RepoResult> {
override fun call(): RepoResult { override fun call(): RepoResult {
log(2, "Checking ${repoUrl} for ${id}") log(2, "Checking $repoUrl for $id")
val c = id.split(":") val c = id.split(":")
if (! MavenDependency.hasVersion(id)) { if (! MavenDependency.hasVersion(id)) {
@ -129,7 +129,7 @@ public class RepoFinder @Inject constructor(val http: Http, val executors: Kobal
} }
}) })
} catch(ex: Exception) { } catch(ex: Exception) {
log(2, "Couldn't find metadata at ${url}") log(2, "Couldn't find metadata at $url")
} }
return null return null
} }
@ -147,7 +147,7 @@ public class RepoFinder @Inject constructor(val http: Http, val executors: Kobal
return ts.toString() + "-" + bn.toString() return ts.toString() + "-" + bn.toString()
} }
} catch(ex: Exception) { } catch(ex: Exception) {
log(2, "Couldn't find metadata at ${url}") log(2, "Couldn't find metadata at $url")
} }
return null return null
} }

2
src/main/kotlin/com/beust/kobalt/maven/SimpleDep.kt
View file

@ -12,7 +12,7 @@ open public class SimpleDep(override val groupId: String, override val artifactI
} }
override public fun toMetadataXmlPath(fileSystem: Boolean): String { override public fun toMetadataXmlPath(fileSystem: Boolean): String {
return toDirectory(version, fileSystem) + "/maven-metadata.xml" return toDirectory(version, fileSystem) + "maven-metadata.xml"
} }
private fun toFile(v: String, s: String, suffix: String) : String { private fun toFile(v: String, s: String, suffix: String) : String {