From 8d06c9079b1da30b5c433ea1d22d28c34f3ba5ba Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Sun, 12 Feb 2023 16:48:49 +0000
Subject: [PATCH] main functions should still be static

---
 java/net/i2p/router/WinLauncher.java        | 29 +++++++++++----------
 java/net/i2p/router/WindowsServiceUtil.java |  9 ++++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java
index f968c34..2e2f246 100644
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -32,8 +32,9 @@ public class WinLauncher extends CopyConfigDir {
   WindowsUpdatePostProcessor wupp = null;
   private Router i2pRouter;
 
-  public void main(String[] args) {
-    setupLauncher();
+  public static void main(String[] args) {
+    var launcher = new WinLauncher();
+    launcher.setupLauncher();
     initLogger();
     int privateBrowsing = 0;
     boolean usabilityMode = false;
@@ -76,7 +77,7 @@ public class WinLauncher extends CopyConfigDir {
               proxyTimeoutTime = 0;
             } else if (proxyTimeoutTime > 0) {
               newArgsList.add(arg);
-            } else if (!isAvailable(4444)) {
+            } else if (!launcher.isAvailable(4444)) {
               newArgsList.add(arg);
             }
           }
@@ -84,8 +85,8 @@ public class WinLauncher extends CopyConfigDir {
       }
     }
 
-    File programs = programFile();
-    File home = homeDir();
+    File programs = launcher.programFile();
+    File home = launcher.homeDir();
 
     System.setProperty(
         "i2p.dir.base",
@@ -123,30 +124,30 @@ public class WinLauncher extends CopyConfigDir {
       System.exit(1);
     }
 
-    if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
-                      proxyTimeoutTime, newArgsList)) {
+    if (launcher.launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
+                               proxyTimeoutTime, newArgsList)) {
       System.exit(0);
     }
-    i2pRouter = new Router(routerConfig(), System.getProperties());
+    launcher.i2pRouter = new Router(routerConfig(), System.getProperties());
     if (!isInstalled("i2p")) {
-      if (i2pRouter.saveConfig("routerconsole.browser", null)) {
+      if (launcher.i2pRouter.saveConfig("routerconsole.browser", null)) {
         logger.info("removed routerconsole.browser config");
       }
-      if (i2pRouter.saveConfig("routerconsole.browser",
-                               appImageExe() + " -noproxycheck")) {
+      if (launcher.i2pRouter.saveConfig("routerconsole.browser",
+                                        appImageExe() + " -noproxycheck")) {
         logger.info("updated routerconsole.browser config " + appImageExe());
       }
     }
     logger.info("Router is configured");
 
-    Thread registrationThread = new Thread(REGISTER_UPP);
+    Thread registrationThread = new Thread(launcher.REGISTER_UPP);
     registrationThread.setName("UPP Registration");
     registrationThread.setDaemon(true);
     registrationThread.start();
 
-    setNotStarting();
+    launcher.setNotStarting();
 
-    i2pRouter.runRouter();
+    launcher.i2pRouter.runRouter();
   }
 
   private void setupLauncher() {
diff --git a/java/net/i2p/router/WindowsServiceUtil.java b/java/net/i2p/router/WindowsServiceUtil.java
index b62e36a..6e301ea 100644
--- a/java/net/i2p/router/WindowsServiceUtil.java
+++ b/java/net/i2p/router/WindowsServiceUtil.java
@@ -268,12 +268,13 @@ public class WindowsServiceUtil {
       return "mac";
     return "linux";
   }
-  public void main(String args[]) {
+  public static void main(String args[]) {
+    WindowsServiceUtil wsu = new WindowsServiceUtil();
     // when querying the I2P router service installed by the IzPack installer
     // this is the correct call.
-    String state = getServiceState("i2p");
-    int stateInt = getServiceStateInt("i2p");
+    String state = wsu.getServiceState("i2p");
+    int stateInt = wsu.getServiceStateInt("i2p");
     System.out.println("i2p state: " + state + " code: " + stateInt);
-    promptServiceStartIfAvailable("i2p");
+    wsu.promptServiceStartIfAvailable("i2p");
   }
 }