Add static factory classes.

wrandelshofer · Dec 17, 2023 · a7adbb1 · a7adbb1
1 parent fb7d135
commit a7adbb1
Show file tree

Hide file tree

Showing 382 changed files with 1,294 additions and 21,839 deletions.
diff --git a/org.jhotdraw8.application/pom.xml b/org.jhotdraw8.application/pom.xml
@@ -83,6 +83,10 @@
       <artifactId>org.jhotdraw8.fxbase</artifactId>
     </dependency>
     <dependency>
+        <groupId>ch.randelshofer</groupId>
+        <artifactId>org.jhotdraw8.icollection</artifactId>
+    </dependency>
+      <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>

diff --git a/...ava/org.jhotdraw8.application/org/jhotdraw8/application/AbstractFileBasedApplication.java b/...ava/org.jhotdraw8.application/org/jhotdraw8/application/AbstractFileBasedApplication.java
@@ -17,7 +17,12 @@
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
+import javafx.scene.control.CheckMenuItem;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.DataFormat;
 import javafx.scene.input.KeyCombination;
@@ -34,25 +39,45 @@
 import org.jhotdraw8.application.action.ScreenMenuBarProxyAction;
 import org.jhotdraw8.application.action.app.AboutAction;
 import org.jhotdraw8.application.action.app.ExitAction;
-import org.jhotdraw8.application.action.edit.*;
-import org.jhotdraw8.application.action.file.*;
+import org.jhotdraw8.application.action.edit.ClearSelectionAction;
+import org.jhotdraw8.application.action.edit.CopyAction;
+import org.jhotdraw8.application.action.edit.CutAction;
+import org.jhotdraw8.application.action.edit.DeleteAction;
+import org.jhotdraw8.application.action.edit.PasteAction;
+import org.jhotdraw8.application.action.edit.SelectAllAction;
+import org.jhotdraw8.application.action.file.ClearRecentFilesMenuAction;
+import org.jhotdraw8.application.action.file.CloseFileAction;
+import org.jhotdraw8.application.action.file.NewFileAction;
+import org.jhotdraw8.application.action.file.OpenFileAction;
+import org.jhotdraw8.application.action.file.OpenRecentFileAction;
 import org.jhotdraw8.application.prefs.PreferencesUtil;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.text.NaturalSortCollator;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.collection.reflect.TypeToken;
 import org.jhotdraw8.fxbase.binding.CustomBinding;
 import org.jhotdraw8.fxbase.concurrent.FXWorker;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.tree.PreorderSpliterator;
 import org.jhotdraw8.fxcollection.typesafekey.Key;
 import org.jhotdraw8.fxcollection.typesafekey.SimpleNullableKey;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.WeakHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Supplier;

diff --git a/.../src/main/java/org.jhotdraw8.application/org/jhotdraw8/application/FileBasedActivity.java b/.../src/main/java/org.jhotdraw8.application/org/jhotdraw8/application/FileBasedActivity.java
@@ -12,14 +12,14 @@
 import org.jhotdraw8.annotation.NonNull;
 import org.jhotdraw8.annotation.Nullable;
 import org.jhotdraw8.application.action.Action;
-import org.jhotdraw8.collection.immutable.ImmutableMap;
 import org.jhotdraw8.fxbase.concurrent.CompletableWorker;
 import org.jhotdraw8.fxbase.concurrent.FXWorker;
 import org.jhotdraw8.fxbase.concurrent.SimpleCompletableWorker;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
 import org.jhotdraw8.fxbase.control.Disableable;
 import org.jhotdraw8.fxcollection.typesafekey.Key;
+import org.jhotdraw8.icollection.immutable.ImmutableMap;
 
 import java.net.URI;
 import java.util.concurrent.CompletionStage;

diff --git a/...tdraw8.application/org/jhotdraw8/application/action/AbstractSaveUnsavedChangesAction.java b/...tdraw8.application/org/jhotdraw8/application/action/AbstractSaveUnsavedChangesAction.java
@@ -24,9 +24,9 @@
 import org.jhotdraw8.application.controls.urichooser.URIChooser;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.net.UriUtil;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.concurrent.CancellationException;

