Merge branch 'master' into 11

Dansoftowner · Feb 16, 2021 · 244c68b · 244c68b
2 parents ef00bfc + 79b95a1
commit 244c68b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/main/java/com/nativejavafx/taskbar/TaskbarProgressbarImpl.java b/src/main/java/com/nativejavafx/taskbar/TaskbarProgressbarImpl.java
@@ -14,6 +14,8 @@
 
 package com.nativejavafx.taskbar;
 
+import com.nativejavafx.taskbar.exception.StageNotShownException;
+import com.nativejavafx.taskbar.exception.UnsupportedSystemException;
 import com.nativejavafx.taskbar.strategy.HWNDStrategy;
 import javafx.stage.Stage;
 import org.bridj.Pointer;
@@ -83,20 +85,23 @@ private void setProgressState(Stage stage, Type type) {
 
     @Override
     public void stopProgress() {
+        validate(stage.get());
         if (this.stage.get() != null) {
             setProgressState(stage.get(), Type.NO_PROGRESS);
         }
     }
 
     @Override
     public void showIndeterminateProgress() {
+        validate(stage.get());
         if (this.stage.get() != null) {
             setProgressState(stage.get(), Type.INDETERMINATE);
         }
     }
 
     @Override
     public void showCustomProgress(long startValue, long endValue, @NotNull Type type) {
+        validate(stage.get());
         if (this.stage.get() != null) {
             final Pointer<Integer> pointer = getPointer(stage.get());
             executor.execute(() -> {
@@ -108,6 +113,7 @@ public void showCustomProgress(long startValue, long endValue, @NotNull Type typ
 
     @Override
     public void setProgressType(@NotNull Type type) {
+        validate(stage.get());
         setProgressState(stage.get(), type);
     }
 
@@ -116,6 +122,28 @@ public void closeOperations() {
         executor.submit(() -> iTaskbarList3.get().Release());
     }
 
+    private void validate(Stage stage) {
+        checkSystemSupported();
+        checkStageShown(stage);
+    }
+
+    private void checkStageShown(Stage stage) {
+        if (!stage.isShowing()) throw new StageNotShownException(
+                "The given Stage is not showing and therefore taskbar-progressbar can't be created"
+        );
+    }
+
+    private void checkSystemSupported() {
+        if (isNotSupported()) throw new UnsupportedSystemException(
+                String.format(
+                        "%s (system: %s, version: %s)",
+                        "Your system does not support taskbar-progressbar!",
+                        System.getProperty("os.name"),
+                        System.getProperty("os.version")
+                )
+        );
+    }
+
     private static final class DaemonThread extends Thread {
         DaemonThread(Runnable runnable) {
             super(runnable);

diff --git a/src/main/java/com/nativejavafx/taskbar/exception/StageNotShownException.java b/src/main/java/com/nativejavafx/taskbar/exception/StageNotShownException.java
@@ -0,0 +1,7 @@
+package com.nativejavafx.taskbar.exception;
+
+public class StageNotShownException extends RuntimeException {
+    public StageNotShownException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/nativejavafx/taskbar/exception/UnsupportedSystemException.java b/src/main/java/com/nativejavafx/taskbar/exception/UnsupportedSystemException.java
@@ -0,0 +1,7 @@
+package com.nativejavafx.taskbar.exception;
+
+public class UnsupportedSystemException extends RuntimeException {
+    public UnsupportedSystemException(String message) {
+        super(message);
+    }
+}