Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

essential-actions

Clone or download

[OBS] - [Mother] - Updated to work with new action api, Refactored, Clean up

Download Browse
+10 −9
Debayan Sutradhar (rnayabed) 2021-06-01 01:03
Debayan Sutradhar (rnayabed) 2021-06-01 01:03
f56ad7844cc563db2d109960f64cb0002901d930
7f2c66c30d5229b1f704fa1a737641140ad1b047
git #essential-actions/f56ad7844cc563db2d109960f64cb0002901d930

Modified Files

List
Side by side diff
M obssuite/mother/.gitignore
+1 −1
--- 'a/obssuite/mother/.gitignore'
+++ b/obssuite/mother/.gitignore
@@ -5,4 +5,4 @@ target/
.factorypath
.project
.settings/
-obssuite_motheraction.iml
\ No newline at end of file
+*.iml
\ No newline at end of file
M obssuite/mother/pom.xml
+6 −5
--- 'a/obssuite/mother/pom.xml'
+++ b/obssuite/mother/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.stream-pi</groupId>
<artifactId>obssuite_motheraction</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<build>
<plugins>
@@ -40,11 +40,12 @@
<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
<OBSWebsocketJavaVersion>1.2.0</OBSWebsocketJavaVersion>
-
+
+ <JettyWebsocketClientVersion>9.4.39.v20210325</JettyWebsocketClientVersion>
+ <GsonVersion>2.8.6</GsonVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
-
</properties>
<dependencies>
@@ -69,13 +70,13 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
- <version>9.4.39.v20210325</version>
+ <version>${JettyWebsocketClientVersion}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.6</version>
+ <version>${GsonVersion}</version>
</dependency>
</dependencies>
</project>
M obssuite/mother/src/main/java/mother/Mother.java
+2 −2
--- 'a/obssuite/mother/src/main/java/mother/Mother.java'
+++ b/obssuite/mother/src/main/java/mother/Mother.java
@@ -34,7 +34,7 @@ public class Mother extends NormalAction
private Button connectDisconnectButton;
@Override
- public void initProperties() throws Exception
+ public void initProperties() throws MinorException
{
Property urlProperty = new Property("url", Type.STRING);
urlProperty.setDisplayName("URL");
@@ -58,7 +58,7 @@ public class Mother extends NormalAction
}
@Override
- public void initAction() throws Exception
+ public void initAction() throws MinorException
{
MotherConnection.setPass(getPassword());
MotherConnection.setUrl(getURL());
M obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java
+1 −1
--- 'a/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java'
+++ b/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java
@@ -12,7 +12,7 @@ public class MotherConnection
{
private static OBSRemoteController obsRemoteController = null;
- public static final Version VERSION = new Version(2,0,0);
+ public static final Version VERSION = new Version(2,0,1);
private static String url = null;
private static String pass = null;