From e3c228e890cdf74a7dda44a6ac2e5e11359a34cb Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Fri, 24 Mar 2017 19:16:40 +0100
Subject: [PATCH] Changed the media path to filename
---
PlayWallServer.iml | 3 ++-
.../tobias/playpad/server/project/Path.scala | 2 +-
.../project/loader/json/PathLoader.scala | 2 +-
.../project/loader/sql/PathLoader.scala | 2 +-
.../server/project/saver/json/PathSaver.scala | 2 +-
.../server/project/saver/sql/PathSaver.scala | 2 +-
.../server/project/utils/JsonDef.scala | 2 +-
.../playpad/server/project/utils/SqlDef.scala | 2 +-
.../project/sync/ProjectSyncHandler.scala | 3 +--
.../sync/listener/path/PathAddListener.scala | 4 +--
.../listener/path/PathUpdateListener.scala | 27 -------------------
11 files changed, 12 insertions(+), 39 deletions(-)
delete mode 100644 src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathUpdateListener.scala
diff --git a/PlayWallServer.iml b/PlayWallServer.iml
index 1481fba..f73ccc0 100644
--- a/PlayWallServer.iml
+++ b/PlayWallServer.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@@ -35,5 +35,6 @@
<orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+ <orderEntry type="library" name="scala-sdk-2.12.1" level="application" />
</component>
</module>
\ No newline at end of file
diff --git a/src/main/scala/de/tobias/playpad/server/project/Path.scala b/src/main/scala/de/tobias/playpad/server/project/Path.scala
index 6d921fa..1e8c2b0 100644
--- a/src/main/scala/de/tobias/playpad/server/project/Path.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/Path.scala
@@ -8,7 +8,7 @@ import java.util.UUID
class Path {
var id: UUID = UUID.randomUUID()
- var path: String = _
+ var filename: String = _
var pad: Pad = _
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/json/PathLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/json/PathLoader.scala
index 520f8e0..cb1a6c0 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/json/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/json/PathLoader.scala
@@ -19,7 +19,7 @@ class PathLoader {
val path = new Path()
path.id = UUID.fromString(json.get(PATH_ID).getAsString)
- path.path = json.get(PATH_PATH).getAsString
+ path.filename = json.get(PATH_PATH).getAsString
path.pad = pad
path
diff --git a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
index b4da8fc..cfc1625 100644
--- a/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/loader/sql/PathLoader.scala
@@ -21,7 +21,7 @@ class PathLoader(val connection: Connection) {
while (result.next()) {
val path = new Path()
path.id = UUID.fromString(result.getString(PATH_ID))
- path.path = result.getString(PATH_NAME)
+ path.filename = result.getString(PATH_NAME)
path.pad = pad
paths = path :: paths
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/json/PathSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/json/PathSaver.scala
index 52b9b1c..7063c25 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/json/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/json/PathSaver.scala
@@ -12,7 +12,7 @@ class PathSaver {
val jsonObject = new JsonObject()
jsonObject.addProperty(PATH_ID, path.id.toString)
- jsonObject.addProperty(PATH_PATH, path.path)
+ jsonObject.addProperty(PATH_PATH, path.filename)
jsonObject
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
index 1d695ee..ed0e374 100644
--- a/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/saver/sql/PathSaver.scala
@@ -12,7 +12,7 @@ import de.tobias.playpad.server.server.SqlHelper
class PathSaver(val connection: Connection) {
def save(path: Path): Unit = {
SqlHelper.insertOrUpdate(connection, PATH, path.id, PATH_PAD_REF, path.pad.id)
- SqlHelper.insertOrUpdate(connection, PATH, path.id, PATH_NAME, path.path)
+ SqlHelper.insertOrUpdate(connection, PATH, path.id, PATH_NAME, path.filename)
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala b/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
index c0c5ef9..dfae494 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/utils/JsonDef.scala
@@ -22,7 +22,7 @@ object JsonDef {
val PAD_DESIGN = "design"
val PATH_ID = "id"
- val PATH_PATH = "path"
+ val PATH_PATH = "filename"
val DESIGN_ID = "id"
val DESIGN_BACKGROUND_COLOR = "background_color"
diff --git a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala b/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
index 6db997c..38cf38a 100644
--- a/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
+++ b/src/main/scala/de/tobias/playpad/server/project/utils/SqlDef.scala
@@ -25,7 +25,7 @@ object SqlDef {
val PATH = "Path"
val PATH_ID = "id"
- val PATH_NAME = "path"
+ val PATH_NAME = "filename"
val PATH_PAD_REF = "pad_id"
val DESIGN = "Design"
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 bb8e873..a23c7c2 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
@@ -9,7 +9,7 @@ import de.tobias.playpad.server.account.Account
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}
+import de.tobias.playpad.server.server.project.sync.listener.path.{PathAddListener, PathRemoveListener}
import de.tobias.playpad.server.server.project.sync.listener.project.{ProjectAddListener, ProjectRemoveListener, ProjectUpdateListener}
import org.eclipse.jetty.websocket.api.Session
import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocketConnect, OnWebSocketMessage, WebSocket}
@@ -41,7 +41,6 @@ import scala.collection.{Map, mutable}
"pad-clear" -> new PadClearListener(),
"path-add" -> new PathAddListener(),
- "path-update" -> new PathUpdateListener(),
"path-rm" -> new PathRemoveListener(),
"design-add" -> new DesignAddListener(),
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
index 497e925..f86ad03 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathAddListener.scala
@@ -19,8 +19,8 @@ class PathAddListener extends Listener {
SqlHelper.insertOrUpdate(connection, SqlDef.PATH, pathId, SqlDef.PATH_PAD_REF, padId)
- if (json.get("path") != null) {
- val path = json.get("path").getAsString
+ if (json.get("filename") != null) {
+ val path = json.get("filename").getAsString
SqlHelper.insertOrUpdate(connection, SqlDef.PATH, pathId, SqlDef.PATH_NAME, path)
}
}
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathUpdateListener.scala
deleted file mode 100644
index 59be933..0000000
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/path/PathUpdateListener.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.tobias.playpad.server.server.project.sync.listener.path
-
-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 PathUpdateListener extends Listener {
- override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
- val pathId = UUID.fromString(json.get("id").getAsString)
- val padId = UUID.fromString(json.get("pad").getAsString)
- val field = json.get("field").getAsString
-
- SqlHelper.insertOrUpdate(connection, SqlDef.PATH, pathId, SqlDef.PATH_PAD_REF, padId)
-
- field match {
- case "path" => SqlHelper.insertOrUpdate(connection, SqlDef.PATH, pathId, SqlDef.PATH_NAME, json.get("value").getAsString)
- }
- }
-}
--
GitLab