diff --git a/.../main/java/org.jhotdraw8.application/org/jhotdraw8/application/action/app/ExitAction.java b/.../main/java/org.jhotdraw8.application/org/jhotdraw8/application/action/app/ExitAction.java
@@ -22,9 +22,9 @@
 import org.jhotdraw8.application.controls.urichooser.URIChooser;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.net.UriUtil;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.ArrayList;

diff --git a/...g.jhotdraw8.application/org/jhotdraw8/application/action/file/AbstractOpenFileAction.java b/...g.jhotdraw8.application/org/jhotdraw8/application/action/file/AbstractOpenFileAction.java
@@ -20,12 +20,12 @@
 import org.jhotdraw8.application.controls.urichooser.URIChooser;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.net.UriUtil;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.collection.reflect.TypeToken;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
 import org.jhotdraw8.fxcollection.typesafekey.Key;
 import org.jhotdraw8.fxcollection.typesafekey.SimpleNullableKey;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.Map;

diff --git a/...g.jhotdraw8.application/org/jhotdraw8/application/action/file/AbstractSaveFileAction.java b/...g.jhotdraw8.application/org/jhotdraw8/application/action/file/AbstractSaveFileAction.java
@@ -21,12 +21,12 @@
 import org.jhotdraw8.application.controls.urichooser.URIChooser;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.net.UriUtil;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.collection.reflect.TypeToken;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
 import org.jhotdraw8.fxcollection.typesafekey.Key;
 import org.jhotdraw8.fxcollection.typesafekey.SimpleNullableKey;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.LinkedHashMap;

diff --git a/...org.jhotdraw8.application/org/jhotdraw8/application/action/file/OpenRecentFileAction.java b/...org.jhotdraw8.application/org/jhotdraw8/application/action/file/OpenRecentFileAction.java
@@ -17,9 +17,9 @@
 import org.jhotdraw8.application.action.Action;
 import org.jhotdraw8.application.resources.Resources;
 import org.jhotdraw8.base.net.UriUtil;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.MissingResourceException;

diff --git a/...ava/org.jhotdraw8.application/org/jhotdraw8/application/action/file/RevertFileAction.java b/...ava/org.jhotdraw8.application/org/jhotdraw8/application/action/file/RevertFileAction.java
@@ -13,9 +13,9 @@
 import org.jhotdraw8.application.ApplicationLabels;
 import org.jhotdraw8.application.FileBasedActivity;
 import org.jhotdraw8.application.action.AbstractActivityAction;
-import org.jhotdraw8.collection.ChampMap;
 import org.jhotdraw8.fxbase.concurrent.SimpleWorkState;
 import org.jhotdraw8.fxbase.concurrent.WorkState;
+import org.jhotdraw8.icollection.ChampMap;
 
 import java.net.URI;
 import java.util.Optional;

diff --git a/org.jhotdraw8.collection/pom.xml b/org.jhotdraw8.collection/pom.xml
@@ -46,6 +46,11 @@
       <version>${revision}</version>
     </dependency>
     <dependency>
+        <groupId>ch.randelshofer</groupId>
+        <artifactId>org.jhotdraw8.icollection</artifactId>
+        <version>${revision}</version>
+    </dependency>
+      <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava-testlib</artifactId>
       <scope>test</scope>

diff --git a/org.jhotdraw8.collection/src/main/java/org.jhotdraw8.collection/module-info.java b/org.jhotdraw8.collection/src/main/java/org.jhotdraw8.collection/module-info.java
@@ -9,17 +9,13 @@
 @SuppressWarnings("module")
 module org.jhotdraw8.collection {
     requires static org.jhotdraw8.annotation;
+    requires org.jhotdraw8.icollection;
     exports org.jhotdraw8.collection.enumerator;
-    exports org.jhotdraw8.collection.facade;
     exports org.jhotdraw8.collection.function;
-    exports org.jhotdraw8.collection.immutable;
     exports org.jhotdraw8.collection.iterator;
     exports org.jhotdraw8.collection.mapped;
     exports org.jhotdraw8.collection.primitive;
-    exports org.jhotdraw8.collection.readonly;
     exports org.jhotdraw8.collection.reflect;
-    exports org.jhotdraw8.collection.sequenced;
-    exports org.jhotdraw8.collection;
     exports org.jhotdraw8.collection.pair;
     exports org.jhotdraw8.collection.spliterator;
     exports org.jhotdraw8.collection.transform;