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.

server

Clone or download

work

Download Browse
+7 −19
Debayan Sutradhar (rnayabed) 2021-02-15 12:39
Debayan Sutradhar (rnayabed) 2021-02-15 12:39
02e1c0979c7f0b1541f062a746a2fbcf0c906f74
cc356f309430ed3f1e70d77bd6402e9d09077ad6
git #server/02e1c0979c7f0b1541f062a746a2fbcf0c906f74

Modified Files

List
Side by side diff
M pom.xml
+2 −8
--- 'a/pom.xml'
+++ b/pom.xml
@@ -84,17 +84,11 @@
<version>${ThemeAPIVersion}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20201115</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.11</version>
- </dependency>
+ </dependency-->
</dependencies>
M src/main/java/com/stream_pi/server/connection/ClientConnection.java
+2 −3
--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -24,7 +24,6 @@ import com.stream_pi.util.platform.Platf
import com.stream_pi.util.platform.ReleaseStatus;
import com.stream_pi.util.version.Version;
import javafx.concurrent.Task;
-import org.apache.commons.lang3.ArrayUtils;
import java.io.*;
import java.lang.reflect.Array;
@@ -120,7 +119,7 @@ public class ClientConnection extends Th
Message message = new Message("action_icon");
message.setStringArrValue(profileID, actionID);
- message.setByteArrValue(ArrayUtils.toObject(icon));
+ message.setByteArrValue(icon);
sendMessage(message);
}
@@ -274,7 +273,7 @@ public class ClientConnection extends Th
String profileID = s[0];
String actionID = s[1];
- getClient().getProfileByID(profileID).getActionByID(actionID).setIcon(ArrayUtils.toPrimitive(message.getByteArrValue()));
+ getClient().getProfileByID(profileID).getActionByID(actionID).setIcon(message.getByteArrValue());
}
public void initAfterConnectionQuerySend() throws SevereException
M src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java
+3 −4
--- 'a/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java
@@ -24,7 +24,6 @@ import javafx.scene.control.ScrollPane;
import javafx.scene.control.TextField;
import javafx.scene.layout.*;
import javafx.stage.DirectoryChooser;
-import org.json.JSONObject;
import org.kordamp.ikonli.javafx.FontIcon;
import java.awt.SystemTray;
@@ -395,7 +394,8 @@ public class GeneralSettings extends VBo
{
@Override
protected Void call() throws Exception {
- try
+
+ /*try
{
Platform.runLater(()->checkForUpdatesButton.setDisable(true));
@@ -403,7 +403,6 @@ public class GeneralSettings extends VBo
String jsonRaw = readUrl("https://stream-pi.com/API/get_latest.php?TYPE=SERVER");
System.out.println(jsonRaw);
-
JSONObject jsonObject = new JSONObject(jsonRaw);
String latestVersionRaw = jsonObject.getString("Version");
@@ -447,7 +446,7 @@ public class GeneralSettings extends VBo
finally
{
Platform.runLater(()->checkForUpdatesButton.setDisable(false));
- }
+ }*/
return null;
}
}).start();;
M src/main/java/module-info.java
+0 −4
--- 'a/src/main/java/module-info.java'
+++ b/src/main/java/module-info.java
@@ -8,8 +8,6 @@ module com.stream_pi.server {
requires org.kordamp.ikonli.javafx;
- requires org.apache.commons.lang3;
-
requires java.xml;
requires javafx.base;
@@ -21,7 +19,5 @@ module com.stream_pi.server {
requires java.sql;
- requires org.json;
-
exports com.stream_pi.server;
}
\ No newline at end of file