From ee7220ebd2b16a7f758a8c9203df2151e60afc29 Mon Sep 17 00:00:00 2001
From: Herr Ritschwumm <ritschwumm@djini.de>
Date: Thu, 11 Feb 2016 22:37:31 +0100
Subject: [PATCH] move SshAddress into the SystemSettingsService object

---
 .../gitbucket/core/service/SystemSettingsService.scala      | 6 +++++-
 src/main/scala/gitbucket/core/ssh/NoShell.scala             | 2 +-
 src/main/scala/gitbucket/core/ssh/SshServerListener.scala   | 3 ++-
 src/main/scala/gitbucket/core/util/RepoBase.scala           | 2 ++
 src/main/scala/gitbucket/core/util/SshAddress.scala         | 3 ---
 5 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 src/main/scala/gitbucket/core/util/SshAddress.scala

diff --git a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
index f23e63b1a..e5096ba10 100644
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.service
 
-import gitbucket.core.util.{Directory, ControlUtil, SshAddress}
+import gitbucket.core.util.{Directory, ControlUtil}
 import gitbucket.core.util.Implicits._
 import Directory._
 import ControlUtil._
@@ -168,6 +168,10 @@ object SystemSettingsService {
     fromAddress: Option[String],
     fromName: Option[String])
 
+  case class SshAddress(
+    host:String,
+    port:Int)
+
   val DefaultSshPort = 29418
   val DefaultSmtpPort = 25
   val DefaultLdapPort = 389
diff --git a/src/main/scala/gitbucket/core/ssh/NoShell.scala b/src/main/scala/gitbucket/core/ssh/NoShell.scala
index d1641872d..6f2f42d9a 100644
--- a/src/main/scala/gitbucket/core/ssh/NoShell.scala
+++ b/src/main/scala/gitbucket/core/ssh/NoShell.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.ssh
 
 import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.util.SshAddress
+import gitbucket.core.service.SystemSettingsService.SshAddress
 import org.apache.sshd.common.Factory
 import org.apache.sshd.server.{Environment, ExitCallback, Command}
 import java.io.{OutputStream, InputStream}
diff --git a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
index ccd21264c..8795e40e3 100644
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -5,7 +5,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 import javax.servlet.{ServletContextEvent, ServletContextListener}
 
 import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.util.{Directory, SshAddress}
+import gitbucket.core.service.SystemSettingsService.SshAddress
+import gitbucket.core.util.{Directory}
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
 import org.slf4j.LoggerFactory
 
diff --git a/src/main/scala/gitbucket/core/util/RepoBase.scala b/src/main/scala/gitbucket/core/util/RepoBase.scala
index 5a577b8e6..6fc9b4bff 100644
--- a/src/main/scala/gitbucket/core/util/RepoBase.scala
+++ b/src/main/scala/gitbucket/core/util/RepoBase.scala
@@ -1,3 +1,5 @@
 package gitbucket.core.util
 
+import gitbucket.core.service.SystemSettingsService.SshAddress
+
 case class RepoBase(baseUrl:String, sshAddress:Option[SshAddress])
diff --git a/src/main/scala/gitbucket/core/util/SshAddress.scala b/src/main/scala/gitbucket/core/util/SshAddress.scala
deleted file mode 100644
index aafbcbaac..000000000
--- a/src/main/scala/gitbucket/core/util/SshAddress.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package gitbucket.core.util
-
-case class SshAddress(host:String, port:Int)