From 4dbf552cf66f639149daf5506a556997e2c933bf Mon Sep 17 00:00:00 2001
From: jwb11006 <johnbojorquez36@gmail.com>
Date: Fri, 13 Feb 2015 12:19:38 -0500
Subject: [PATCH] Created new packages to organize classes.

---
 MerchantRPGCSE2102/src/{game => controller}/RPGame.java | 2 +-
 MerchantRPGCSE2102/src/{game => model}/Item.java        | 4 ++--
 MerchantRPGCSE2102/src/{game => model}/Merchant.java    | 2 +-
 MerchantRPGCSE2102/src/{game => model}/Player.java      | 2 +-
 MerchantRPGCSE2102/src/tests/TestItem.java              | 2 +-
 MerchantRPGCSE2102/src/tests/TestMerchant.java          | 6 +++---
 MerchantRPGCSE2102/src/tests/TestPlayer.java            | 6 +++---
 MerchantRPGCSE2102/src/tests/TestRPGame.java            | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename MerchantRPGCSE2102/src/{game => controller}/RPGame.java (96%)
 rename MerchantRPGCSE2102/src/{game => model}/Item.java (92%)
 rename MerchantRPGCSE2102/src/{game => model}/Merchant.java (96%)
 rename MerchantRPGCSE2102/src/{game => model}/Player.java (95%)

diff --git a/MerchantRPGCSE2102/src/game/RPGame.java b/MerchantRPGCSE2102/src/controller/RPGame.java
similarity index 96%
rename from MerchantRPGCSE2102/src/game/RPGame.java
rename to MerchantRPGCSE2102/src/controller/RPGame.java
index 5fba50c..0e1e3b5 100644
--- a/MerchantRPGCSE2102/src/game/RPGame.java
+++ b/MerchantRPGCSE2102/src/controller/RPGame.java
@@ -1,4 +1,4 @@
-package game;
+package controller;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/MerchantRPGCSE2102/src/game/Item.java b/MerchantRPGCSE2102/src/model/Item.java
similarity index 92%
rename from MerchantRPGCSE2102/src/game/Item.java
rename to MerchantRPGCSE2102/src/model/Item.java
index b01ba64..7cb3947 100644
--- a/MerchantRPGCSE2102/src/game/Item.java
+++ b/MerchantRPGCSE2102/src/model/Item.java
@@ -1,10 +1,10 @@
-package game;
+package model;
 
 public class Item 
 {
 	private String _name;			// name of the item
 	private int _basePrice;			// the item's starting price
-	private int _maxPrice;			// maximium obtainable price for the item
+	private int _maxPrice;			// maximum obtainable price for the item
 	private int _minPrice;			// minimum obtainable price for the item
 	private int _adjustedPrice;		// this is the item's price for the day
 	private int _quantity;			// amount of item (will discuss if there are any alternatives)
diff --git a/MerchantRPGCSE2102/src/game/Merchant.java b/MerchantRPGCSE2102/src/model/Merchant.java
similarity index 96%
rename from MerchantRPGCSE2102/src/game/Merchant.java
rename to MerchantRPGCSE2102/src/model/Merchant.java
index 76916d2..9bab251 100644
--- a/MerchantRPGCSE2102/src/game/Merchant.java
+++ b/MerchantRPGCSE2102/src/model/Merchant.java
@@ -1,4 +1,4 @@
-package game;
+package model;
 
 import java.util.ArrayList;
 import java.util.Random;
diff --git a/MerchantRPGCSE2102/src/game/Player.java b/MerchantRPGCSE2102/src/model/Player.java
similarity index 95%
rename from MerchantRPGCSE2102/src/game/Player.java
rename to MerchantRPGCSE2102/src/model/Player.java
index de573db..b31793a 100644
--- a/MerchantRPGCSE2102/src/game/Player.java
+++ b/MerchantRPGCSE2102/src/model/Player.java
@@ -1,4 +1,4 @@
-package game;
+package model;
 
 import java.util.ArrayList;
 
diff --git a/MerchantRPGCSE2102/src/tests/TestItem.java b/MerchantRPGCSE2102/src/tests/TestItem.java
index d5b8e0d..31c865b 100644
--- a/MerchantRPGCSE2102/src/tests/TestItem.java
+++ b/MerchantRPGCSE2102/src/tests/TestItem.java
@@ -1,6 +1,6 @@
 package tests;
 
-import game.Item;
+import model.Item;
 import junit.framework.TestCase;
 
 public class TestItem extends TestCase
diff --git a/MerchantRPGCSE2102/src/tests/TestMerchant.java b/MerchantRPGCSE2102/src/tests/TestMerchant.java
index 00b77fd..90b6598 100644
--- a/MerchantRPGCSE2102/src/tests/TestMerchant.java
+++ b/MerchantRPGCSE2102/src/tests/TestMerchant.java
@@ -1,10 +1,10 @@
 package tests;
 
 
-import game.Item;
-import game.Merchant;
+import controller.RPGame;
+import model.Item;
+import model.Merchant;
 import junit.framework.TestCase;
-import game.RPGame;
 
 public class TestMerchant extends TestCase
 {
diff --git a/MerchantRPGCSE2102/src/tests/TestPlayer.java b/MerchantRPGCSE2102/src/tests/TestPlayer.java
index 59ac8e3..1f77d92 100644
--- a/MerchantRPGCSE2102/src/tests/TestPlayer.java
+++ b/MerchantRPGCSE2102/src/tests/TestPlayer.java
@@ -1,9 +1,9 @@
 package tests;
 
+import controller.RPGame;
+import model.Item;
+import model.Player;
 import junit.framework.TestCase;
-import game.RPGame;
-import game.Player;
-import game.Item;
 
 public class TestPlayer extends TestCase
 {
diff --git a/MerchantRPGCSE2102/src/tests/TestRPGame.java b/MerchantRPGCSE2102/src/tests/TestRPGame.java
index e2f3d37..0bc5f45 100644
--- a/MerchantRPGCSE2102/src/tests/TestRPGame.java
+++ b/MerchantRPGCSE2102/src/tests/TestRPGame.java
@@ -1,7 +1,7 @@
 package tests;
 
+import controller.RPGame;
 import junit.framework.TestCase;
-import game.RPGame;
 
 public class TestRPGame extends TestCase
 {