localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

Compare commits

base: localhorst:15cbbb1bac2d1c45a7a9d299dae5659a801632cb
Branches Tags
localhorst:master
localhorst:1.0.2
localhorst:1.0.1
localhorst:1.0.0
..
compare: localhorst:6b6ef67122068d183755a6559ae9df4c297c98b8
Branches Tags
localhorst:master
localhorst:1.0.2
localhorst:1.0.1
localhorst:1.0.0

No commits in common. "15cbbb1bac2d1c45a7a9d299dae5659a801632cb" and "6b6ef67122068d183755a6559ae9df4c297c98b8" have entirely different histories.
15cbbb1bac ... 6b6ef67122

3 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
View File

@ -252,12 +252,12 @@ class RootController : Controller() {
fun deleteTexture(data: Texture) { fun deleteTexture(data: Texture) {
val dialogDelete = JFXOkayCancelAlert( val dialogDelete = JFXOkayCancelAlert(
"Löschen", "Löschen",
"Textur ${data.name} wirklich löschen?", "Textur wirklich löschen?",
"-fx-button-type: RAISED; -fx-background-color: #2b7bbb; -fx-text-fill: #000000;" "-fx-button-type: RAISED; -fx-background-color: #2b7bbb; -fx-text-fill: #000000;"
) )
dialogDelete.okayAction = EventHandler { dialogDelete.okayAction = EventHandler {
con.deleteTexture(data)
mvc.removeTextureFromView(data) mvc.removeTextureFromView(data)
con.deleteTexture(data)
} }
dialogDelete.cancelAction = EventHandler { dialogDelete.cancelAction = EventHandler {
// Do nothing // Do nothing

2
client/src/main/kotlin/org/hso/texturesyncclient/controller/net/Connection.kt
View File

@ -329,4 +329,4 @@ class Connection(val address: InetAddress, val port: Int = 10796) : Closeable {
} }
} }
} }

4
client/src/main/kotlin/org/hso/texturesyncclient/controller/net/InternalJsonModel.kt
View File

@ -50,11 +50,11 @@ internal data class InternalTexture(
else -> throw ConnectionInvalidJsonException() else -> throw ConnectionInvalidJsonException()
}, },
resolution = Pair(resolution[0], resolution[1]), resolution = Pair(resolution[0], resolution[1]),
addedOn = GregorianCalendar(added_on[0], added_on[1], added_on[2]), addedOn = GregorianCalendar(added_on[0], added_on[1] - 1, added_on[2]),
textureHash = Sha256(texture_hash) textureHash = Sha256(texture_hash)
) )
} catch (e: Exception) { // i Know, but no time :[] } catch (e: Exception) { // i Know, but no time :[]
throw ConnectionInvalidJsonException() throw ConnectionInvalidJsonException()
} }
} }
} }