diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 3855033..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -<<<<<<< HEAD -/controller/ -======= ->>>>>>> branch 'master' of https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git -/model/ -/view/ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index f1ef37b..7d9238f 100644 Binary files a/bin/model/DealTile.class and b/bin/model/DealTile.class differ diff --git a/bin/model/DownsizeTile.class b/bin/model/DownsizeTile.class new file mode 100644 index 0000000..058fe38 Binary files /dev/null and b/bin/model/DownsizeTile.class differ diff --git a/bin/model/Handler.class b/bin/model/Handler.class new file mode 100644 index 0000000..168fca9 Binary files /dev/null and b/bin/model/Handler.class differ diff --git a/bin/view/DownSizeWindow$1.class b/bin/view/DownSizeWindow$1.class new file mode 100644 index 0000000..f33d97e Binary files /dev/null and b/bin/view/DownSizeWindow$1.class differ diff --git a/bin/view/DownSizeWindow.class b/bin/view/DownSizeWindow.class new file mode 100644 index 0000000..506d0a8 Binary files /dev/null and b/bin/view/DownSizeWindow.class differ diff --git a/bin/view/GameboardWindow.class b/bin/view/GameboardWindow.class new file mode 100644 index 0000000..06f8a0b Binary files /dev/null and b/bin/view/GameboardWindow.class differ diff --git a/bin/view/Positioner.class b/bin/view/Positioner.class new file mode 100644 index 0000000..32ebf82 Binary files /dev/null and b/bin/view/Positioner.class differ diff --git a/bin/view/TileButton.class b/bin/view/TileButton.class new file mode 100644 index 0000000..2c088ec Binary files /dev/null and b/bin/view/TileButton.class differ diff --git a/bin/view/gameboard.png b/bin/view/gameboard.png new file mode 100644 index 0000000..50aaab3 Binary files /dev/null and b/bin/view/gameboard.png differ diff --git a/bin/view/piece1.png b/bin/view/piece1.png new file mode 100644 index 0000000..b0d191c Binary files /dev/null and b/bin/view/piece1.png differ diff --git a/bin/view/piece2.png b/bin/view/piece2.png new file mode 100644 index 0000000..26c2077 Binary files /dev/null and b/bin/view/piece2.png differ diff --git a/bin/view/piece3.png b/bin/view/piece3.png new file mode 100644 index 0000000..2623e8b Binary files /dev/null and b/bin/view/piece3.png differ diff --git a/bin/view/piece4.png b/bin/view/piece4.png new file mode 100644 index 0000000..14ffc2d Binary files /dev/null and b/bin/view/piece4.png differ diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 0aabdef..c2edcd0 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -7,15 +7,13 @@ import java.util.Scanner; public class DealTile extends Tile { - private static SmallDealStack _smallDealStack; - private static BigDealStack _bigDealStack; + private static SmallDealStack _smallDealStack = new SmallDealStack();; + private static BigDealStack _bigDealStack = new BigDealStack(); private static int _stockPrice; public DealTile(String type, int boardIndex) { super(type, boardIndex); - _smallDealStack = new SmallDealStack(); - _bigDealStack = new BigDealStack(); } @Override diff --git a/src/model/MarketTile.java b/src/model/MarketTile.java index acc2b69..cc34c9d 100644 --- a/src/model/MarketTile.java +++ b/src/model/MarketTile.java @@ -1,7 +1,7 @@ package model; -public class MarketTile extends Tile { - +public class MarketTile extends Tile +{ public MarketTile(String type, int boardIndex) { super(type, boardIndex); // TODO Auto-generated constructor stub