Skip to content

Commit

Permalink
Created new packages to organize classes.
Browse files Browse the repository at this point in the history
  • Loading branch information
john committed Feb 13, 2015
1 parent 087b098 commit 4dbf552
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package game;
package controller;

import java.io.File;
import java.io.FileNotFoundException;
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package game;
package model;

import java.util.ArrayList;
import java.util.Random;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package game;
package model;

import java.util.ArrayList;

Expand Down
2 changes: 1 addition & 1 deletion MerchantRPGCSE2102/src/tests/TestItem.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package tests;

import game.Item;
import model.Item;
import junit.framework.TestCase;

public class TestItem extends TestCase
Expand Down
6 changes: 3 additions & 3 deletions MerchantRPGCSE2102/src/tests/TestMerchant.java
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
6 changes: 3 additions & 3 deletions MerchantRPGCSE2102/src/tests/TestPlayer.java
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion MerchantRPGCSE2102/src/tests/TestRPGame.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tests;

import controller.RPGame;
import junit.framework.TestCase;
import game.RPGame;

public class TestRPGame extends TestCase
{
Expand Down

0 comments on commit 4dbf552

Please sign in to comment.