diff --git a/.idea/webContexts.xml b/.idea/webContexts.xml new file mode 100644 index 0000000000000000000000000000000000000000..3c9fffa476c396e1b098be31e4a164ad9bd5d73f --- /dev/null +++ b/.idea/webContexts.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="WebContextManager"> + <option name="state"> + <map> + <entry key="file://$PROJECT_DIR$/src/main/webapp" value="file://$PROJECT_DIR$/src/main/webapp" /> + </map> + </option> + </component> +</project> \ No newline at end of file diff --git a/src/main/java/nl/utwente/di/temperatureCalculator/TemperatureCalculator.java b/src/main/java/nl/utwente/di/temperatureCalculator/TemperatureCalculator.java index d513894963a4791534d6e887f2cd2bce8bee51ad..6b04ecd89f007198d5edcdf0a914521f08e33dee 100644 --- a/src/main/java/nl/utwente/di/temperatureCalculator/TemperatureCalculator.java +++ b/src/main/java/nl/utwente/di/temperatureCalculator/TemperatureCalculator.java @@ -4,8 +4,6 @@ import java.io.*; import jakarta.servlet.*; import jakarta.servlet.http.*; -/** Example of a Servlet that gets an ISBN number and returns the book price - */ public class TemperatureCalculator extends HttpServlet { private static final long serialVersionUID = 1L; @@ -32,9 +30,9 @@ public class TemperatureCalculator extends HttpServlet { "</HEAD>\n" + "<BODY BGCOLOR=\"#FDF5E6\">\n" + "<H1>" + title + "</H1>\n" + - " <P>ISBN number: " + + " <P>Temperature in Celsius: " + request.getParameter("temperature") + "\n" + - " <P>Price: " + + " <P>Temperature in Fahrenheit: " + calculator.getTemperature(request.getParameter("temperature")) + "</BODY></HTML>"); } diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 76bb957c90577eae39c48ebff26d8d3ebc3a1977..5ab6d3ac47244180ec9c7301105c12d7f0c04a77 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -5,7 +5,7 @@ https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" version="6.0"> - <display-name>di.Temperature</display-name> + <display-name>di.TemperatureCalculator</display-name> <welcome-file-list> <welcome-file>index.html</welcome-file> @@ -18,11 +18,11 @@ <servlet> <description>Temperature Servlet</description> <display-name>Temperature</display-name> - <servlet-name>Temperature</servlet-name> + <servlet-name>TemperatureCalculator</servlet-name> <servlet-class>nl.utwente.di.temperatureCalculator.TemperatureCalculator</servlet-class> </servlet> <servlet-mapping> - <servlet-name>Temperature</servlet-name> - <url-pattern>/Temperature</url-pattern> + <servlet-name>TemperatureCalculator</servlet-name> + <url-pattern>/temperatureCalculator</url-pattern> </servlet-mapping> </web-app> \ No newline at end of file diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 0282b0f7c870bcb6cd48695b7e281f1dd4c72ff8..cdde29ebd2b6672a9644bd67155539d092bbba89 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -11,7 +11,7 @@ <body> <h1>Celsius to Fahrenheit Calculator</h1> -<form ACTION="./temperatureCalculator"> +<form ACTION="./TemperatureCalculator"> <p>Enter temperature in Celsius: <input TYPE="TEXT" NAME="temperature"></p> <input TYPE="SUBMIT"> </form> diff --git a/src/test/java/nl/utwente/di/bookQuote/TestCalculator.java b/src/test/java/nl/utwente/di/temperatureCalculator/TestCalculator.java similarity index 79% rename from src/test/java/nl/utwente/di/bookQuote/TestCalculator.java rename to src/test/java/nl/utwente/di/temperatureCalculator/TestCalculator.java index c4abfb9b34940b375182a311d775fadd0461db5f..0d0861a42bcac3e5edf06edf0f58dcfd0f709dbc 100644 --- a/src/test/java/nl/utwente/di/bookQuote/TestCalculator.java +++ b/src/test/java/nl/utwente/di/temperatureCalculator/TestCalculator.java @@ -1,6 +1,5 @@ -package nl.utwente.di.bookQuote; +package nl.utwente.di.temperatureCalculator; -import nl.utwente.di.temperatureCalculator.Calculator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test;