Merge branch 'release/2.0.0'

Release: com.io7m.jwheatsheaf 2.0.0 Change: (Backwards incompatible) Move implementation classes in the ui module into an internal non-exported package
io7m-com · Apr 4, 2020 · d8ef51b · d8ef51b
2 parents 007d47e + 8d46114
commit d8ef51b
Show file tree

Hide file tree

Showing 46 changed files with 241 additions and 88 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -20,15 +20,20 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2020-03-29T10:44:47+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="1.0.3">
+    <c:release date="2020-03-29T00:00:00+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="1.0.3">
       <c:changes>
-        <c:change date="2020-03-29T10:44:47+00:00" summary="Show the full paths of files/directories in tooltips">
+        <c:change date="2020-03-29T00:00:00+00:00" summary="Show the full paths of files/directories in tooltips">
           <c:tickets>
             <c:ticket id="5"/>
           </c:tickets>
         </c:change>
       </c:changes>
     </c:release>
+    <c:release date="2020-04-04T14:29:42+00:00" ticket-system="com.github.io7m.jwheatsheaf" version="2.0.0">
+      <c:changes>
+        <c:change compatible="false" date="2020-04-04T14:29:42+00:00" summary="Move implementation classes in the ui module into an internal non-exported package"/>
+      </c:changes>
+    </c:release>
   </c:releases>
   <c:ticket-systems>
     <c:ticket-system default="true" id="com.github.io7m.jwheatsheaf" url="https://www.github.com/io7m/jwheatsheaf/issues/"/>

diff --git a/com.io7m.jwheatsheaf.api/pom.xml b/com.io7m.jwheatsheaf.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.api</artifactId>

diff --git a/com.io7m.jwheatsheaf.documentation/pom.xml b/com.io7m.jwheatsheaf.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.documentation</artifactId>

diff --git a/com.io7m.jwheatsheaf.examples/pom.xml b/com.io7m.jwheatsheaf.examples/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.examples</artifactId>

diff --git a/....jwheatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleApplication.java b/....jwheatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleApplication.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jwheatsheaf.examples;
 
-import com.io7m.jwheatsheaf.ui.JWStrings;
+import com.io7m.jwheatsheaf.ui.internal.JWStrings;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;

diff --git a/...7m.jwheatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleImageSets.java b/...7m.jwheatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleImageSets.java
@@ -18,7 +18,8 @@
 
 import com.io7m.jwheatsheaf.api.JWFileImageSetType;
 import com.io7m.jwheatsheaf.oxygen.JWOxygenIconSet;
-import com.io7m.jwheatsheaf.ui.JWFileImageDefaultSet;
+import com.io7m.jwheatsheaf.ui.JWFileChoosers;
+import com.io7m.jwheatsheaf.ui.internal.JWFileImageDefaultSet;
 
 import java.util.Map;
 import java.util.Objects;
