sooper seekrit changes

src/Main.java → 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;

src/MapTowerDefense.java → src/model/MapTowerDefense.java

@@ -1,3 +1,7 @@
+package model;
+
+import view.MockGui;
+import view.StatGui;
 
 
 

src/MinionFactory.java → src/model/MinionFactory.java

@@ -1,3 +1,4 @@
+package model;
 import java.util.Random;
 
 public class MinionFactory {

src/MinionMock.java → src/model/MinionMock.java

@@ -1,3 +1,4 @@
+package model;
 import java.awt.image.BufferedImage;
 
 

src/MinionTypes.java → src/model/MinionTypes.java

@@ -1,3 +1,4 @@
+package model;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;

src/TowerDefenseGame.java → src/model/TowerDefenseGame.java

@@ -1,3 +1,4 @@
+package model;
 import java.util.Deque;
 
 /**

src/TowerFactory.java → 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;
 

src/TowerMock.java → src/model/TowerMock.java

@@ -1,3 +1,4 @@
+package model;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;

src/TowerTypes.java → src/model/TowerTypes.java

@@ -1,3 +1,4 @@
+package model;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;

src/MinionFactoryTests.java → 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;

src/MinonTests.java → 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{

src/MockGuiTests.java → 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{

src/StatGuiTests.java → src/tests/StatGuiTests.java

@@ -1,5 +1,7 @@
+package tests;
 
 
+import view.StatGui;
 import junit.framework.TestCase;
 
 

src/MockGui.java → 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;
 
 

src/StatGui.java → 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;
+