From 48d3b01e6b1683bbfbf6428d2ae1da84a80f2d05 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 19 Mar 2016 00:05:16 -0400 Subject: [PATCH] Move files around --- main-command/src/main/scala/sbt/BasicCommands.scala | 1 + .../src/main/scala/sbt/{ => internal}/CommandListener.scala | 1 + .../src/main/scala/sbt/{ => internal}/ConsoleListener.scala | 1 + .../src/main/scala/sbt/{ => internal}/NetworkListener.scala | 5 +++-- .../scala/sbt/{ => internal}/server/ClientConnection.scala | 1 + .../main/scala/sbt/{ => internal}/server/Serialization.scala | 1 + .../src/main/scala/sbt/{ => internal}/server/Server.scala | 3 ++- .../src/main/scala/sbt/{ => internal}/server/protocol.scala | 3 ++- 8 files changed, 12 insertions(+), 4 deletions(-) rename main/command/src/main/scala/sbt/{ => internal}/CommandListener.scala (96%) rename main/command/src/main/scala/sbt/{ => internal}/ConsoleListener.scala (98%) rename main/command/src/main/scala/sbt/{ => internal}/NetworkListener.scala (90%) rename main/command/src/main/scala/sbt/{ => internal}/server/ClientConnection.scala (99%) rename main/command/src/main/scala/sbt/{ => internal}/server/Serialization.scala (99%) rename main/command/src/main/scala/sbt/{ => internal}/server/Server.scala (99%) rename main/command/src/main/scala/sbt/{ => internal}/server/protocol.scala (97%) diff --git a/main-command/src/main/scala/sbt/BasicCommands.scala b/main-command/src/main/scala/sbt/BasicCommands.scala index 030458e21..4fbae934d 100644 --- a/main-command/src/main/scala/sbt/BasicCommands.scala +++ b/main-command/src/main/scala/sbt/BasicCommands.scala @@ -6,6 +6,7 @@ import sbt.internal.util.complete.{ Completion, Completions, DefaultParsers, His import sbt.internal.util.Types.{ const, idFun } import sbt.internal.inc.classpath.ClasspathUtilities.toLoader import sbt.internal.inc.ModuleUtilities +import sbt.internal.{ NetworkListener, ConsoleListener } import DefaultParsers._ import Function.tupled import Command.applyEffect diff --git a/main/command/src/main/scala/sbt/CommandListener.scala b/main/command/src/main/scala/sbt/internal/CommandListener.scala similarity index 96% rename from main/command/src/main/scala/sbt/CommandListener.scala rename to main/command/src/main/scala/sbt/internal/CommandListener.scala index 320daf031..2ea5fc7ee 100644 --- a/main/command/src/main/scala/sbt/CommandListener.scala +++ b/main/command/src/main/scala/sbt/internal/CommandListener.scala @@ -1,4 +1,5 @@ package sbt +package internal import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean diff --git a/main/command/src/main/scala/sbt/ConsoleListener.scala b/main/command/src/main/scala/sbt/internal/ConsoleListener.scala similarity index 98% rename from main/command/src/main/scala/sbt/ConsoleListener.scala rename to main/command/src/main/scala/sbt/internal/ConsoleListener.scala index 6dda42aa1..59bee14a7 100644 --- a/main/command/src/main/scala/sbt/ConsoleListener.scala +++ b/main/command/src/main/scala/sbt/internal/ConsoleListener.scala @@ -1,4 +1,5 @@ package sbt +package internal import sbt.internal.util._ import java.util.concurrent.ConcurrentLinkedQueue diff --git a/main/command/src/main/scala/sbt/NetworkListener.scala b/main/command/src/main/scala/sbt/internal/NetworkListener.scala similarity index 90% rename from main/command/src/main/scala/sbt/NetworkListener.scala rename to main/command/src/main/scala/sbt/internal/NetworkListener.scala index 4c155ac00..e3bc7fda5 100644 --- a/main/command/src/main/scala/sbt/NetworkListener.scala +++ b/main/command/src/main/scala/sbt/internal/NetworkListener.scala @@ -1,8 +1,9 @@ package sbt +package internal import java.util.concurrent.ConcurrentLinkedQueue -import sbt.server._ +import sbt.internal.server._ private[sbt] final class NetworkListener(queue: ConcurrentLinkedQueue[(String, Option[String])]) extends CommandListener(queue) { @@ -10,7 +11,7 @@ private[sbt] final class NetworkListener(queue: ConcurrentLinkedQueue[(String, O def run(status: CommandStatus): Unit = { - def onCommand(command: sbt.server.Command): Unit = { + def onCommand(command: internal.server.Command): Unit = { command match { case Execution(cmd) => queue.add(("network", Some(cmd))) } diff --git a/main/command/src/main/scala/sbt/server/ClientConnection.scala b/main/command/src/main/scala/sbt/internal/server/ClientConnection.scala similarity index 99% rename from main/command/src/main/scala/sbt/server/ClientConnection.scala rename to main/command/src/main/scala/sbt/internal/server/ClientConnection.scala index d3de48152..26b8188fb 100644 --- a/main/command/src/main/scala/sbt/server/ClientConnection.scala +++ b/main/command/src/main/scala/sbt/internal/server/ClientConnection.scala @@ -2,6 +2,7 @@ * Copyright (C) 2016 Lightbend Inc. */ package sbt +package internal package server import java.net.{ SocketTimeoutException, Socket } diff --git a/main/command/src/main/scala/sbt/server/Serialization.scala b/main/command/src/main/scala/sbt/internal/server/Serialization.scala similarity index 99% rename from main/command/src/main/scala/sbt/server/Serialization.scala rename to main/command/src/main/scala/sbt/internal/server/Serialization.scala index 648a85807..e399cd450 100644 --- a/main/command/src/main/scala/sbt/server/Serialization.scala +++ b/main/command/src/main/scala/sbt/internal/server/Serialization.scala @@ -2,6 +2,7 @@ * Copyright (C) 2016 Lightbend Inc. */ package sbt +package internal package server import org.json4s.JsonAST.{ JArray, JString } diff --git a/main/command/src/main/scala/sbt/server/Server.scala b/main/command/src/main/scala/sbt/internal/server/Server.scala similarity index 99% rename from main/command/src/main/scala/sbt/server/Server.scala rename to main/command/src/main/scala/sbt/internal/server/Server.scala index 672b9ab89..e8c846de7 100644 --- a/main/command/src/main/scala/sbt/server/Server.scala +++ b/main/command/src/main/scala/sbt/internal/server/Server.scala @@ -2,6 +2,7 @@ * Copyright (C) 2016 Lightbend Inc. */ package sbt +package internal package server import java.net.{ SocketTimeoutException, InetAddress, ServerSocket } @@ -67,4 +68,4 @@ private[sbt] object Server { } } -} \ No newline at end of file +} diff --git a/main/command/src/main/scala/sbt/server/protocol.scala b/main/command/src/main/scala/sbt/internal/server/protocol.scala similarity index 97% rename from main/command/src/main/scala/sbt/server/protocol.scala rename to main/command/src/main/scala/sbt/internal/server/protocol.scala index dab061021..7c16b0fc3 100644 --- a/main/command/src/main/scala/sbt/server/protocol.scala +++ b/main/command/src/main/scala/sbt/internal/server/protocol.scala @@ -2,6 +2,7 @@ * Copyright (C) 2016 Lightbend Inc. */ package sbt +package internal package server /* @@ -22,4 +23,4 @@ private[sbt] final case class ExecutionEvent(command: String, success: Boolean) private[sbt] sealed trait Command -private[sbt] final case class Execution(cmd: String) extends Command \ No newline at end of file +private[sbt] final case class Execution(cmd: String) extends Command