@@ -37,7 +38,7 @@ public static ExampleImageSets create()
   {
     return new ExampleImageSets(
       Map.ofEntries(
-        Map.entry("Default", new JWFileImageDefaultSet()),
+        Map.entry("Default", JWFileChoosers.createDefaultIcons()),
         Map.entry("Inverse", new ExampleInverseIconSet()),
         Map.entry("Oxygen", new JWOxygenIconSet())
       )

diff --git a/...heatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleInverseIconSet.java b/...heatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleInverseIconSet.java
@@ -19,7 +19,7 @@
 import com.io7m.junreachable.UnreachableCodeException;
 import com.io7m.jwheatsheaf.api.JWFileImageSetType;
 import com.io7m.jwheatsheaf.api.JWFileKind;
-import com.io7m.jwheatsheaf.ui.JWFileImageDefaultSet;
+import com.io7m.jwheatsheaf.ui.internal.JWFileImageDefaultSet;
 
 import java.net.URL;
 import java.util.Optional;

diff --git a/...heatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleViewController.java b/...heatsheaf.examples/src/main/java/com/io7m/jwheatsheaf/examples/ExampleViewController.java
@@ -20,7 +20,7 @@
 import com.io7m.jwheatsheaf.api.JWFileChooserConfiguration;
 import com.io7m.jwheatsheaf.api.JWFileChooserEventType;
 import com.io7m.jwheatsheaf.ui.JWFileChoosers;
-import com.io7m.jwheatsheaf.ui.JWFileChoosersTesting;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChoosersTesting;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;

diff --git a/com.io7m.jwheatsheaf.oxygen/pom.xml b/com.io7m.jwheatsheaf.oxygen/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.oxygen</artifactId>

diff --git a/com.io7m.jwheatsheaf.tests/pom.xml b/com.io7m.jwheatsheaf.tests/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.tests</artifactId>

diff --git a/...m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileChooserSlowIOTest.java b/...m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileChooserSlowIOTest.java
@@ -22,7 +22,7 @@
 import com.io7m.jwheatsheaf.api.JWFileChooserType;
 import com.io7m.jwheatsheaf.api.JWFileChoosersType;
 import com.io7m.jwheatsheaf.ui.JWFileChoosers;
-import com.io7m.jwheatsheaf.ui.JWFileChoosersTesting;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChoosersTesting;
 import javafx.stage.Stage;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

diff --git a/com.io7m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileItemsTest.java b/com.io7m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileItemsTest.java
@@ -17,12 +17,10 @@
 package com.io7m.jwheatsheaf.tests;
 
 import com.io7m.jwheatsheaf.api.JWFileKind;
-import com.io7m.jwheatsheaf.ui.JWFileItems;
+import com.io7m.jwheatsheaf.ui.internal.JWFileItems;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;

diff --git a/com.io7m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileListTest.java b/com.io7m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileListTest.java
@@ -18,11 +18,11 @@
 
 import com.io7m.jwheatsheaf.api.JWFileChooserFilterType;
 import com.io7m.jwheatsheaf.api.JWFileKind;
-import com.io7m.jwheatsheaf.ui.JWFileChooserFilterAllFiles;
-import com.io7m.jwheatsheaf.ui.JWFileChooserFilterOnlyDirectories;
-import com.io7m.jwheatsheaf.ui.JWFileItem;
-import com.io7m.jwheatsheaf.ui.JWFileList;
-import com.io7m.jwheatsheaf.ui.JWStrings;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChooserFilterAllFiles;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChooserFilterOnlyDirectories;
+import com.io7m.jwheatsheaf.ui.internal.JWFileItem;
+import com.io7m.jwheatsheaf.ui.internal.JWFileList;
+import com.io7m.jwheatsheaf.ui.internal.JWStrings;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...heaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileSourceEntryRecentItemsTest.java b/...heaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileSourceEntryRecentItemsTest.java
@@ -17,7 +17,7 @@
 package com.io7m.jwheatsheaf.tests;
 
 import com.io7m.jwheatsheaf.api.JWFileChooserConfiguration;
-import com.io7m.jwheatsheaf.ui.JWFileSourceEntryRecentItems;
+import com.io7m.jwheatsheaf.ui.internal.JWFileSourceEntryRecentItems;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/com.io7m.jwheatsheaf.ui/pom.xml b/com.io7m.jwheatsheaf.ui/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.3</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.ui</artifactId>

diff --git a/com.io7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooser.java b/com.io7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooser.java
@@ -18,6 +18,7 @@
 
 import com.io7m.jwheatsheaf.api.JWFileChooserEventType;
 import com.io7m.jwheatsheaf.api.JWFileChooserType;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChooserViewController;
 import javafx.stage.Stage;
 
 import java.nio.file.Path;

diff --git a/com.io7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChoosers.java b/com.io7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChoosers.java
@@ -20,6 +20,10 @@
 import com.io7m.jwheatsheaf.api.JWFileChooserType;
 import com.io7m.jwheatsheaf.api.JWFileChoosersType;
 import com.io7m.jwheatsheaf.api.JWFileImageSetType;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChooserViewController;
+import com.io7m.jwheatsheaf.ui.internal.JWFileChoosersTesting;
+import com.io7m.jwheatsheaf.ui.internal.JWFileImageDefaultSet;
+import com.io7m.jwheatsheaf.ui.internal.JWStrings;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.Pane;
@@ -60,6 +64,15 @@ private JWFileChoosers(
       new JWFileImageDefaultSet();
   }
 
+  /**
+   * @return The default icon set
+   */
+
+  public static JWFileImageSetType createDefaultIcons()
+  {
+    return new JWFileImageDefaultSet();
+  }
+
   /**
    * Create a new file chooser provider.
    *
@@ -125,16 +138,6 @@ public static JWFileChoosersType createWith(
     return new JWFileChoosers(strings, testing, executor);
   }
 
-  ExecutorService ioExecutor()
-  {
-    return this.ioExecutor;
-  }
-
-  JWStrings strings()
-  {
-    return this.strings;
-  }
-
   @Override
   public JWFileChooserType create(
     final Window window,
@@ -145,7 +148,8 @@ public JWFileChooserType create(
 
     try {
       final var chooserXML =
-        JWFileChooser.class.getResource("chooser.fxml");
+        JWFileChooser.class.getResource(
+          "/com/io7m/jwheatsheaf/ui/internal/chooser.fxml");
       Objects.requireNonNull(chooserXML, "chooserXML");
 
       final var resources = JWStrings.getResourceBundle();
@@ -159,6 +163,10 @@ public JWFileChooserType create(
         (JWFileChooserViewController) loader.getController();
       viewController.setConfiguration(
         this,
+        this.ioExecutor,
+        this.testing,
+        this.strings,
+        this.imageSet,
         configuration
       );
 
@@ -187,14 +195,4 @@ public void close()
   {
     this.ioExecutor.shutdown();
   }
-
-  JWFileImageSetType imageSet()
-  {
-    return this.imageSet;
-  }
-
-  JWFileChoosersTesting testing()
-  {
-    return this.testing;
-  }
 }
diff --git a/...sheaf/ui/JWFileChooserFilterAllFiles.java → ...internal/JWFileChooserFilterAllFiles.java b/...sheaf/ui/JWFileChooserFilterAllFiles.java → ...internal/JWFileChooserFilterAllFiles.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jwheatsheaf.ui;
+package com.io7m.jwheatsheaf.ui.internal;
 
 import com.io7m.jwheatsheaf.api.JWFileChooserFilterType;
 

diff --git a/...i/JWFileChooserFilterOnlyDirectories.java → ...l/JWFileChooserFilterOnlyDirectories.java b/...i/JWFileChooserFilterOnlyDirectories.java → ...l/JWFileChooserFilterOnlyDirectories.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jwheatsheaf.ui;
+package com.io7m.jwheatsheaf.ui.internal;
 
 import com.io7m.jwheatsheaf.api.JWFileChooserFilterType;