azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected src classes where using renamed protobufs

Browse Source
This commit is contained in:
MaximZaitsev
2016-08-19 15:06:22 +03:00
parent 994bf0e146
commit 270cefd8b6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
car_srv/kotlinSrv/src/control/emulator/ControllerEmulator.kt
+2 -2
View File
@@ -17,8 +17,8 @@ class ControllerEmulator : Controller {
} }
override fun executeRoute(route: RouteRequest) { override fun executeRoute(route: RouteRequest) {
val moveTimes = route.moveTime val moveTimes = route.times
val moveDirections = route.moveDirection val moveDirections = route.directions
//list of move direction and time to this move in ms //list of move direction and time to this move in ms
val commands: MutableList<Pair<MoveDirection, Int>> = mutableListOf() val commands: MutableList<Pair<MoveDirection, Int>> = mutableListOf()
server/src/main/java/DebugClInterface.kt
+5 -5
View File
@@ -139,17 +139,17 @@ class DebugClInterface {
continue continue
} }
val paramType = params[2]//maybe string or int val paramType = params[2]//maybe string or int
val type: DebugRequest.TYPE val type: DebugRequest.Type
try { try {
type = DebugRequest.TYPE.fromIntToTYPE(paramType.toInt()) type = DebugRequest.Type.fromIntToType(paramType.toInt())
} catch (e: NumberFormatException) { } catch (e: NumberFormatException) {
try { try {
type = DebugRequest.TYPE.valueOf(paramType) type = DebugRequest.Type.valueOf(paramType)
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
type = DebugRequest.TYPE.Unexpected type = DebugRequest.Type.Unexpected
} }
} }
if (type == DebugRequest.TYPE.Unexpected) { if (type == DebugRequest.Type.Unexpected) {
println("type with name/id $paramType not found") println("type with name/id $paramType not found")
continue continue
} }