Skip to content

Dev/var type specification #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JudeKratzer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dev/var type specification #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e134a
Implemented specific type get and set functions
FRCTeam5499 Feb 4, 2019
a1f633b
Fixed errors
FRCTeam5499 Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 47 additions & 4 deletions src/main/kotlin/org/team5499/dashboard/Dashboard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import org.json.JSONObject
*
* Handles starting the server
*/
@Suppress("TooManyFunctions")
object Dashboard {

private var config: Config = Config()
Expand Down Expand Up @@ -122,17 +123,59 @@ object Dashboard {
SocketHandler.startBroadcastThread() // start broadcasting data
}

fun setVariable(key: String, value: Any) {
fun setString(key: String, value: String) {
variableUpdates.put(key, value)
}

fun <T> getVariable(key: String): T {
fun setInt(key: String, value: Int) {
variableUpdates.put(key, value)
}

fun setBool(key: String, value: Boolean) {
variableUpdates.put(key, value)
}

fun setDouble(key: String, value: Double) {
variableUpdates.put(key, value)
}

fun getString(key: String): String {
if ((!variables.has(key)) && (!variableUpdates.has(key))) {
throw DashboardException("The variable with name " + key + " was not found.")
} else if (variableUpdates.has(key)) {
return variableUpdates.getString(key)
} else {
return variables.getString(key)
}
}

fun getInt(key: String): Int {
if ((!variables.has(key)) && (!variableUpdates.has(key))) {
throw DashboardException("The variable with name " + key + " was not found.")
} else if (variableUpdates.has(key)) {
return variableUpdates.getInt(key)
} else {
return variables.getInt(key)
}
}

fun getBool(key: String): Boolean {
if ((!variables.has(key)) && (!variableUpdates.has(key))) {
throw DashboardException("The variable with name " + key + " was not found.")
} else if (variableUpdates.has(key)) {
return variableUpdates.getBoolean(key)
} else {
return variables.getBoolean(key)
}
}

fun getDouble(key: String): Double {
if ((!variables.has(key)) && (!variableUpdates.has(key))) {
throw DashboardException("The variable with name " + key + " was not found.")
} else if (variableUpdates.has(key)) {
return variableUpdates.get(key) as T
return variableUpdates.getDouble(key)
} else {
return variables.get(key) as T
return variables.getDouble(key)
}
}

Expand Down