cgould/freecell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove fx from project name

Browse Source
This commit is contained in:
Charles Gould 2019-02-20 09:06:56 -05:00
parent 1aaa1ea5e3
commit 809ca45b75
20 changed files with 74 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.charego</groupId> <groupId>com.charego</groupId>
<artifactId>freecellfx</artifactId> <artifactId>freecell</artifactId>
<version>0.2</version> <version>0.2</version>
<organization> <organization>
@ -33,6 +33,29 @@
<release>11</release> <release>11</release>
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
@ -45,7 +68,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<mainClass>com.charego.freecellfx.FreeCellApplication</mainClass> <mainClass>com.charego.freecell.FreeCellApplication</mainClass>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

8
src/main/java/com/charego/freecellfx/FreeCellApplication.java → src/main/java/com/charego/freecell/FreeCellApplication.java
View File

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

4
src/main/java/com/charego/freecellfx/model/Card.java → src/main/java/com/charego/freecell/model/Card.java
View File

@ -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.image.Image;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;

6
src/main/java/com/charego/freecellfx/model/Deck.java → src/main/java/com/charego/freecell/model/Deck.java
View File

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

12
src/main/java/com/charego/freecellfx/model/Game.java → src/main/java/com/charego/freecell/model/Game.java
View File

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

4
src/main/java/com/charego/freecellfx/model/MoveTracker.java → src/main/java/com/charego/freecell/model/MoveTracker.java
View File

@ -1,9 +1,9 @@
package com.charego.freecellfx.model; package com.charego.freecell.model;
import java.util.Deque; import java.util.Deque;
import java.util.LinkedList; 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. * Records moves to enable redo and undo actions.

2
src/main/java/com/charego/freecellfx/model/action/Action.java → src/main/java/com/charego/freecell/model/action/Action.java
View File

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

4
src/main/java/com/charego/freecellfx/model/action/MoveAction.java → src/main/java/com/charego/freecell/model/action/MoveAction.java
View File

@ -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 { public class MoveAction implements Action {
private final Pile fromPile; private final Pile fromPile;

4
src/main/java/com/charego/freecellfx/model/pile/AbstractPile.java → src/main/java/com/charego/freecell/model/pile/AbstractPile.java
View File

@ -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.ArrayDeque;
import java.util.Deque; import java.util.Deque;

2
src/main/java/com/charego/freecellfx/model/pile/Cell.java → src/main/java/com/charego/freecell/model/pile/Cell.java
View File

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

6
src/main/java/com/charego/freecellfx/model/pile/Foundation.java → src/main/java/com/charego/freecell/model/pile/Foundation.java
View File

@ -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.freecell.model.Card.Rank;
import static com.charego.freecellfx.model.Card.Suit; import static com.charego.freecell.model.Card.Suit;
public class Foundation extends AbstractPile { public class Foundation extends AbstractPile {

4
src/main/java/com/charego/freecellfx/model/pile/Pile.java → src/main/java/com/charego/freecell/model/pile/Pile.java
View File

@ -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> { public interface Pile extends Iterable<Card> {

4
src/main/java/com/charego/freecellfx/model/pile/Tableau.java → src/main/java/com/charego/freecell/model/pile/Tableau.java
View File

@ -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.Deque;
import java.util.LinkedList; import java.util.LinkedList;

2
src/main/java/com/charego/freecellfx/util/DoubleKeyedMap.java → src/main/java/com/charego/freecell/util/DoubleKeyedMap.java
View File

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

14
src/main/java/com/charego/freecellfx/view/GameCanvas.java → src/main/java/com/charego/freecell/view/GameCanvas.java
View File

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

2
src/main/java/com/charego/freecellfx/view/GameMenuBar.java → src/main/java/com/charego/freecell/view/GameMenuBar.java
View File

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

8
src/main/java/com/charego/freecellfx/view/pile/CascadingPileView.java → src/main/java/com/charego/freecell/view/pile/CascadingPileView.java
View File

@ -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.freecell.model.pile.Pile;
import com.charego.freecellfx.model.Card; import com.charego.freecell.model.Card;
import com.charego.freecellfx.model.pile.Tableau; import com.charego.freecell.model.pile.Tableau;
import javafx.scene.canvas.GraphicsContext; import javafx.scene.canvas.GraphicsContext;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;

4
src/main/java/com/charego/freecellfx/view/pile/PileView.java → src/main/java/com/charego/freecell/view/pile/PileView.java
View File

@ -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.canvas.GraphicsContext;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;

6
src/main/java/com/charego/freecellfx/view/pile/StackedPileView.java → src/main/java/com/charego/freecell/view/pile/StackedPileView.java
View File

@ -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.freecell.model.pile.Pile;
import com.charego.freecellfx.model.Card; import com.charego.freecell.model.Card;
import javafx.scene.canvas.GraphicsContext; import javafx.scene.canvas.GraphicsContext;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;

2
src/main/java/module-info.java
View File

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