From 589fe5096ebe3d50ad8e68f9d1fff8db3a1ea39f Mon Sep 17 00:00:00 2001 From: Christopher Pham Date: Wed, 1 Feb 2017 00:44:56 -0500 Subject: [PATCH 1/5] Implemented calc method in Person5 class --- src/main/java/edu/gatech/oad/antlab/person/Person5.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/gatech/oad/antlab/person/Person5.java b/src/main/java/edu/gatech/oad/antlab/person/Person5.java index 4f3c1a5..6ce6507 100644 --- a/src/main/java/edu/gatech/oad/antlab/person/Person5.java +++ b/src/main/java/edu/gatech/oad/antlab/person/Person5.java @@ -31,7 +31,13 @@ public Person5(String pname) { */ private String calc(String input) { //Person 5 put your implementation here - return null; + result = ""; + for(int i = 2; i < input.length(); i++) + { + result = result + charAt(i); + } + result = result + charAt(0) + charAt(1); + return result; } /** From 595ce653a9d371cb0bddaf31de1e7b65f5cd63fb Mon Sep 17 00:00:00 2001 From: Christopher Pham Date: Wed, 1 Feb 2017 00:45:24 -0500 Subject: [PATCH 2/5] Inserted name and gtid. --- src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java b/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java index 9d787ad..4e1f575 100644 --- a/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java +++ b/src/main/java/edu/gatech/oad/antlab/pkg1/AntLabMain.java @@ -73,8 +73,8 @@ public void printOutMessage() { toPrint += p4.toString("lwang430"); //Person5 replace P4 with your name //and gburdell5 with your gt id - Person5 p5 = new Person5("P5"); - toPrint += p5.toString("gburdell5"); + Person5 p5 = new Person5("Christopher Pham"); + toPrint += p5.toString("cpham30"); System.out.println(toPrint); From 781cb290ac9611f023e38b1bec50f2c124a1c433 Mon Sep 17 00:00:00 2001 From: Christopher Pham Date: Wed, 1 Feb 2017 00:47:52 -0500 Subject: [PATCH 3/5] Added Chris's readme. --- readme.p5.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 readme.p5.txt diff --git a/readme.p5.txt b/readme.p5.txt new file mode 100644 index 0000000..d068b54 --- /dev/null +++ b/readme.p5.txt @@ -0,0 +1,2 @@ +Christopher Pham +cpham30@gatech.edu \ No newline at end of file From fe59269e55d7c13dc89e8b9f6c56b2029146ec7d Mon Sep 17 00:00:00 2001 From: cpham30 Date: Wed, 1 Feb 2017 09:12:11 -0500 Subject: [PATCH 4/5] Removed useless.p5.txt --- useless.p5.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 useless.p5.txt diff --git a/useless.p5.txt b/useless.p5.txt deleted file mode 100644 index afeda10..0000000 --- a/useless.p5.txt +++ /dev/null @@ -1 +0,0 @@ -Last bit of useless stuff \ No newline at end of file From 119672e3e589e0386bf595e845c924e7dbc853e4 Mon Sep 17 00:00:00 2001 From: cpham30 Date: Wed, 1 Feb 2017 15:26:53 -0500 Subject: [PATCH 5/5] Added cpham30.gradle and fixed compiler errors in Person5.java --- cpham30.gradle | 17 +++++++++++++++++ .../edu/gatech/oad/antlab/person/Person5.java | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 cpham30.gradle diff --git a/cpham30.gradle b/cpham30.gradle new file mode 100644 index 0000000..59f1671 --- /dev/null +++ b/cpham30.gradle @@ -0,0 +1,17 @@ + + +defaultTasks 'jar' + +apply plugin: 'java' + +dependencies { + compile files('lib/resources.jar') +} + +jar { + manifest { + attributes 'Main-Class' : 'edu.gatech.oad.antlab.pkg1.AntLabMain', + 'Class-Path' : '../../lib/resources.jar' + + } +} \ No newline at end of file diff --git a/src/main/java/edu/gatech/oad/antlab/person/Person5.java b/src/main/java/edu/gatech/oad/antlab/person/Person5.java index 6ce6507..1616caa 100644 --- a/src/main/java/edu/gatech/oad/antlab/person/Person5.java +++ b/src/main/java/edu/gatech/oad/antlab/person/Person5.java @@ -31,12 +31,12 @@ public Person5(String pname) { */ private String calc(String input) { //Person 5 put your implementation here - result = ""; + String result = ""; for(int i = 2; i < input.length(); i++) { - result = result + charAt(i); + result = result + input.charAt(i); } - result = result + charAt(0) + charAt(1); + result = result + input.charAt(0) + input.charAt(1); return result; }