From bab5bab6038a70f11c18641af1faedcc673c2811 Mon Sep 17 00:00:00 2001 From: Pjiesco Date: Mon, 6 Sep 2021 10:25:31 +0200 Subject: [PATCH 1/4] fix: rename CurrentSceneChangedEvent >> CurrentProgramSceneChangedEvent --- .../io/obswebsocket/community/client/message/event/Event.java | 4 ++-- ...ChangedEvent.java => CurrentProgramSceneChangedEvent.java} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename client/src/main/java/io/obswebsocket/community/client/message/event/scenes/{CurrentSceneChangedEvent.java => CurrentProgramSceneChangedEvent.java} (67%) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java index 0fb4e679..a7110b9f 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java @@ -37,7 +37,7 @@ import io.obswebsocket.community.client.message.event.sceneitems.SceneItemLockStateChangedEvent; import io.obswebsocket.community.client.message.event.sceneitems.SceneItemRemovedEvent; import io.obswebsocket.community.client.message.event.scenes.CurrentPreviewSceneChangedEvent; -import io.obswebsocket.community.client.message.event.scenes.CurrentSceneChangedEvent; +import io.obswebsocket.community.client.message.event.scenes.CurrentProgramSceneChangedEvent; import io.obswebsocket.community.client.message.event.scenes.SceneCreatedEvent; import io.obswebsocket.community.client.message.event.scenes.SceneListChangedEvent; import io.obswebsocket.community.client.message.event.scenes.SceneNameChangedEvent; @@ -85,7 +85,7 @@ public enum Type { SceneCreated(SceneCreatedEvent.class), SceneRemoved(SceneRemovedEvent.class), SceneNameChanged(SceneNameChangedEvent.class), - CurrentSceneChanged(CurrentSceneChangedEvent.class), + CurrentSceneChanged(CurrentProgramSceneChangedEvent.class), CurrentPreviewSceneChanged(CurrentPreviewSceneChangedEvent.class), SceneListChanged(SceneListChangedEvent.class), diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentSceneChangedEvent.java b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java similarity index 67% rename from client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentSceneChangedEvent.java rename to client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java index caf47009..a93cab52 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentSceneChangedEvent.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java @@ -5,11 +5,11 @@ @Getter @ToString(callSuper = true) -public class CurrentSceneChangedEvent extends SceneEvent { +public class CurrentProgramSceneChangedEvent extends SceneEvent { private Data eventData; - protected CurrentSceneChangedEvent() { + protected CurrentProgramSceneChangedEvent() { super(Type.CurrentSceneChanged, Category.Scenes); } } From 8700e3df72e9ae2ac46c66f395ca3dd96d3b5c50 Mon Sep 17 00:00:00 2001 From: Pjiesco Date: Mon, 6 Sep 2021 10:26:13 +0200 Subject: [PATCH 2/4] core: reformat code --- .../client/message/event/scenes/SceneCreatedEvent.java | 2 ++ .../client/message/event/scenes/SceneRemovedEvent.java | 1 + 2 files changed, 3 insertions(+) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneCreatedEvent.java b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneCreatedEvent.java index f79a7a31..6e977b2a 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneCreatedEvent.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneCreatedEvent.java @@ -6,6 +6,7 @@ @Getter @ToString(callSuper = true) public class SceneCreatedEvent extends SceneEvent { + private Data eventData; protected SceneCreatedEvent() { @@ -15,6 +16,7 @@ protected SceneCreatedEvent() { @Getter @ToString(callSuper = true) public static class Data extends SceneEvent.Data { + private Boolean isGroup; } } diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneRemovedEvent.java b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneRemovedEvent.java index d22260cb..b7a5cfad 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneRemovedEvent.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/SceneRemovedEvent.java @@ -16,6 +16,7 @@ protected SceneRemovedEvent() { @Getter @ToString(callSuper = true) public static class Data extends SceneEvent.Data { + private Boolean isGroup; } } From 08f9da683cd8fdeda15a83d81906dbf406ca6a6a Mon Sep 17 00:00:00 2001 From: Pjiesco Date: Tue, 7 Sep 2021 17:11:48 +0200 Subject: [PATCH 3/4] fix: type --- .../io/obswebsocket/community/client/message/event/Event.java | 2 +- .../message/event/scenes/CurrentProgramSceneChangedEvent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java index a7110b9f..ca705263 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java @@ -85,7 +85,7 @@ public enum Type { SceneCreated(SceneCreatedEvent.class), SceneRemoved(SceneRemovedEvent.class), SceneNameChanged(SceneNameChangedEvent.class), - CurrentSceneChanged(CurrentProgramSceneChangedEvent.class), + CurrentProgramSceneChangedEvent(CurrentProgramSceneChangedEvent.class), CurrentPreviewSceneChanged(CurrentPreviewSceneChangedEvent.class), SceneListChanged(SceneListChangedEvent.class), diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java index a93cab52..f5d3f655 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java @@ -10,6 +10,6 @@ public class CurrentProgramSceneChangedEvent extends SceneEvent { private Data eventData; protected CurrentProgramSceneChangedEvent() { - super(Type.CurrentSceneChanged, Category.Scenes); + super(Type.CurrentProgramSceneChangedEvent, Category.Scenes); } } From 1714bc2339deb7081103875fd7ce157d91ee1daf Mon Sep 17 00:00:00 2001 From: Christophe Carvalho Vilas-Boas Date: Wed, 8 Sep 2021 12:51:22 +0200 Subject: [PATCH 4/4] fix: Enum name --- .../io/obswebsocket/community/client/message/event/Event.java | 2 +- .../message/event/scenes/CurrentProgramSceneChangedEvent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java index ca705263..b812a1c7 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/Event.java @@ -85,7 +85,7 @@ public enum Type { SceneCreated(SceneCreatedEvent.class), SceneRemoved(SceneRemovedEvent.class), SceneNameChanged(SceneNameChangedEvent.class), - CurrentProgramSceneChangedEvent(CurrentProgramSceneChangedEvent.class), + CurrentProgramSceneChanged(CurrentProgramSceneChangedEvent.class), CurrentPreviewSceneChanged(CurrentPreviewSceneChangedEvent.class), SceneListChanged(SceneListChangedEvent.class), diff --git a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java index f5d3f655..be46ca0d 100644 --- a/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java +++ b/client/src/main/java/io/obswebsocket/community/client/message/event/scenes/CurrentProgramSceneChangedEvent.java @@ -10,6 +10,6 @@ public class CurrentProgramSceneChangedEvent extends SceneEvent { private Data eventData; protected CurrentProgramSceneChangedEvent() { - super(Type.CurrentProgramSceneChangedEvent, Category.Scenes); + super(Type.CurrentProgramSceneChanged, Category.Scenes); } }