Finished the exercises

fff2e6e3 · Kloosterboer, W.A. (Walter, Student B-BIT) · 675d013f · fff2e6e3 · fff2e6e3 · fff2e6e3
Commit fff2e6e3 authored 1 year ago by Kloosterboer, W.A. (Walter, Student B-BIT)
--- a/.idea/webContexts.xml
+++ b/.idea/webContexts.xml
+<?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
--- 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>");
  }

--- 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
--- 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>

--- a/src/test/java/nl/utwente/di/bookQuote/TestCalculator.java
+++ b/src/test/java/nl/utwente/di/bookQuote/TestCalculator.java
-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;