From 56aa561d682a903b46e414c27107849f7db43529 Mon Sep 17 00:00:00 2001 From: - <-> Date: Sun, 7 Apr 2019 23:06:52 -0600 Subject: [PATCH] fix commit --- ...p.pandamonium-theorem-prover.main.kotlin_module | Bin 0 -> 16 bytes ...p.pandamonium-theorem-prover.main.kotlin_module | Bin 0 -> 16 bytes .../tsp/website/controller/forms/Theorem.java | 7 ++++--- src/main/webapp/WEB-INF/jsp/Theorem.jsp | 2 +- src/main/webapp/index.jsp | 2 +- .../controller/TheoremEntryControllerTest.java | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module create mode 100644 out/test/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module diff --git a/out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module b/out/production/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/out/test/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module b/out/test/classes/META-INF/edu.msudenver.tsp.pandamonium-theorem-prover.main.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java b/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java index 7b15b36..ae6687b 100644 --- a/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java +++ b/src/main/java/edu/msudenver/tsp/website/controller/forms/Theorem.java @@ -9,8 +9,9 @@ import javax.validation.constraints.NotBlank; @Setter public class Theorem { private String theoremName1 ; - private String theoremName2 ; - @NotBlank(message = "Theorem name must not be blank") private String theoremName; - private String theorem; + private String theoremName2 ; + + // @NotBlank(message = "Theorem name must not be blank") private String theoremName; + } diff --git a/src/main/webapp/WEB-INF/jsp/Theorem.jsp b/src/main/webapp/WEB-INF/jsp/Theorem.jsp index 8933e48..06a1c35 100644 --- a/src/main/webapp/WEB-INF/jsp/Theorem.jsp +++ b/src/main/webapp/WEB-INF/jsp/Theorem.jsp @@ -4,7 +4,7 @@ -Theroem Page +Theorem Page
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f8d618c..420ac7f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -8,7 +8,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> - $Title$ + abc $END$ diff --git a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java index f71de78..e546943 100644 --- a/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java +++ b/src/test/java/edu/msudenver/tsp/website/controller/TheoremEntryControllerTest.java @@ -32,7 +32,7 @@ public class TheoremEntryControllerTest { assertEquals("Theorem",modelAndView.getViewName()); } - @Test + @Test public void saveTheorem(){ final ModelAndView modelAndView= theoremEntryController.enterTheoremPage(); @@ -40,6 +40,6 @@ public class TheoremEntryControllerTest { assertNotNull(modelAndView); assertEquals("Theorem",modelAndView.getViewName()); } - +// }