summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormokha <mokha@cisco.com>2019-05-05 20:03:10 -0600
committermokha <mokha@cisco.com>2019-05-05 20:03:10 -0600
commit72737214a2ff0858c8a47bbafb2225eac919594c (patch)
treec68515377bd0dff1e674b06ee025676f0cc88680
parent7b4cb6a2eef3a0fcde7e998832427c73599e4a0a (diff)
start to setup javadoc
-rw-r--r--pom.xml65
-rw-r--r--src/App.java2
-rw-r--r--src/AppTest.java2
-rw-r--r--src/Q1/AddressBook.java2
-rw-r--r--src/Q1/AddressBookTest.java2
-rw-r--r--src/Q10/TaxReturn.java2
-rw-r--r--src/Q10/TaxReturnTest.java2
-rw-r--r--src/Q2/BonusOnSavings.java2
-rw-r--r--src/Q2/BonusOnSavingsTest.java2
-rw-r--r--src/Q3/CartesianCoordinateSystem.java2
-rw-r--r--src/Q3/CartesianCoordinateSystemTest.java2
-rw-r--r--src/Q4/BanffMarathonRunner.java2
-rw-r--r--src/Q4/BanffMarathonRunnerTest.java2
-rw-r--r--src/Q5/EmployeeSavings.java2
-rw-r--r--src/Q5/EmployeeSavingsTest.java2
-rw-r--r--src/Q6/Triangle.java2
-rw-r--r--src/Q6/TriangleTest.java2
-rw-r--r--src/Q7/HailstoneSequence.java2
-rw-r--r--src/Q7/HailstoneSequenceTest.java2
-rw-r--r--src/Q8/Candidate.java2
-rw-r--r--src/Q8/CandidateTest.java2
-rw-r--r--src/Q8/Communication.java2
-rw-r--r--src/Q8/CommunicationTest.java2
-rw-r--r--src/Q9/Number.java2
-rw-r--r--src/Q9/NumberTest.java2
25 files changed, 62 insertions, 51 deletions
diff --git a/pom.xml b/pom.xml
index 800d635..22872ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>ca.mokhan.assignment1</groupId>
+ <groupId>ca.mokhan.comp268</groupId>
<artifactId>assignment1</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
@@ -11,29 +11,40 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- <!--<scope>test</scope>-->
- </dependency>
- </dependencies>
- <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>src</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>com.coveo</groupId>
- <artifactId>fmt-maven-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
+ <!--<scope>test</scope>-->
+ </dependency>
+ </dependencies>
+ <properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>src</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>com.coveo</groupId>
+ <artifactId>fmt-maven-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </project>
diff --git a/src/App.java b/src/App.java
index 6dc05d2..f7195fe 100644
--- a/src/App.java
+++ b/src/App.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
public class App {
public static void main(String[] args) {
diff --git a/src/AppTest.java b/src/AppTest.java
index f4c16b8..b17310e 100644
--- a/src/AppTest.java
+++ b/src/AppTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q1/AddressBook.java b/src/Q1/AddressBook.java
index 9fcfa82..4d7a7c7 100644
--- a/src/Q1/AddressBook.java
+++ b/src/Q1/AddressBook.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.Objects;
diff --git a/src/Q1/AddressBookTest.java b/src/Q1/AddressBookTest.java
index fc2361d..785c799 100644
--- a/src/Q1/AddressBookTest.java
+++ b/src/Q1/AddressBookTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q10/TaxReturn.java b/src/Q10/TaxReturn.java
index 91a226a..9d486bf 100644
--- a/src/Q10/TaxReturn.java
+++ b/src/Q10/TaxReturn.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.Scanner;
diff --git a/src/Q10/TaxReturnTest.java b/src/Q10/TaxReturnTest.java
index 474f899..fceac6c 100644
--- a/src/Q10/TaxReturnTest.java
+++ b/src/Q10/TaxReturnTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q2/BonusOnSavings.java b/src/Q2/BonusOnSavings.java
index 41090ec..fb9ff19 100644
--- a/src/Q2/BonusOnSavings.java
+++ b/src/Q2/BonusOnSavings.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
public class BonusOnSavings {
double annualRate = 0.0;
diff --git a/src/Q2/BonusOnSavingsTest.java b/src/Q2/BonusOnSavingsTest.java
index e19d447..797794a 100644
--- a/src/Q2/BonusOnSavingsTest.java
+++ b/src/Q2/BonusOnSavingsTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q3/CartesianCoordinateSystem.java b/src/Q3/CartesianCoordinateSystem.java
index d6681f9..5777c3c 100644
--- a/src/Q3/CartesianCoordinateSystem.java
+++ b/src/Q3/CartesianCoordinateSystem.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
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 6696ce1..0021d51 100644
--- a/src/Q3/CartesianCoordinateSystemTest.java
+++ b/src/Q3/CartesianCoordinateSystemTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q4/BanffMarathonRunner.java b/src/Q4/BanffMarathonRunner.java
index afc0472..765d505 100644
--- a/src/Q4/BanffMarathonRunner.java
+++ b/src/Q4/BanffMarathonRunner.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/Q4/BanffMarathonRunnerTest.java b/src/Q4/BanffMarathonRunnerTest.java
index 4b04ae0..1c0c3e1 100644
--- a/src/Q4/BanffMarathonRunnerTest.java
+++ b/src/Q4/BanffMarathonRunnerTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q5/EmployeeSavings.java b/src/Q5/EmployeeSavings.java
index 44eac10..dabdabf 100644
--- a/src/Q5/EmployeeSavings.java
+++ b/src/Q5/EmployeeSavings.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
import java.util.Currency;
diff --git a/src/Q5/EmployeeSavingsTest.java b/src/Q5/EmployeeSavingsTest.java
index 5e9374b..1cd7989 100644
--- a/src/Q5/EmployeeSavingsTest.java
+++ b/src/Q5/EmployeeSavingsTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q6/Triangle.java b/src/Q6/Triangle.java
index cf45ec2..1b8d732 100644
--- a/src/Q6/Triangle.java
+++ b/src/Q6/Triangle.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
public class Triangle {
public static double NULL = 0.0;
diff --git a/src/Q6/TriangleTest.java b/src/Q6/TriangleTest.java
index 7b85c01..713f3a4 100644
--- a/src/Q6/TriangleTest.java
+++ b/src/Q6/TriangleTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q7/HailstoneSequence.java b/src/Q7/HailstoneSequence.java
index b0e3c48..bfff7b8 100644
--- a/src/Q7/HailstoneSequence.java
+++ b/src/Q7/HailstoneSequence.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
diff --git a/src/Q7/HailstoneSequenceTest.java b/src/Q7/HailstoneSequenceTest.java
index 6dc1fea..44d333e 100644
--- a/src/Q7/HailstoneSequenceTest.java
+++ b/src/Q7/HailstoneSequenceTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
import junit.framework.Test;
diff --git a/src/Q8/Candidate.java b/src/Q8/Candidate.java
index 7df9535..ee56804 100644
--- a/src/Q8/Candidate.java
+++ b/src/Q8/Candidate.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
diff --git a/src/Q8/CandidateTest.java b/src/Q8/CandidateTest.java
index 6d2ca5e..79e5e02 100644
--- a/src/Q8/CandidateTest.java
+++ b/src/Q8/CandidateTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
import junit.framework.Test;
diff --git a/src/Q8/Communication.java b/src/Q8/Communication.java
index 2e4c2a8..bf01f79 100644
--- a/src/Q8/Communication.java
+++ b/src/Q8/Communication.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
public class Communication implements Comparable<Communication> {
private String name;
diff --git a/src/Q8/CommunicationTest.java b/src/Q8/CommunicationTest.java
index 675492f..041f6ab 100644
--- a/src/Q8/CommunicationTest.java
+++ b/src/Q8/CommunicationTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/src/Q9/Number.java b/src/Q9/Number.java
index d96274f..3a516d2 100644
--- a/src/Q9/Number.java
+++ b/src/Q9/Number.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
diff --git a/src/Q9/NumberTest.java b/src/Q9/NumberTest.java
index 1ef9d96..e4b6ca1 100644
--- a/src/Q9/NumberTest.java
+++ b/src/Q9/NumberTest.java
@@ -1,4 +1,4 @@
-package ca.mokhan.assignment1;
+package ca.mokhan.comp268;
import java.util.ArrayList;
import java.util.Arrays;