style: rewrite CheckStyle exceptions

Signed-off-by: manticore-projects <andreas@manticore-projects.com>

Author: manticore-projects

build.gradle

@@ -122,14 +122,15 @@ dependencies {
 rewrite {
     configFile = file('config/rewrite/rewrite.yml')
     activeRecipe(
-            "org.openrewrite.java.migrate.UpgradeToJava17",
+//            "org.openrewrite.java.migrate.UpgradeToJava17",
             "org.openrewrite.staticanalysis.NeedBraces",
             "org.openrewrite.staticanalysis.UnnecessaryParentheses",
             "org.openrewrite.staticanalysis.MultipleVariableDeclarations",
             "org.openrewrite.java.format.Spaces",
             'org.openrewrite.staticanalysis.CodeCleanup',
             'org.openrewrite.java.NoStaticImport',
-            'org.openrewrite.java.OrderImports'
+            'org.openrewrite.java.OrderImports',
+            'org.openrewrite.java.RemoveUnusedImports',
     )
 
     // Generated by Protobuf
@@ -138,7 +139,8 @@ rewrite {
             "**/*ProtoIn.java",
             "**/*ProtoOut.java",
             "**/Jwt.java",
-            "**/proto/Directdraw.java"
+            "**/proto/Directdraw.java",
+            '**/org.webswing.audio/*.java'
     )
 }
 

buildSrc/src/main/groovy/webswing.node-conventions.gradle

@@ -16,19 +16,19 @@ node {
 
 def isDev = project.hasProperty('dev')
 
-tasks.register('npmInstallTask', com.github.gradle.node.npm.task.NpmTask) {
+tasks.register('npmInstallTask', NpmTask) {
     args = ['install']
     enabled = !isDev
 }
 
-tasks.register('npmAuditFix', com.github.gradle.node.npm.task.NpmTask) {
+tasks.register('npmAuditFix', NpmTask) {
     dependsOn 'npmInstallTask'
     args = ['audit', 'fix']
     enabled = !isDev
     ignoreExitValue = true     // npm audit fix returns non-zero when it cannot fix everything
 }
 
-tasks.register('npmBuild', com.github.gradle.node.npm.task.NpmTask) {
+tasks.register('npmBuild', NpmTask) {
     dependsOn 'npmAuditFix'
     args = ['run', 'build']
     enabled = !isDev
@@ -37,4 +37,4 @@ tasks.register('npmBuild', com.github.gradle.node.npm.task.NpmTask) {
 // Clean webpack's target/ output alongside Gradle's build/
 clean {
     delete 'target'
-}
+}

buildSrc/src/main/groovy/webswing.protobuf-conventions.gradle

@@ -11,12 +11,15 @@
 def protocClassifier = {
     def os = System.getProperty('os.name').toLowerCase()
     def arch = System.getProperty('os.arch')
-    if (os.contains('linux'))
+    if (os.contains('linux')) {
         return arch.contains('aarch64') ? 'linux-aarch_64' : 'linux-x86_64'
-    if (os.contains('mac') || os.contains('darwin'))
+    }
+    if (os.contains('mac') || os.contains('darwin')) {
         return arch.contains('aarch64') ? 'osx-aarch_64' : 'osx-x86_64'
-    if (os.contains('windows'))
+    }
+    if (os.contains('windows')) {
         return 'windows-x86_64'
+    }
     throw new GradleException("Unsupported OS: ${os} / ${arch}")
 }()
 

webswing-api/src/main/java/org/webswing/toolkit/api/WebswingApi.java

@@ -1,11 +1,5 @@
 package org.webswing.toolkit.api;
 
-import java.awt.Container;
-import java.awt.Window;
-
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-
 import org.webswing.toolkit.api.action.WebActionListener;
 import org.webswing.toolkit.api.action.WebWindow;
 import org.webswing.toolkit.api.clipboard.BrowserTransferable;
@@ -18,6 +12,11 @@
 import org.webswing.toolkit.api.url.WebswingUrlState;
 import org.webswing.toolkit.api.url.WebswingUrlStateChangeListener;
 
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import java.awt.Container;
+import java.awt.Window;
+
 /**
  * Webswing API used by Swing application for easy integration.
  */

webswing-api/src/main/java/org/webswing/toolkit/api/WebswingUtil.java

@@ -28,4 +28,6 @@ public static WebswingApi getWebswingApi() {
     }
   }
 
+  private WebswingUtil() {}
+
 }

webswing-api/src/main/java/org/webswing/toolkit/api/clipboard/WebswingClipboardData.java

@@ -40,4 +40,3 @@ public void setFiles(List<String> files) {
     this.files = files;
   }
 }
-

webswing-api/src/main/java/org/webswing/toolkit/api/component/HtmlPanel.java

@@ -1,11 +1,10 @@
 package org.webswing.toolkit.api.component;
 
-import javax.swing.JPanel;
-
 import org.webswing.toolkit.api.action.WebWindow;
+import org.webswing.toolkit.api.action.WebWindowActionListener;
 
+import javax.swing.JPanel;
 import java.io.Serial;
-import org.webswing.toolkit.api.action.WebWindowActionListener;
 
 public abstract class HtmlPanel extends JPanel implements WebWindow {
 

webswing-api/src/main/java/org/webswing/toolkit/api/file/WebswingFileChooserUtil.java

@@ -33,4 +33,6 @@ public static void resetPermissions(JFileChooser chooser) {
     setUploadAllowed(chooser, null);
     setDeleteAllowed(chooser, null);
   }
+
+  private WebswingFileChooserUtil() {}
 }

webswing-api/src/main/java/org/webswing/toolkit/api/url/WebswingUrlState.java

@@ -1,6 +1,5 @@
 package org.webswing.toolkit.api.url;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -55,15 +54,18 @@ public boolean isEmpty() {
 
   @Override
   public boolean equals(Object o) {
-    if (this == o)
+    if (this == o) {
       return true;
-    if (o == null || getClass() != o.getClass())
+    }
+    if (o == null || getClass() != o.getClass()) {
       return false;
+    }
 
     WebswingUrlState that = (WebswingUrlState) o;
 
-    if (path != null ? !path.equals(that.path) : that.path != null)
+    if (path != null ? !path.equals(that.path) : that.path != null) {
       return false;
+    }
     return parameters != null ? parameters.equals(that.parameters) : that.parameters == null;
   }
 

webswing-app-launcher/src/main/java/org/webswing/SwingMain.java

@@ -1,5 +1,12 @@
 package org.webswing;
 
+import org.webswing.ext.services.ToolkitFXService;
+import org.webswing.toolkit.util.Services;
+import org.webswing.toolkit.util.Util;
+import org.webswing.util.AppLogger;
+import org.webswing.util.ClasspathUtil;
+
+import javax.swing.SwingUtilities;
 import java.awt.EventQueue;
 import java.awt.Toolkit;
 import java.io.File;
@@ -11,14 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.swing.SwingUtilities;
-
-import org.webswing.ext.services.ToolkitFXService;
-import org.webswing.toolkit.util.Services;
-import org.webswing.toolkit.util.Util;
-import org.webswing.util.AppLogger;
-import org.webswing.util.ClasspathUtil;
-
 public class SwingMain {
 
   public static ClassLoader swingLibClassLoader;
@@ -166,7 +165,7 @@ private static void startSwingApp(String[] args) throws Exception {
     Class<?> clazz = swingLibClassLoader
         .loadClass(System.getProperty(Constants.SWING_START_SYS_PROP_MAIN_CLASS));
     Class<?>[] mainArgType = {String[].class};
-    java.lang.reflect.Method main = clazz.getMethod("main", mainArgType);
+    Method main = clazz.getMethod("main", mainArgType);
     Util.getWebToolkit().startDispatchers();
     initializeJavaFX();
     Object[] argsArray = {args};
@@ -198,7 +197,7 @@ public void run() {
       try {
         Class<?> clazz = swingLibClassLoader.loadClass("com.sun.javafx.application.PlatformImpl");
         Class<?> startupAttrType[] = {Runnable.class};
-        java.lang.reflect.Method startup = clazz.getMethod("startup", startupAttrType);
+        Method startup = clazz.getMethod("startup", startupAttrType);
         startup.invoke(null, new Runnable() {
           @Override
           public void run() {