Skip to content

Commit

Permalink
#5 Finalized 0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
prmr committed Dec 28, 2015
1 parent 7b310f2 commit fd25546
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/ca/mcgill/cs/stg/solitaire/cards/Deck.java
Expand Up @@ -20,6 +20,7 @@
*******************************************************************************/
package ca.mcgill.cs.stg.solitaire.cards;

import java.util.Collections;
import java.util.Stack;

import ca.mcgill.cs.stg.solitaire.cards.Card.Rank;
Expand Down Expand Up @@ -60,7 +61,7 @@ private void reset()
public void shuffle()
{
reset();
// Collections.shuffle( aCards );
Collections.shuffle( aCards );
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/ca/mcgill/cs/stg/solitaire/gui/Solitaire.java
Expand Up @@ -42,6 +42,7 @@ public class Solitaire extends Application
private static final int HEIGHT = 500;
private static final int MARGIN_OUTER = 10;
private static final String TITLE = "Solitaire";
private static final String VERSION = "0.1";

private DeckView aDeckView = new DeckView();
private DiscardPileView aDiscardPileView = new DiscardPileView();
Expand All @@ -60,7 +61,7 @@ public static void main(String[] pArgs)
@Override
public void start(Stage pPrimaryStage)
{
pPrimaryStage.setTitle(TITLE);
pPrimaryStage.setTitle(TITLE + " " + VERSION);

GridPane root = new GridPane();
root.setStyle("-fx-background-color: green;");
Expand Down

0 comments on commit fd25546

Please sign in to comment.