diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala index 1c0609b2b37c199caff2ae9507b5649cf1e0935d..bb8e87378d4f8caf7829449641a55476d8224e79 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala @@ -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 = { diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala index 4cc85f943100cc56b0b7630c19ddd4d955494e03..825e9d00a24c0a8da4dc535ec877c70e7f26a4ac 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignAddListener.scala @@ -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) diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignRemoveListener.scala deleted file mode 100644 index e8c2c5bc7ad4aeba22f9fcecdc9419f87fc56723..0000000000000000000000000000000000000000 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignRemoveListener.scala +++ /dev/null @@ -1,21 +0,0 @@ -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) - } -} diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala index 5bf7452a326c4f02f7b185a31f5c610545673fa4..f856bc9de5c9688f05553dc9e5fa1ab4e4c8f4da 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignUpdateListener.scala @@ -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)