last changes before 4.2.0

lbalazscs · Oct 3, 2018 · 5bfce0c · 5bfce0c
1 parent 9f821d2
commit 5bfce0c
Show file tree

Hide file tree

Showing 37 changed files with 412 additions and 453 deletions.
diff --git a/src/main/java/com/bric/image/ImageContextFactory.java b/src/main/java/com/bric/image/ImageContextFactory.java
@@ -25,30 +25,13 @@
  */
 public abstract class ImageContextFactory {
 	private static ImageContextFactory factory = new ImageContextFactory() {
-		boolean isJFXInstalled = isJFXInstalled();
-
 		public ImageContext create(BufferedImage bi) {
 			try {
-				if(isJFXInstalled)
-					return new JFXImageContext(bi);
 				return new BasicImageContext(bi);
 			} catch(Error e) {
 				return new BasicImageContext(bi);
 			}
 		}
-
-		private boolean isJFXInstalled() {
-			try {
-				Class<?> k = Class.forName("javafx.embed.swing.JFXPanel");
-				k.newInstance();
-				return true;
-			} catch(Throwable t) {
-				System.err.println("ImageContextFactory: JFX is not available.");
-				if(!(t instanceof ClassNotFoundException))
-						t.printStackTrace();
-				return false;
-			}
-		}
 	};
 
 	/** Return the ImageContextFactory in use.

diff --git a/src/main/java/com/bric/image/JFXImageContext.java b/src/main/java/com/bric/image/JFXImageContext.java
diff --git a/src/main/java/pixelitor/Build.java b/src/main/java/pixelitor/Build.java
@@ -27,17 +27,12 @@
  * menus and runtime checks.
  */
 public enum Build {
-    DEVELOPMENT(true) {
-    }, FINAL(false) {
+    DEVELOPMENT() {
+    }, FINAL() {
     };
 
-    private final boolean development;
     private static boolean testing = false;
 
-    Build(boolean development) {
-        this.development = development;
-    }
-
     public static final boolean enableAdjLayers = false;
 
     public static Build CURRENT = FINAL;
@@ -47,12 +42,12 @@ public enum Build {
     // Lazy because it should be calculated after the CURRENT is set.
     private static final Lazy<String> fixTitle = Lazy.of(Build::calcFixTitle);
 
-    public boolean isDevelopment() {
-        return development;
+    public static boolean isDevelopment() {
+        return CURRENT == DEVELOPMENT;
     }
 
-    public boolean isFinal() {
-        return !development;
+    public static boolean isFinal() {
+        return !isDevelopment();
     }
 
     private static String calcFixTitle() {

diff --git a/src/main/java/pixelitor/Composition.java b/src/main/java/pixelitor/Composition.java
@@ -829,7 +829,7 @@ public void deselect(boolean addToHistory) {
                 // we can get here from a DeselectEdit.redo on a non-active composition
             }
         }
-        if (Build.CURRENT.isDevelopment() && isActive()) {
+        if (Build.isDevelopment() && isActive()) {
             ConsistencyChecks.selectionActionsEnabledCheck(this);
         }
     }
@@ -1119,7 +1119,9 @@ public CompletableFuture<Void> saveAsync(SaveSettings saveSettings,
         OutputFormat outputFormat = saveSettings.getOutputFormat();
         File f = saveSettings.getFile();
 
-        System.out.println("Composition::saveAsync: CALLED, file = " + f.getAbsolutePath());
+        if (Build.isDevelopment()) {
+            System.out.println("Composition::saveAsync: saving " + f.getAbsolutePath());
+        }
 
         Runnable saveTask = outputFormat.getSaveTask(this, saveSettings);
         return saveAsync(saveTask, f, addToRecentMenus);
@@ -1165,7 +1167,9 @@ public Path getActivePath() {
 
     public void setActivePath(Path path) {
         if (path != null && path.getComp() != this) {
-            throw new IllegalArgumentException();
+            throw new IllegalArgumentException(
+                    "path belongs to other comp, this = " + toPathDebugString() +
+                            ", path.comp = " + path.getComp().toPathDebugString());
         }
 
         if (paths == null) {

diff --git a/src/main/java/pixelitor/Pixelitor.java b/src/main/java/pixelitor/Pixelitor.java
@@ -43,6 +43,7 @@
 
 import javax.swing.*;
 import java.awt.EventQueue;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
 import java.awt.geom.Rectangle2D;
 import java.io.File;
@@ -76,6 +77,11 @@ public static void main(String[] args) {
             // doesn't seem to pick up good defaults
             System.setProperty("awt.useSystemAAFontSettings", "lcd");
             System.setProperty("swing.aatext", "true");
+
+            if (GraphicsEnvironment.isHeadless()) {
+                System.err.println("Pixelitor cannot be used in headless mode");
+                System.exit(1);
+            }
         }
 
         ExceptionHandler.INSTANCE.initialize();

diff --git a/src/main/java/pixelitor/filters/ParamTest.java b/src/main/java/pixelitor/filters/ParamTest.java
@@ -57,7 +57,7 @@ public ParamTest() {
 
     @Override
     public BufferedImage doTransform(BufferedImage src, BufferedImage dest) {
-        if ((Build.CURRENT.isDevelopment()) && (!RandomGUITest.isRunning())) {
+        if ((Build.isDevelopment()) && (!RandomGUITest.isRunning())) {
             System.out.println("ParamTest.doTransform CALLED");
         }