Merge remote-tracking branch 'origin/start-popup' into start-popup

Suwayomi · Jan 2, 2024 · d53f34c · d53f34c
2 parents 5266ed5 + aca2bc6
commit d53f34c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/data/settings/Settings.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/data/settings/Settings.java
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-
 import lombok.Getter;
 import lombok.Setter;
 import online.hatsunemiku.tachideskvaadinui.data.settings.reader.ReaderSettings;

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/services/LibUpdateService.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/services/LibUpdateService.java
@@ -6,10 +6,9 @@
 
 package online.hatsunemiku.tachideskvaadinui.services;
 
+import feign.RetryableException;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
-
-import feign.RetryableException;
 import lombok.extern.slf4j.Slf4j;
 import online.hatsunemiku.tachideskvaadinui.services.client.LibUpdateClient;
 import org.springframework.cache.annotation.CacheEvict;
@@ -37,7 +36,6 @@ public boolean fetchUpdate() {
 
     URI baseUrl = URI.create(settings.getUrl());
 
-
     ResponseEntity<Void> response;
     try {
       response = client.fetchUpdate(baseUrl);

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/startup/TrayHandler.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/startup/TrayHandler.java
@@ -18,6 +18,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
+import javax.swing.*;
 import lombok.extern.slf4j.Slf4j;
 import online.hatsunemiku.tachideskvaadinui.data.settings.Settings;
 import online.hatsunemiku.tachideskvaadinui.services.SettingsService;
@@ -27,8 +28,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 
-import javax.swing.*;
-
 @Service
 @Slf4j
 public class TrayHandler {
@@ -113,8 +112,8 @@ private PopupMenu createTrayMenu() {
   private void showPopup() {
     Settings settings = settingsService.getSettings();
 
-    if (!settings.isStartPopup()){
-        return;
+    if (!settings.isStartPopup()) {
+      return;
     }
 
     String title = "Tachidesk VaadinUI started";

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/utils/BrowserUtils.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/utils/BrowserUtils.java
@@ -6,12 +6,11 @@
 
 package online.hatsunemiku.tachideskvaadinui.utils;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.awt.*;
 import java.io.IOException;
 import java.net.URI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BrowserUtils {
 
@@ -40,7 +39,7 @@ public static void openBrowser(String url) throws IOException {
       } catch (IOException e) {
         log.error("Browser couldn't be opened", e);
       } catch (InterruptedException e) {
-          throw new RuntimeException(e);
+        throw new RuntimeException(e);
       }
     }
   }

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/view/ServerStartView.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/view/ServerStartView.java
@@ -18,7 +18,6 @@
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.progressbar.ProgressBar;
 import com.vaadin.flow.router.Route;
-import feign.FeignException;
 import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/src/main/java/online/hatsunemiku/tachideskvaadinui/view/SettingsView.java b/src/main/java/online/hatsunemiku/tachideskvaadinui/view/SettingsView.java
@@ -15,7 +15,6 @@
 import com.vaadin.flow.router.Route;
 import java.util.ArrayList;
 import java.util.List;
-
 import online.hatsunemiku.tachideskvaadinui.data.settings.Settings;
 import online.hatsunemiku.tachideskvaadinui.data.settings.event.SettingsEventPublisher;
 import online.hatsunemiku.tachideskvaadinui.data.tachidesk.Source;