From 927d9de1f68544716fd4b788e8a03d451656f010 Mon Sep 17 00:00:00 2001 From: dwm10005 Date: Fri, 1 May 2015 11:58:33 -0400 Subject: [PATCH] sooper seekrit changes --- src/{ => mains}/Main.java | 7 +++++++ src/{ => model}/MapTowerDefense.java | 4 ++++ src/{ => model}/MinionFactory.java | 1 + src/{ => model}/MinionMock.java | 1 + src/{ => model}/MinionTypes.java | 1 + src/{ => model}/TowerDefenseGame.java | 1 + src/{ => model}/TowerFactory.java | 3 ++- src/{ => model}/TowerMock.java | 1 + src/{ => model}/TowerTypes.java | 1 + src/{ => tests}/MinionFactoryTests.java | 6 ++++++ src/{ => tests}/MinonTests.java | 6 ++++++ src/{ => tests}/MockGuiTests.java | 2 ++ src/{ => tests}/StatGuiTests.java | 2 ++ src/{ => view}/MockGui.java | 8 ++++++++ src/{ => view}/StatGui.java | 4 ++++ 15 files changed, 47 insertions(+), 1 deletion(-) rename src/{ => mains}/Main.java (92%) rename src/{ => model}/MapTowerDefense.java (93%) rename src/{ => model}/MinionFactory.java (98%) rename src/{ => model}/MinionMock.java (99%) rename src/{ => model}/MinionTypes.java (95%) rename src/{ => model}/TowerDefenseGame.java (94%) rename src/{ => model}/TowerFactory.java (98%) rename src/{ => model}/TowerMock.java (99%) rename src/{ => model}/TowerTypes.java (94%) rename src/{ => tests}/MinionFactoryTests.java (86%) rename src/{ => tests}/MinonTests.java (88%) rename src/{ => tests}/MockGuiTests.java (91%) rename src/{ => tests}/StatGuiTests.java (89%) rename src/{ => view}/MockGui.java (98%) rename src/{ => view}/StatGui.java (98%) diff --git a/src/Main.java b/src/mains/Main.java similarity index 92% rename from src/Main.java rename to src/mains/Main.java index 25b5c99..0b66b4d 100644 --- a/src/Main.java +++ b/src/mains/Main.java @@ -1,6 +1,13 @@ +package mains; import java.awt.*; + import javax.swing.*; +import view.MockGui; +import view.StatGui; +import model.MapTowerDefense; +import model.MinionTypes; + public class Main extends JFrame{ private static int[][] nodes; private static final int NUM = 6; diff --git a/src/MapTowerDefense.java b/src/model/MapTowerDefense.java similarity index 93% rename from src/MapTowerDefense.java rename to src/model/MapTowerDefense.java index 108c273..ed3a56b 100644 --- a/src/MapTowerDefense.java +++ b/src/model/MapTowerDefense.java @@ -1,3 +1,7 @@ +package model; + +import view.MockGui; +import view.StatGui; diff --git a/src/MinionFactory.java b/src/model/MinionFactory.java similarity index 98% rename from src/MinionFactory.java rename to src/model/MinionFactory.java index 2fcba52..0104efc 100644 --- a/src/MinionFactory.java +++ b/src/model/MinionFactory.java @@ -1,3 +1,4 @@ +package model; import java.util.Random; public class MinionFactory { diff --git a/src/MinionMock.java b/src/model/MinionMock.java similarity index 99% rename from src/MinionMock.java rename to src/model/MinionMock.java index 1eadbcf..4399d01 100644 --- a/src/MinionMock.java +++ b/src/model/MinionMock.java @@ -1,3 +1,4 @@ +package model; import java.awt.image.BufferedImage; diff --git a/src/MinionTypes.java b/src/model/MinionTypes.java similarity index 95% rename from src/MinionTypes.java rename to src/model/MinionTypes.java index 4c30941..1999725 100644 --- a/src/MinionTypes.java +++ b/src/model/MinionTypes.java @@ -1,3 +1,4 @@ +package model; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/TowerDefenseGame.java b/src/model/TowerDefenseGame.java similarity index 94% rename from src/TowerDefenseGame.java rename to src/model/TowerDefenseGame.java index 250e608..217fd45 100644 --- a/src/TowerDefenseGame.java +++ b/src/model/TowerDefenseGame.java @@ -1,3 +1,4 @@ +package model; import java.util.Deque; /** diff --git a/src/TowerFactory.java b/src/model/TowerFactory.java similarity index 98% rename from src/TowerFactory.java rename to src/model/TowerFactory.java index fe9f43d..d8c5166 100644 --- a/src/TowerFactory.java +++ b/src/model/TowerFactory.java @@ -1,10 +1,11 @@ +package model; public class TowerFactory { int xloc, yloc; MapTowerDefense _map; TowerMock[] towerarray; - int quantity; + public int quantity; //FML int _max; int cost; diff --git a/src/TowerMock.java b/src/model/TowerMock.java similarity index 99% rename from src/TowerMock.java rename to src/model/TowerMock.java index 236638c..96ae5c6 100644 --- a/src/TowerMock.java +++ b/src/model/TowerMock.java @@ -1,3 +1,4 @@ +package model; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/TowerTypes.java b/src/model/TowerTypes.java similarity index 94% rename from src/TowerTypes.java rename to src/model/TowerTypes.java index ab1ec04..9f13f20 100644 --- a/src/TowerTypes.java +++ b/src/model/TowerTypes.java @@ -1,3 +1,4 @@ +package model; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/MinionFactoryTests.java b/src/tests/MinionFactoryTests.java similarity index 86% rename from src/MinionFactoryTests.java rename to src/tests/MinionFactoryTests.java index 6836423..b4fe736 100644 --- a/src/MinionFactoryTests.java +++ b/src/tests/MinionFactoryTests.java @@ -1,8 +1,14 @@ +package tests; import static org.junit.Assert.*; import junit.framework.TestCase; +import model.MapTowerDefense; +import model.MinionFactory; import org.junit.Test; +import view.MockGui; +import view.StatGui; + public class MinionFactoryTests extends TestCase { MapTowerDefense map; diff --git a/src/MinonTests.java b/src/tests/MinonTests.java similarity index 88% rename from src/MinonTests.java rename to src/tests/MinonTests.java index d6b48ef..7737edb 100644 --- a/src/MinonTests.java +++ b/src/tests/MinonTests.java @@ -1,4 +1,10 @@ +package tests; +import view.MockGui; +import view.StatGui; +import model.MapTowerDefense; +import model.MinionMock; +import model.MinionTypes; import junit.framework.TestCase; public class MinonTests extends TestCase{ diff --git a/src/MockGuiTests.java b/src/tests/MockGuiTests.java similarity index 91% rename from src/MockGuiTests.java rename to src/tests/MockGuiTests.java index c342492..4183c73 100644 --- a/src/MockGuiTests.java +++ b/src/tests/MockGuiTests.java @@ -1,3 +1,4 @@ +package tests; import static org.junit.Assert.*; @@ -6,6 +7,7 @@ import java.awt.Color; import org.junit.Test; +import view.MockGui; import junit.framework.TestCase; public class MockGuiTests extends TestCase{ diff --git a/src/StatGuiTests.java b/src/tests/StatGuiTests.java similarity index 89% rename from src/StatGuiTests.java rename to src/tests/StatGuiTests.java index 481bf5a..ceffab5 100644 --- a/src/StatGuiTests.java +++ b/src/tests/StatGuiTests.java @@ -1,5 +1,7 @@ +package tests; +import view.StatGui; import junit.framework.TestCase; diff --git a/src/MockGui.java b/src/view/MockGui.java similarity index 98% rename from src/MockGui.java rename to src/view/MockGui.java index 035e98b..1440308 100644 --- a/src/MockGui.java +++ b/src/view/MockGui.java @@ -1,3 +1,4 @@ +package view; import javax.imageio.ImageIO; import javax.swing.*; @@ -18,6 +19,13 @@ import java.util.logging.Logger; import javax.imageio.ImageIO; +import model.MapTowerDefense; +import model.MinionFactory; +import model.MinionMock; +import model.TowerFactory; +import model.TowerMock; +import model.TowerTypes; + import java.util.Random; diff --git a/src/StatGui.java b/src/view/StatGui.java similarity index 98% rename from src/StatGui.java rename to src/view/StatGui.java index a39cbfd..6042c2f 100644 --- a/src/StatGui.java +++ b/src/view/StatGui.java @@ -1,3 +1,4 @@ +package view; import javax.swing.JLabel; import javax.swing.JPanel; @@ -8,6 +9,9 @@ import java.awt.event.ActionListener; import javax.imageio.ImageIO; import javax.swing.*; +import model.MapTowerDefense; +import model.TowerTypes; +