Merge pull request #450 from kwvanderlinde/bugfix/fix-dev-build

Author: cwisniew

.github/workflows/verify-build.yml

@@ -33,13 +33,13 @@ jobs:
       with:
         java-version: ${{ matrix.java }}
     - name: Cache Gradle
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
           ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-v2-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-v4-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
-          ${{ runner.os }}-gradle-v2-
+          ${{ runner.os }}-gradle-v4-
     - name: Build with Gradle
       run: ./gradlew build

build.gradle.kts

@@ -75,7 +75,7 @@ spotless {
     java {
         licenseHeaderFile("${projectDir}/spotless.license.java")
         targetExclude("**/module-info.java")
-        //googleJavaFormat()
+        googleJavaFormat()
     }
 
     format("misc") {
@@ -96,6 +96,7 @@ repositories {
 dependencies {
     // Logging
     annotationProcessor(group = "org.apache.logging.log4j", name = "log4j-core", version = "2.19.0")
+    implementation(group = "org.apache.logging.log4j", name = "log4j-core", version = "2.19.0")
     implementation(group = "org.apache.logging.log4j", name = "log4j-api", version = "2.19.0")
     implementation(group = "org.apache.logging.log4j", name = "log4j-1.2-api", version = "2.19.0")
 

src/main/java/net/rptools/tokentool/AppConstants.java

@@ -71,13 +71,14 @@ public class AppConstants {
   public static final File CACHE_DIR = AppSetup.getAppHome("cache");
   public static final ExtensionFilter DEFAULT_EXTENSION_FILTER =
       new ExtensionFilter(DEFAULT_IMAGE_EXTENSION_DESCRIPTION, "*." + DEFAULT_IMAGE_EXTENSION);
-  public static final Set<ExtensionFilter> IMAGE_EXTENSION_FILTER = new HashSet<>(Arrays.asList(
-      new ExtensionFilter("WebP Image", "*.webp"),
-      new ExtensionFilter("PNG Image", "*.png"),
-      new ExtensionFilter("JPEG Image", "*.jpg"),
-      new ExtensionFilter("GIF Image", "*.gif"),
-      new ExtensionFilter("TIFF Image", "*.tif")
-  ));
+  public static final Set<ExtensionFilter> IMAGE_EXTENSION_FILTER =
+      new HashSet<>(
+          Arrays.asList(
+              new ExtensionFilter("WebP Image", "*.webp"),
+              new ExtensionFilter("PNG Image", "*.png"),
+              new ExtensionFilter("JPEG Image", "*.jpg"),
+              new ExtensionFilter("GIF Image", "*.gif"),
+              new ExtensionFilter("TIFF Image", "*.tif")));
 
   public static final double DEFAULT_PORTRAIT_TRANSPARENCY = 1;
   public static final double DEFAULT_PORTRAIT_BLUR = 0;

src/main/java/net/rptools/tokentool/AppSetup.java

@@ -135,14 +135,16 @@ public static int installNewOverlays(String currentVersion) throws IOException {
     int overlaysInstalled = 0;
 
     // Get list of overlays from src/main/resources
-    Set<String> moduleResourceSet = ModuleLayer.boot().configuration().modules()
-        .stream()
-        .map(ResolvedModule::reference)
-        .filter(it -> it.descriptor().name().equals("net.rptools.tokentool"))
-        .findFirst().get().open()
-        .list()
-        .filter(it -> it.startsWith(DEFAULT_OVERLAYS) && !it.endsWith("/"))
-        .collect(Collectors.toSet());
+    Set<String> moduleResourceSet =
+        ModuleLayer.boot().configuration().modules().stream()
+            .map(ResolvedModule::reference)
+            .filter(it -> it.descriptor().name().equals("net.rptools.tokentool"))
+            .findFirst()
+            .get()
+            .open()
+            .list()
+            .filter(it -> it.startsWith(DEFAULT_OVERLAYS) && !it.endsWith("/"))
+            .collect(Collectors.toSet());
 
     for (String resourcePath : moduleResourceSet) {
       String resourceName = resourcePath.substring(DEFAULT_OVERLAYS.length());
@@ -214,11 +216,11 @@ private static boolean isNewerVersion(String version, String installedVersion) {
       return false;
     }
 
-    String[] versions = version.indexOf(".") > 0 ? version.split("\\.") : new String[]{version};
+    String[] versions = version.indexOf(".") > 0 ? version.split("\\.") : new String[] {version};
     String[] installedVersions =
         installedVersion.indexOf(".") > 0
             ? installedVersion.split("\\.")
-            : new String[]{installedVersion};
+            : new String[] {installedVersion};
 
     int i = 0;
     try {

src/main/java/net/rptools/tokentool/controller/PdfViewer_Controller.java

@@ -359,7 +359,8 @@ public Void call() {
               extractAllImagesLabel.setVisible(true);
 
               for (int page = 0; page < pageCount; page++) {
-                pdfModel.extractAllImagesFromPage(selectedDirectory.getPath(), imageFormat, page, imageMinDimension);
+                pdfModel.extractAllImagesFromPage(
+                    selectedDirectory.getPath(), imageFormat, page, imageMinDimension);
                 updateProgress(page, pageCount);
                 updateMessage("Extracting page " + page + " of " + pageCount);
 

src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java

@@ -38,7 +38,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
-
 import javafx.animation.FadeTransition;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -197,7 +196,8 @@ protected boolean removeEldestEntry(Map.Entry<Path, TreeItem<Path>> eldest) {
   private NavigableSet<Integer> overlaySpinnerSteps =
       new TreeSet<>(
           Arrays.asList(
-              50, 64, 100, 128, 150, 200, 256, 300, 400, 500, 512, 600, 700, 750, 800, 900, 1000, 1024));
+              50, 64, 100, 128, 150, 200, 256, 300, 400, 500, 512, 600, 700, 750, 800, 900, 1000,
+              1024));
 
   private PdfViewer pdfViewer;
 
@@ -829,8 +829,7 @@ void compositeTokenPane_KeyPressed(KeyEvent key) {
           x++;
           y++;
         }
-        default -> {
-        }
+        default -> {}
       }
 
       getCurrentLayer().setTranslateX(x);
@@ -1251,13 +1250,14 @@ private void saveToken() {
     FileChooser fileChooser = new FileChooser();
     log.info("***** Saving Token as a {}", fileExtension);
 
-    File tokenFile = fileSaveUtil.getFileName(
-      false,
-      useFileNumberingCheckbox.isSelected(),
-      fileNameTextField.getText(),
-      getFileSaveFormatChoiceboxSelection(),
-      fileNameSuffixTextField,
-      true);
+    File tokenFile =
+        fileSaveUtil.getFileName(
+            false,
+            useFileNumberingCheckbox.isSelected(),
+            fileNameTextField.getText(),
+            getFileSaveFormatChoiceboxSelection(),
+            fileNameSuffixTextField,
+            true);
     fileChooser.setInitialFileName(tokenFile.getName());
     if (tokenFile.getParentFile() != null && tokenFile.getParentFile().isDirectory()) {
       fileChooser.setInitialDirectory(tokenFile.getParentFile());
@@ -1266,12 +1266,11 @@ private void saveToken() {
     fileChooser.getExtensionFilters().addAll(AppConstants.IMAGE_EXTENSION_FILTER);
     fileChooser.setTitle(I18N.getString("TokenTool.save.filechooser.title"));
 
-    fileChooser.setSelectedExtensionFilter(AppConstants.IMAGE_EXTENSION_FILTER
-        .stream()
-        .filter(it -> it.getExtensions().contains("*." + fileExtension))
-        .findFirst()
-        .orElse(AppConstants.DEFAULT_EXTENSION_FILTER)
-    );
+    fileChooser.setSelectedExtensionFilter(
+        AppConstants.IMAGE_EXTENSION_FILTER.stream()
+            .filter(it -> it.getExtensions().contains("*." + fileExtension))
+            .findFirst()
+            .orElse(AppConstants.DEFAULT_EXTENSION_FILTER));
 
     File tokenSaved = fileChooser.showSaveDialog(saveOptionsPane.getScene().getWindow());
 
@@ -1321,7 +1320,8 @@ private boolean writeTokenImage(File tokenFile, String extension) {
     } catch (IOException e) {
       log.error("Unable to write token to file: " + tokenFile.getAbsolutePath(), e);
     } catch (IndexOutOfBoundsException e) {
-      log.error("Image width/height out of bounds: " + getOverlayWidth() + " x " + getOverlayHeight(), e);
+      log.error(
+          "Image width/height out of bounds: " + getOverlayWidth() + " x " + getOverlayHeight(), e);
     }
 
     return false;

src/main/java/net/rptools/tokentool/util/ExtractImagesFromPDF.java

@@ -149,7 +149,8 @@ private void getImagesFromResources(PDResources resources, boolean extractOnly)
         if (!imageTracker.contains(xObject.getCOSObject())) {
           imageTracker.add(xObject.getCOSObject());
 
-          String name = pdfName + " - pg " + (currentPageNumber + 1) + " - img " + imageTracker.size();
+          String name =
+              pdfName + " - pg " + (currentPageNumber + 1) + " - img " + imageTracker.size();
 
           log.debug("Extracting image... " + name);
 

src/main/java/net/rptools/tokentool/util/FileSaveUtil.java

@@ -151,8 +151,13 @@ public File getTempFileName(String tempFileName, String imageExtension) {
     return new File(System.getProperty("java.io.tmpdir"), tempFileName);
   }
 
-  public File getFileName(boolean asToken, boolean useNumbering, String tempFileName, String imageExtension,
-      TextField fileNameSuffix, boolean advanceFileNameSuffix) {
+  public File getFileName(
+      boolean asToken,
+      boolean useNumbering,
+      String tempFileName,
+      String imageExtension,
+      TextField fileNameSuffix,
+      boolean advanceFileNameSuffix) {
 
     imageExtension = "." + imageExtension;