From 6b05fe79c166bac71d9bd47154f2855d4742bbbb Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 24 Feb 2017 14:36:11 +0100
Subject: [PATCH] Fixed Design Listeners; Removed Design Remove Listener
---
.../project/sync/ProjectSyncHandler.scala | 5 ++---
.../listener/design/DesignAddListener.scala | 2 +-
.../design/DesignRemoveListener.scala | 21 -------------------
.../design/DesignUpdateListener.scala | 2 +-
4 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 src/main/scala/de/tobias/playpad/server/server/project/sync/listener/design/DesignRemoveListener.scala
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 1c0609b..bb8e873 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 4cc85f9..825e9d0 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 e8c2c5b..0000000
--- 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 5bf7452..f856bc9 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)
--
GitLab