luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-22 06:07:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix typos

Browse Source
This commit is contained in:
ddworak
2016-05-07 17:58:42 -04:00
committed by Eugene Yokota
parent 1880173c7c
commit b98fdf7cfa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivy/src/main/scala/sbt/ivyint/ErrorMessageAuthenticator.scala
+6 -6
View File
@@ -19,8 +19,8 @@ object ErrorMessageAuthenticator {
private def originalAuthenticator: Option[Authenticator] = { private def originalAuthenticator: Option[Authenticator] = {
try { try {
val f = classOf[Authenticator].getDeclaredField("theAuthenticator"); val f = classOf[Authenticator].getDeclaredField("theAuthenticator")
f.setAccessible(true); f.setAccessible(true)
Option(f.get(null).asInstanceOf[Authenticator]) Option(f.get(null).asInstanceOf[Authenticator])
} catch { } catch {
// TODO - Catch more specific errors. // TODO - Catch more specific errors.
@@ -48,7 +48,7 @@ object ErrorMessageAuthenticator {
case originalOpt => installIntoIvyImpl(originalOpt) case originalOpt => installIntoIvyImpl(originalOpt)
} catch { } catch {
case t: Throwable => case t: Throwable =>
Message.debug("Error occurred will trying to install debug messages into Ivy Authentication" + t.getMessage) Message.debug("Error occurred while trying to install debug messages into Ivy Authentication" + t.getMessage)
} }
Some(ivy) Some(ivy)
} }
@@ -60,7 +60,7 @@ object ErrorMessageAuthenticator {
try Authenticator.setDefault(new ErrorMessageAuthenticator(original)) try Authenticator.setDefault(new ErrorMessageAuthenticator(original))
catch { catch {
case e: SecurityException if !securityWarningLogged => case e: SecurityException if !securityWarningLogged =>
securityWarningLogged = true; securityWarningLogged = true
Message.warn("Not enough permissions to set the ErorrMessageAuthenticator. " Message.warn("Not enough permissions to set the ErorrMessageAuthenticator. "
+ "Helpful debug messages disabled!"); + "Helpful debug messages disabled!");
} }
@@ -93,7 +93,7 @@ private[sbt] final class ErrorMessageAuthenticator(original: Option[Authenticato
Message.error(s"Unable to find credentials for [${getRequestingPrompt} @ ${host}].") Message.error(s"Unable to find credentials for [${getRequestingPrompt} @ ${host}].")
val configuredRealms = IvyCredentialsLookup.realmsForHost.getOrElse(host, Set.empty) val configuredRealms = IvyCredentialsLookup.realmsForHost.getOrElse(host, Set.empty)
if (configuredRealms.nonEmpty) { if (configuredRealms.nonEmpty) {
Message.error(s" Is one of these realms mispelled for host [${host}]:") Message.error(s" Is one of these realms misspelled for host [${host}]:")
configuredRealms foreach { realm => configuredRealms foreach { realm =>
Message.error(s" * ${realm}") Message.error(s" * ${realm}")
} }
@@ -106,7 +106,7 @@ private[sbt] final class ErrorMessageAuthenticator(original: Option[Authenticato
// Grabs the authentication that would have been provided had we not been installed... // Grabs the authentication that would have been provided had we not been installed...
def originalAuthentication: Option[PasswordAuthentication] = { def originalAuthentication: Option[PasswordAuthentication] = {
Authenticator.setDefault(original.getOrElse(null)) Authenticator.setDefault(original.orNull)
try Option(Authenticator.requestPasswordAuthentication( try Option(Authenticator.requestPasswordAuthentication(
getRequestingHost, getRequestingHost,
getRequestingSite, getRequestingSite,
ivy/src/main/scala/sbt/ivyint/SbtChainResolver.scala
+1 -1
View File
@@ -162,7 +162,7 @@ private[sbt] case class SbtChainResolver(
def sorted = def sorted =
if (useLatest) (foundRevisions.sortBy { if (useLatest) (foundRevisions.sortBy {
case (rmr, resolver) => case (rmr, resolver) =>
Message.warn(s"Sorrting results from $rmr, using ${rmr.getPublicationDate} and ${rmr.getDescriptor.getPublicationDate}") Message.warn(s"Sorting results from $rmr, using ${rmr.getPublicationDate} and ${rmr.getDescriptor.getPublicationDate}")
// Just issue warning about issues with publication date, and fake one on it for now. // Just issue warning about issues with publication date, and fake one on it for now.
Option(rmr.getPublicationDate) orElse Option(rmr.getDescriptor.getPublicationDate) match { Option(rmr.getPublicationDate) orElse Option(rmr.getDescriptor.getPublicationDate) match {
case None => case None =>