From fff2e6e394a3809eafd0cb3cd58fa4c7a056031b Mon Sep 17 00:00:00 2001
From: wkloosterboer <w.a.kloosterboer@student.utwente.nl>
Date: Mon, 1 May 2023 15:04:54 +0200
Subject: [PATCH] Finished the exercises
---
.idea/webContexts.xml | 10 ++++++++++
.../temperatureCalculator/TemperatureCalculator.java | 6 ++----
src/main/webapp/WEB-INF/web.xml | 8 ++++----
src/main/webapp/index.html | 2 +-
.../TestCalculator.java | 3 +--
5 files changed, 18 insertions(+), 11 deletions(-)
create mode 100644 .idea/webContexts.xml
rename src/test/java/nl/utwente/di/{bookQuote => temperatureCalculator}/TestCalculator.java (79%)
diff --git a/.idea/webContexts.xml b/.idea/webContexts.xml
new file mode 100644
index 0000000..3c9fffa
--- /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 d513894..6b04ecd 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 76bb957..5ab6d3a 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 0282b0f..cdde29e 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 c4abfb9..0d0861a 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;
--
GitLab