diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Q1/AddressBook.java | 2 | ||||
| -rw-r--r-- | src/Q1/AddressBookTest.java | 3 | ||||
| -rw-r--r-- | src/Q10/TaxReturn.java | 2 | ||||
| -rw-r--r-- | src/Q10/TaxReturnTest.java | 3 | ||||
| -rw-r--r-- | src/Q2/BonusOnSavings.java | 2 | ||||
| -rw-r--r-- | src/Q2/BonusOnSavingsTest.java | 3 | ||||
| -rw-r--r-- | src/Q3/CartesianCoordinateSystem.java | 2 | ||||
| -rw-r--r-- | src/Q3/CartesianCoordinateSystemTest.java | 3 | ||||
| -rw-r--r-- | src/Q4/BanffMarathonRunner.java | 3 | ||||
| -rw-r--r-- | src/Q4/BanffMarathonRunnerTest.java | 3 | ||||
| -rw-r--r-- | src/Q5/EmployeeSavings.java | 3 | ||||
| -rw-r--r-- | src/Q5/EmployeeSavingsTest.java | 3 | ||||
| -rw-r--r-- | src/Q6/Triangle.java | 2 | ||||
| -rw-r--r-- | src/Q6/TriangleTest.java | 3 | ||||
| -rw-r--r-- | src/Q7/HailstoneSequence.java | 2 | ||||
| -rw-r--r-- | src/Q7/HailstoneSequenceTest.java | 3 | ||||
| -rw-r--r-- | src/Q8/Candidate.java | 3 | ||||
| -rw-r--r-- | src/Q8/CandidateTest.java | 3 | ||||
| -rw-r--r-- | src/Q8/Communication.java | 2 | ||||
| -rw-r--r-- | src/Q8/CommunicationTest.java | 3 | ||||
| -rw-r--r-- | src/Q9/Number.java | 2 | ||||
| -rw-r--r-- | src/Q9/NumberTest.java | 3 |
22 files changed, 36 insertions, 22 deletions
diff --git a/src/Q1/AddressBook.java b/src/Q1/AddressBook.java index 44183d0..4b69d18 100644 --- a/src/Q1/AddressBook.java +++ b/src/Q1/AddressBook.java @@ -3,7 +3,7 @@ * * @author: mo khan Student ID: 3431709 Date: May 6, 2019 Version 1.0 */ -package ca.mokhan.comp268; +package Q1; import java.util.Objects; diff --git a/src/Q1/AddressBookTest.java b/src/Q1/AddressBookTest.java index 785c799..b75d1d1 100644 --- a/src/Q1/AddressBookTest.java +++ b/src/Q1/AddressBookTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q1.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q10/TaxReturn.java b/src/Q10/TaxReturn.java index 9d486bf..ceda632 100644 --- a/src/Q10/TaxReturn.java +++ b/src/Q10/TaxReturn.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q10; import java.util.Scanner; diff --git a/src/Q10/TaxReturnTest.java b/src/Q10/TaxReturnTest.java index fceac6c..bb75097 100644 --- a/src/Q10/TaxReturnTest.java +++ b/src/Q10/TaxReturnTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q10.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q2/BonusOnSavings.java b/src/Q2/BonusOnSavings.java index fb9ff19..d2e8199 100644 --- a/src/Q2/BonusOnSavings.java +++ b/src/Q2/BonusOnSavings.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q2; public class BonusOnSavings { double annualRate = 0.0; diff --git a/src/Q2/BonusOnSavingsTest.java b/src/Q2/BonusOnSavingsTest.java index 797794a..91198fd 100644 --- a/src/Q2/BonusOnSavingsTest.java +++ b/src/Q2/BonusOnSavingsTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q2.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q3/CartesianCoordinateSystem.java b/src/Q3/CartesianCoordinateSystem.java index 5777c3c..b825cc2 100644 --- a/src/Q3/CartesianCoordinateSystem.java +++ b/src/Q3/CartesianCoordinateSystem.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q3; public class CartesianCoordinateSystem { public double calculateDistance(double x1, double y1, double x2, double y2) { diff --git a/src/Q3/CartesianCoordinateSystemTest.java b/src/Q3/CartesianCoordinateSystemTest.java index 0021d51..9906323 100644 --- a/src/Q3/CartesianCoordinateSystemTest.java +++ b/src/Q3/CartesianCoordinateSystemTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q3.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q4/BanffMarathonRunner.java b/src/Q4/BanffMarathonRunner.java index 765d505..36856a8 100644 --- a/src/Q4/BanffMarathonRunner.java +++ b/src/Q4/BanffMarathonRunner.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package Q4; +import Q1.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/Q4/BanffMarathonRunnerTest.java b/src/Q4/BanffMarathonRunnerTest.java index 1c0c3e1..b364457 100644 --- a/src/Q4/BanffMarathonRunnerTest.java +++ b/src/Q4/BanffMarathonRunnerTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q4.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q5/EmployeeSavings.java b/src/Q5/EmployeeSavings.java index dabdabf..d62fe50 100644 --- a/src/Q5/EmployeeSavings.java +++ b/src/Q5/EmployeeSavings.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package Q5; +import Q1.*; import java.util.ArrayList; import java.util.Currency; import java.util.Locale; diff --git a/src/Q5/EmployeeSavingsTest.java b/src/Q5/EmployeeSavingsTest.java index 1cd7989..a85ab32 100644 --- a/src/Q5/EmployeeSavingsTest.java +++ b/src/Q5/EmployeeSavingsTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q5.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q6/Triangle.java b/src/Q6/Triangle.java index 1b8d732..6b3b6ce 100644 --- a/src/Q6/Triangle.java +++ b/src/Q6/Triangle.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q6; public class Triangle { public static double NULL = 0.0; diff --git a/src/Q6/TriangleTest.java b/src/Q6/TriangleTest.java index 713f3a4..8f4e035 100644 --- a/src/Q6/TriangleTest.java +++ b/src/Q6/TriangleTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q6.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q7/HailstoneSequence.java b/src/Q7/HailstoneSequence.java index bfff7b8..d080418 100644 --- a/src/Q7/HailstoneSequence.java +++ b/src/Q7/HailstoneSequence.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q7; import java.util.ArrayList; diff --git a/src/Q7/HailstoneSequenceTest.java b/src/Q7/HailstoneSequenceTest.java index 44d333e..8b35662 100644 --- a/src/Q7/HailstoneSequenceTest.java +++ b/src/Q7/HailstoneSequenceTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q7.*; import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/Q8/Candidate.java b/src/Q8/Candidate.java index ee56804..fbe4b7b 100644 --- a/src/Q8/Candidate.java +++ b/src/Q8/Candidate.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package Q8; +import Q1.*; import java.util.ArrayList; public class Candidate extends AddressBook { diff --git a/src/Q8/CandidateTest.java b/src/Q8/CandidateTest.java index 79e5e02..56513b8 100644 --- a/src/Q8/CandidateTest.java +++ b/src/Q8/CandidateTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q8.*; import java.util.ArrayList; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/Q8/Communication.java b/src/Q8/Communication.java index bf01f79..1fd3002 100644 --- a/src/Q8/Communication.java +++ b/src/Q8/Communication.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q8; public class Communication implements Comparable<Communication> { private String name; diff --git a/src/Q8/CommunicationTest.java b/src/Q8/CommunicationTest.java index 041f6ab..c2bdfa3 100644 --- a/src/Q8/CommunicationTest.java +++ b/src/Q8/CommunicationTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q8.*; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/Q9/Number.java b/src/Q9/Number.java index 3a516d2..7092e26 100644 --- a/src/Q9/Number.java +++ b/src/Q9/Number.java @@ -1,4 +1,4 @@ -package ca.mokhan.comp268; +package Q9; import java.util.ArrayList; diff --git a/src/Q9/NumberTest.java b/src/Q9/NumberTest.java index e4b6ca1..7e012d1 100644 --- a/src/Q9/NumberTest.java +++ b/src/Q9/NumberTest.java @@ -1,5 +1,6 @@ -package ca.mokhan.comp268; +package ca.mokhan.test; +import Q9.Number; import java.util.ArrayList; import java.util.Arrays; import java.util.List; |
