Skip to content
Snippets Groups Projects
Commit 6b05fe79 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Fixed Design Listeners; Removed Design Remove Listener

parent 4f095ede
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ import com.google.gson.{JsonObject, JsonParser}
import com.j256.ormlite.dao.Dao
import de.tobias.playpad.server.account
import de.tobias.playpad.server.account.Account
import de.tobias.playpad.server.server.project.sync.listener.design.{DesignAddListener, DesignRemoveListener, DesignUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.design.{DesignAddListener, DesignUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.pad.{PadAddListener, PadClearListener, PadRemoveListener, PadUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.page.{PageAddListener, PageRemoveListener, PageUpdateListener}
import de.tobias.playpad.server.server.project.sync.listener.path.{PathAddListener, PathRemoveListener, PathUpdateListener}
......@@ -45,8 +45,7 @@ import scala.collection.{Map, mutable}
"path-rm" -> new PathRemoveListener(),
"design-add" -> new DesignAddListener(),
"design-update" -> new DesignUpdateListener(),
"design-rm" -> new DesignRemoveListener()
"design-update" -> new DesignUpdateListener()
)
@OnWebSocketConnect def onConnect(serverSession: Session): Unit = {
......
......@@ -17,7 +17,7 @@ class DesignAddListener extends Listener {
val designId = UUID.fromString(json.get("id").getAsString)
val padId = UUID.fromString(json.get("pad").getAsString)
val backgroundColor = json.get("background_color").getAsString
val playColor = json.get("play_color").getAsInt
val playColor = json.get("play_color").getAsString
SqlHelper.insertOrUpdate(connection, SqlDef.DESIGN, designId, SqlDef.DESIGN_PAD_REF, padId)
SqlHelper.insertOrUpdate(connection, SqlDef.DESIGN, designId, SqlDef.DESIGN_BACKGROUND_COLOR, backgroundColor)
......
package de.tobias.playpad.server.server.project.sync.listener.design
import java.sql.Connection
import java.util.UUID
import com.google.gson.JsonObject
import de.tobias.playpad.server.account.Session
import de.tobias.playpad.server.project.utils.SqlDef
import de.tobias.playpad.server.server.SqlHelper
import de.tobias.playpad.server.server.project.sync.listener.Listener
/**
* Created by tobias on 19.02.17.
*/
class DesignRemoveListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
SqlHelper.delete(connection, SqlDef.DESIGN, designId)
}
}
......@@ -15,7 +15,7 @@ import de.tobias.playpad.server.server.project.sync.listener.Listener
class DesignUpdateListener extends Listener {
override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
val designId = UUID.fromString(json.get("id").getAsString)
val padId = UUID.fromString(json.get("project").getAsString)
val padId = UUID.fromString(json.get("pad").getAsString)
val field = json.get("field").getAsString
SqlHelper.insertOrUpdate(connection, DESIGN, designId, DESIGN_PAD_REF, padId)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment