View difference between Paste ID: 1gQDam3n and Nasz1vqM

 object DatabaseConnection {
-		private val Connection = ...
+	private val Connection = ...
-
+
-		private object PasswordDevice {
+	private object PasswordDevice {
-			def check(pw1: String, pw2: String) = ...
+		def check(pw1: String, pw2: String) = ...
-			def encrypt(password: String) = ...
+		def encrypt(password: String) = ...
 	}
-
+
-		object LoginDevice {
+	object LoginDevice {
-			private val GetUserStatement = Connection.prepareStatement("SELECT Name, Password, Rights FROM Users WHERE UPPER(Name) = UPPER(?)")
+		private val GetUserStatement = Connection.prepareStatement("SELECT Name, Password, ... FROM Users WHERE UPPER(Name) = UPPER(?)")
 
-			def login(username: String, password: String) = {
+		def login(username: String, password: String) = {
-				GetUserStatement.setString(1, username)
+			GetUserStatement.setString(1, username)
-				val userResult = GetUserStatement.executeQuery
+			val userResult = GetUserStatement.executeQuery
-				if ( !userResult.next )
+			if ( !userResult.next )
-					throw User.NotFoundException
+				throw User.NotFoundException
-				if ( !PasswordDevice.check(password, userResult.getString("Password")) )
+			if ( !PasswordDevice.check(password, userResult.getString("Password")) )
-					throw User.WrongPasswordException
+				throw User.WrongPasswordException
-				new User(userResult.getString("Name"), ...)
+			new User(userResult.getString("Name"), ...)
-			}
+
 	}
 
 
-		object RegisterDevice {
+	object RegisterDevice {
-			private val RegisterStatement = Connection.prepareStatement("SELECT Name, Password, Rights FROM Users WHERE UPPER(Name) = UPPER(?)")
+		private val RegisterStatement = Connection.prepareStatement("SELECT Name, Password, ... FROM Users WHERE UPPER(Name) = UPPER(?)")
-			private val GetKeyStatement = Connection.prepareStatement("SELECT Key FROM Keys WHERE UPPER(Key) = UPPER(?)")
+		private val GetKeyStatement = Connection.prepareStatement("SELECT Key FROM Keys WHERE Key = ?")
-			private val InsertStatement = Connection.prepareStatement(s"INSERT INTO Users VALUES(?, ?, ...)")
+		private val InsertStatement = Connection.prepareStatement(s"INSERT INTO Users VALUES(?, ?, ...)")
-			private val DeleteKeyStatement = Connection.prepareStatement("DELETE FROM Keys WHERE Key = ?")
+		private val DeleteKeyStatement = Connection.prepareStatement("DELETE FROM Keys WHERE Key = ?")
 
-			def register(name: String, password: String, key: String) = {
+		def register(name: String, password: String, key: String) = {
-				RegisterStatement.setString(1, name)
+			RegisterStatement.setString(1, name)
-				GetKeyStatement.setString(1, key)
+			GetKeyStatement.setString(1, key)
-				val userExistsResult = RegisterStatement.executeQuery
+			val userExistsResult = RegisterStatement.executeQuery
-				val keyValidResult = GetKeyStatement.executeQuery
+			val keyValidResult = GetKeyStatement.executeQuery
-				if ( userExistsResult.next ) throw User.AlreadyExistsException
+			if ( userExistsResult.next ) throw User.AlreadyExistsException
-				if ( !keyValidResult.next ) throw User.InvalidKeyException
+			if ( !keyValidResult.next ) throw User.InvalidKeyException
-				InsertStatement.setString(1, name)
+			InsertStatement.setString(1, name)
-				InsertStatement.setString(2, PasswordDevice.encrypt(password))
+			InsertStatement.setString(2, PasswordDevice.encrypt(password))
-				InsertStatement.executeUpdate()
+			InsertStatement.executeUpdate()
-				DeleteKeyStatement.setString(1, key)
+			DeleteKeyStatement.setString(1, key)
-				DeleteKeyStatement.executeUpdate()
+			DeleteKeyStatement.executeUpdate()
-				new User(name, ...)
+			new User(name, ...)
-			}
+
 	}
 
 	object RequestDevice {
-		object RequestDevice {
+		private val RequestStatement = Connection.prepareStatement("SELECT Request.* FROM Request WHERE ID = ?")
-			private val RequestStatement = Connection.prepareStatement("SELECT Request.* FROM Request WHERE ID = ?")
+
 		def request(id: String) = {
-			def request(id: String) = {
+			RequestStatement.setString(1, id)
-				RequestStatement.setString(1, id)
+			val result = RequestStatement.executeQuery
-				val result = RequestStatement.executeQuery
+			if(!result.next)
-				if(!result.next)
+				throw Request.InvalidIDException
-					throw Request.InvalidIDException
+			new DataElement(result.getString("ID"), ...)
-				new DataElement(result.getString("id"), ...)
+
-			}
+	}
 
-
+	...
-		...
+}