Remove fx from project name

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.charego</groupId>
-    <artifactId>freecellfx</artifactId>
+    <artifactId>freecell</artifactId>
     <version>0.2</version>
 
     <organization>
@@ -33,6 +33,29 @@
                     <release>11</release>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>11.0</version>
+                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>3.5.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
@@ -45,7 +68,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>com.charego.freecellfx.FreeCellApplication</mainClass>
+                    <mainClass>com.charego.freecell.FreeCellApplication</mainClass>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/com/charego/freecell/FreeCellApplication.java

@@ -1,8 +1,8 @@
-package com.charego.freecellfx;
+package com.charego.freecell;
 
-import com.charego.freecellfx.model.Game;
-import com.charego.freecellfx.view.GameCanvas;
-import com.charego.freecellfx.view.GameMenuBar;
+import com.charego.freecell.model.Game;
+import com.charego.freecell.view.GameCanvas;
+import com.charego.freecell.view.GameMenuBar;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Scene;

src/main/java/com/charego/freecell/model/Card.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
-import com.charego.freecellfx.util.DoubleKeyedMap;
+import com.charego.freecell.util.DoubleKeyedMap;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
 

src/main/java/com/charego/freecell/model/Deck.java

@@ -1,7 +1,7 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
-import com.charego.freecellfx.model.Card.Rank;
-import com.charego.freecellfx.model.Card.Suit;
+import com.charego.freecell.model.Card.Rank;
+import com.charego.freecell.model.Card.Suit;
 
 import java.util.Collections;
 import java.util.Deque;

src/main/java/com/charego/freecell/model/Game.java

@@ -1,13 +1,13 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.charego.freecellfx.model.action.MoveAction;
-import com.charego.freecellfx.model.pile.Cell;
-import com.charego.freecellfx.model.pile.Foundation;
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.pile.Tableau;
+import com.charego.freecell.model.action.MoveAction;
+import com.charego.freecell.model.pile.Cell;
+import com.charego.freecell.model.pile.Foundation;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.pile.Tableau;
 
 public class Game {
 	private List<Cell> cells = new ArrayList<>(4);

src/main/java/com/charego/freecell/model/MoveTracker.java

@@ -1,9 +1,9 @@
-package com.charego.freecellfx.model;
+package com.charego.freecell.model;
 
 import java.util.Deque;
 import java.util.LinkedList;
 
-import com.charego.freecellfx.model.action.MoveAction;
+import com.charego.freecell.model.action.MoveAction;
 
 /**
  * Records moves to enable redo and undo actions.

src/main/java/com/charego/freecell/model/action/Action.java

@@ -1,4 +1,4 @@
-package com.charego.freecellfx.model.action;
+package com.charego.freecell.model.action;
 
 public interface Action {
 	void redo();

src/main/java/com/charego/freecell/model/action/MoveAction.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.action;
+package com.charego.freecell.model.action;
 
-import com.charego.freecellfx.model.pile.Pile;
+import com.charego.freecell.model.pile.Pile;
 
 public class MoveAction implements Action {
 	private final Pile fromPile;

src/main/java/com/charego/freecell/model/pile/AbstractPile.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 import java.util.ArrayDeque;
 import java.util.Deque;

src/main/java/com/charego/freecell/model/pile/Cell.java

@@ -1,4 +1,4 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
 public class Cell extends AbstractPile {
 

src/main/java/com/charego/freecell/model/pile/Foundation.java

@@ -1,7 +1,7 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import static com.charego.freecellfx.model.Card.Rank;
-import static com.charego.freecellfx.model.Card.Suit;
+import static com.charego.freecell.model.Card.Rank;
+import static com.charego.freecell.model.Card.Suit;
 
 public class Foundation extends AbstractPile {
 

src/main/java/com/charego/freecell/model/pile/Pile.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 public interface Pile extends Iterable<Card> {
 

src/main/java/com/charego/freecell/model/pile/Tableau.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.model.pile;
+package com.charego.freecell.model.pile;
 
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.Card;
 
 import java.util.Deque;
 import java.util.LinkedList;

src/main/java/com/charego/freecell/util/DoubleKeyedMap.java

@@ -1,4 +1,4 @@
-package com.charego.freecellfx.util;
+package com.charego.freecell.util;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/charego/freecell/view/GameCanvas.java

@@ -1,11 +1,11 @@
-package com.charego.freecellfx.view;
+package com.charego.freecell.view;
 
-import com.charego.freecellfx.model.Card;
-import com.charego.freecellfx.model.Game;
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.view.pile.CascadingPileView;
-import com.charego.freecellfx.view.pile.PileView;
-import com.charego.freecellfx.view.pile.StackedPileView;
+import com.charego.freecell.model.Card;
+import com.charego.freecell.model.Game;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.view.pile.CascadingPileView;
+import com.charego.freecell.view.pile.PileView;
+import com.charego.freecell.view.pile.StackedPileView;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.canvas.Canvas;

src/main/java/com/charego/freecell/view/GameMenuBar.java

@@ -1,4 +1,4 @@
-package com.charego.freecellfx.view;
+package com.charego.freecell.view;
 
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;

src/main/java/com/charego/freecell/view/pile/CascadingPileView.java

@@ -1,8 +1,8 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.Card;
-import com.charego.freecellfx.model.pile.Tableau;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.Card;
+import com.charego.freecell.model.pile.Tableau;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 

src/main/java/com/charego/freecell/view/pile/PileView.java

@@ -1,6 +1,6 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
+import com.charego.freecell.model.pile.Pile;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 

src/main/java/com/charego/freecell/view/pile/StackedPileView.java

@@ -1,7 +1,7 @@
-package com.charego.freecellfx.view.pile;
+package com.charego.freecell.view.pile;
 
-import com.charego.freecellfx.model.pile.Pile;
-import com.charego.freecellfx.model.Card;
+import com.charego.freecell.model.pile.Pile;
+import com.charego.freecell.model.Card;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
 

src/main/java/module-info.java

@@ -1,3 +1,3 @@
-module com.charego.freecellfx {
+module com.charego.freecell {
 	requires javafx.controls;
 }