diff --git a/.classpath b/.classpath
index 2846539..1441073 100644
--- a/.classpath
+++ b/.classpath
@@ -1,17 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 4e7e508..32e6c58 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1,2 @@
+/service/
/controller/
diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class
index fe7152f..bdffa41 100644
Binary files a/build/classes/controller/FlamesCheck.class and b/build/classes/controller/FlamesCheck.class differ
diff --git a/build/classes/testing/TestFlamesCheckService.class b/build/classes/testing/TestFlamesCheckService.class
new file mode 100644
index 0000000..45bcb27
Binary files /dev/null and b/build/classes/testing/TestFlamesCheckService.class differ
diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java
index b9b9a0b..ca7f84a 100644
--- a/src/controller/FlamesCheck.java
+++ b/src/controller/FlamesCheck.java
@@ -6,6 +6,7 @@
*/
import java.io.IOException;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
@@ -13,6 +14,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import service.FlamesCheckService;
+
+//There is a link error, your program must be right, Submit it in Git, I will check
@WebServlet("/flames")
@@ -33,35 +37,35 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- /*
- * Uncomment the below code to test your output
- * String name1 = request.getParameter("your");
- * String name2 = request.getParameter("crush");
- *
- * FlamesCheckService fcs = new FlamesCheckService();
- *
- * char k = fcs.findFlames(name1,name2);
- *
- * if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp"
- * ); rd.forward(request, response);
- *
- * } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp")
- * ; rd.forward(request, response);
- *
- * } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
- * "/WEB-INF/views/affection.jsp"); rd.forward(request, response);
- *
- * } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
- * "/WEB-INF/views/marriage.jsp"); rd.forward(request, response);
- *
- * } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp"
- * ); rd.forward(request, response);
- *
- * } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
- * "/WEB-INF/views/siblings.jsp"); rd.forward(request, response);
- *
- * }
- */
+
+
+ String name1 = request.getParameter("your");
+ String name2 = request.getParameter("crush");
+
+ FlamesCheckService fcs = new FlamesCheckService();
+
+ char k = fcs.findFlames(name1,name2);
+
+ if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp"
+ ); rd.forward(request, response);
+
+ } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp")
+ ; rd.forward(request, response);
+
+ } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+ "/WEB-INF/views/affection.jsp"); rd.forward(request, response);
+
+ } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+ "/WEB-INF/views/marriage.jsp"); rd.forward(request, response);
+
+ } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp"
+ ); rd.forward(request, response);
+
+ } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+ "/WEB-INF/views/siblings.jsp"); rd.forward(request, response);
+
+ }
+
}
-}
+}
\ No newline at end of file
diff --git a/src/controller/WebServlet.java b/src/controller/WebServlet.java
new file mode 100644
index 0000000..a171ad4
--- /dev/null
+++ b/src/controller/WebServlet.java
@@ -0,0 +1,5 @@
+package controller;
+
+public @interface WebServlet {
+
+}
diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java
index a8c006a..1a52f1c 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -7,3 +7,86 @@
// You must return only the following values ['f','l','a','m','e','s']
// change the return value at the end of the method corresponding to your return value
+import service.FlamesCheckService;
+
+// Create a class called FlamesCheckService
+public class FlamesCheckService {
+ public char findFlames(String name1, String name2) {
+ StringBuffer str1 = new StringBuffer(name1);
+ StringBuffer str2 = new StringBuffer(name2);
+ int len1 = str1.length();
+ int len2 = str2.length();
+ P: for (int i = 0; i < len1; i++)// label
+ {
+ char a = str1.charAt(i);
+
+ for (int j = 0; j < len2; j++) {
+ char b = str2.charAt(j);
+ if (a == b) {
+
+ str1.deleteCharAt(i);
+ str2.deleteCharAt(j);
+ len1 = str1.length();
+ len2 = str2.length();
+ i = 0;
+ j = 0;
+
+ }
+ }
+
+ }
+
+ int len = len1 + len2;
+ StringBuffer str3 = new StringBuffer("flames");
+ String str4 = new String();
+
+ P: for (int i = 0; i < 5; i++) {
+ int c = -1, d = 0, p = 0;
+
+ for (int j = 1; j <= len; j++) {
+ c++;
+ d++;
+
+ if (c > str3.length() - 1) {
+ char e = str3.charAt(p);
+ if (d == len) {
+ str3.deleteCharAt(p);
+
+ str4 = str3.substring(p, str3.length());
+
+ str3.delete(p, str3.length());
+
+ str3.insert(0, str4);
+
+ break;
+ } else {
+ p++;
+ if (p == str3.length()) {
+ p = 0;
+ }
+ }
+ } else {
+ char e = str3.charAt(c);
+ if (d == len) {
+ str3.deleteCharAt(c);
+
+ str4 = str3.substring(c, str3.length());
+
+ str3.delete(c, str3.length());
+
+ str3.insert(0, str4);
+
+ break;
+ }
+
+ }
+
+ }
+ }
+
+ char result = str3.charAt(0);
+ return result;
+
+ }
+
+}
diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java
index f3b45fe..22c64dc 100644
--- a/src/testing/TestFlamesCheckService.java
+++ b/src/testing/TestFlamesCheckService.java
@@ -8,30 +8,30 @@
public class TestFlamesCheckService {
FlamesCheckService fcs = new FlamesCheckService();
@Test
-// public void testFindFlamesMethod() {
-// String name1 = "Alex";
-// String name2 = "Joylin";
-// char temp = 'a';
-// assertEquals(temp,fcs.findFlames(name1, name2));
-// name1 = "Steffe";
-// name2 = "Bobby";
-// temp = 'm';
-// assertEquals(temp,fcs.findFlames(name1, name2));
-// name1 = "John";
-// name2 = "Jully";
-// temp = 'e';
-// assertEquals(temp,fcs.findFlames(name1, name2));
-// name1 = "George";
-// name2 = "Neythiri";
-// temp = 'l';
-// assertEquals(temp,fcs.findFlames(name1, name2));
-// try {
-// fcs.findFlames(null, null);
-// fcs.findFlames("AAA", null);
-// fcs.findFlames(null, "BBB");
-// }
-// catch(Exception e) {
-// e.printStackTrace();
-// }
-// }
+ public void testFindFlamesMethod() {
+ String name1 = "Alex";
+ String name2 = "Joylin";
+ char temp = 'a';
+ assertEquals(temp,fcs.findFlames(name1, name2));
+ name1 = "Steffe";
+ name2 = "Bobby";
+ temp = 'm';
+ assertEquals(temp,fcs.findFlames(name1, name2));
+ name1 = "John";
+ name2 = "Jully";
+ temp = 'e';
+ assertEquals(temp,fcs.findFlames(name1, name2));
+ name1 = "George";
+ name2 = "Neythiri";
+ temp = 'l';
+ assertEquals(temp,fcs.findFlames(name1, name2));
+ try {
+ fcs.findFlames(null, null);
+ fcs.findFlames("AAA", null);
+ fcs.findFlames(null, "BBB");
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
}