From eded06804d07ee65c39515e0a194c8abc618b13d Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 10:57:23 -0700 Subject: [PATCH 1/8] Update index.jsp --- webapp/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index b45ef6fec8..8ec1e7bcf2 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1 +1 @@ -Hello, World! \ No newline at end of file +Hello, World! Hi CR7 From 6d5bf566960c65d8d0cff0a8fb02284d009deab4 Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 11:04:40 -0700 Subject: [PATCH 2/8] Update index.jsp --- webapp/src/main/webapp/index.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index 8ec1e7bcf2..9dbc2fca1c 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1 +1,2 @@ Hello, World! Hi CR7 +again From 781d08b0ef0312e458b858a9e846fb66b0110c58 Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 12:42:21 -0700 Subject: [PATCH 3/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index fa26bc76f3..e26d7aa268 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -13,7 +13,7 @@ public Greeter() { } //TODO: Add javadoc comment - public String greet(String someone) { + public String greet(final String someone) { return String.format("Hello, %s!", someone); } } From 5569e2de1da3242d3ae74b11fcbb38d9c34f965d Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 12:43:10 -0700 Subject: [PATCH 4/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index e26d7aa268..bc47db8eca 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -12,7 +12,6 @@ public Greeter() { } - //TODO: Add javadoc comment public String greet(final String someone) { return String.format("Hello, %s!", someone); } From 712c59746c9df8e123f0c669327106b25a345429 Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 12:44:49 -0700 Subject: [PATCH 5/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index bc47db8eca..a92065fb3a 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -11,8 +11,12 @@ public class Greeter { public Greeter() { } - - public String greet(final String someone) { + +/** + *@param someone the name of the preson + *@return greeting string + */ + public final String greet(final String someone) { return String.format("Hello, %s!", someone); } } From d99041da43329e2bad2ed7dba2465877ab6317c1 Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 13:53:20 -0700 Subject: [PATCH 6/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index a92065fb3a..2a934b9597 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -10,8 +10,7 @@ public class Greeter { */ public Greeter() { - } - + } /** *@param someone the name of the preson *@return greeting string From c1befe6d5e5eef6094356b027e385c7dfad66f9e Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 13:55:06 -0700 Subject: [PATCH 7/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index 2a934b9597..f12ac19937 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -11,8 +11,7 @@ public class Greeter { public Greeter() { } -/** - *@param someone the name of the preson +/* *@return greeting string */ public final String greet(final String someone) { From 32ec7ee5ab7971f8a708dd61fdb909d25d089165 Mon Sep 17 00:00:00 2001 From: ahmed1102003 Date: Tue, 8 Aug 2017 13:58:08 -0700 Subject: [PATCH 8/8] Update Greeter.java --- server/src/main/java/com/example/Greeter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/example/Greeter.java b/server/src/main/java/com/example/Greeter.java index f12ac19937..77c351dba2 100644 --- a/server/src/main/java/com/example/Greeter.java +++ b/server/src/main/java/com/example/Greeter.java @@ -11,9 +11,9 @@ public class Greeter { public Greeter() { } -/* - *@return greeting string - */ + /** + * This is a constructor for . + */ public final String greet(final String someone) { return String.format("Hello, %s!", someone); }