Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
2
20240528-BJava
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Patryk Czarnik
20240528-BJava
Commits
2606664f
Commit
2606664f
authored
Jun 11, 2024
by
Patryk Czarnik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Kalkulator - wersje 1 i 2 z arkuszem stylu
parent
7bf8d917
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
163 additions
and
14 deletions
+163
-14
pom.xml
PC23-Serwlety/pom.xml
+10
-14
Kalkulator1.java
...rwlety/src/main/java/serwlety/kalkulator/Kalkulator1.java
+49
-0
Kalkulator2.java
...rwlety/src/main/java/serwlety/kalkulator/Kalkulator2.java
+68
-0
styl.css
PC23-Serwlety/src/main/webapp/styl.css
+36
-0
No files found.
PC23-Serwlety/pom.xml
View file @
2606664f
...
@@ -18,31 +18,26 @@
...
@@ -18,31 +18,26 @@
</properties>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
jakarta.servlet
</groupId>
<groupId>
jakarta.servlet
</groupId>
<artifactId>
jakarta.servlet-api
</artifactId>
<artifactId>
jakarta.servlet-api
</artifactId>
<version>
6.0.0
</version>
<version>
6.0.0
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
${junit.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<groupId>
org.apache.commons
</groupId>
<artifactId>
junit-jupiter-engine
</artifactId>
<artifactId>
commons-lang3
</artifactId>
<version>
${junit.version}
</version>
<version>
3.14.0
</version>
<
scope>
test
</scope
>
<
/dependency
>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
<plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-war-plugin
</artifactId>
<artifactId>
maven-war-plugin
</artifactId>
<version>
3.4.0
</version>
<version>
3.4.0
</version>
</plugin>
</plugins>
</plugin>
</plugins>
</build>
</build>
</project>
</project>
\ No newline at end of file
PC23-Serwlety/src/main/java/serwlety/kalkulator/Kalkulator1.java
0 → 100644
View file @
2606664f
package
serwlety
.
kalkulator
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
jakarta.servlet.ServletException
;
import
jakarta.servlet.annotation.WebServlet
;
import
jakarta.servlet.http.HttpServlet
;
import
jakarta.servlet.http.HttpServletRequest
;
import
jakarta.servlet.http.HttpServletResponse
;
@WebServlet
(
"/kalkulator1"
)
public
class
Kalkulator1
extends
HttpServlet
{
protected
void
doGet
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
ServletException
,
IOException
{
response
.
setContentType
(
"text/html"
);
response
.
setCharacterEncoding
(
"UTF-8"
);
PrintWriter
out
=
response
.
getWriter
();
out
.
println
(
"<!DOCTYPE html>"
);
out
.
println
(
"<html><head>"
);
out
.
println
(
"<title>Kalkulator serwletowy</title>"
);
out
.
println
(
"</head>"
);
out
.
println
(
"<body>"
);
out
.
println
(
"<h1>Kalkulator</h1>"
);
out
.
println
(
"<form>"
);
out
.
println
(
"<label for='liczba1'>Liczba 1:</label>"
);
out
.
println
(
"<input type='number' name='liczba1'>"
);
out
.
println
(
"<label for='liczba2'>Liczba 2:</label>"
);
out
.
println
(
"<input type='number' name='liczba2'>"
);
out
.
println
(
"<button>Dodaj</button>"
);
out
.
println
(
"</form>"
);
String
parametr1
=
request
.
getParameter
(
"liczba1"
);
String
parametr2
=
request
.
getParameter
(
"liczba2"
);
if
(
parametr1
!=
null
&&
parametr2
!=
null
)
{
try
{
long
liczba1
=
Long
.
parseLong
(
parametr1
);
long
liczba2
=
Long
.
parseLong
(
parametr2
);
long
wynik
=
liczba1
+
liczba2
;
out
.
println
(
"<div>"
+
liczba1
+
" + "
+
liczba2
+
" = "
+
wynik
+
"</p>"
);
}
catch
(
Exception
e
)
{
out
.
println
(
"<div>Błąd: "
+
e
+
"</div>"
);
}
}
out
.
println
(
"</body>"
);
out
.
println
(
"</html>"
);
}
}
PC23-Serwlety/src/main/java/serwlety/kalkulator/Kalkulator2.java
0 → 100644
View file @
2606664f
package
serwlety
.
kalkulator
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
org.apache.commons.lang3.StringUtils
;
import
jakarta.servlet.ServletException
;
import
jakarta.servlet.annotation.WebServlet
;
import
jakarta.servlet.http.HttpServlet
;
import
jakarta.servlet.http.HttpServletRequest
;
import
jakarta.servlet.http.HttpServletResponse
;
@WebServlet
(
"/kalkulator2"
)
public
class
Kalkulator2
extends
HttpServlet
{
@Override
protected
void
doGet
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
ServletException
,
IOException
{
response
.
setContentType
(
"text/html"
);
response
.
setCharacterEncoding
(
"UTF-8"
);
PrintWriter
out
=
response
.
getWriter
();
out
.
println
(
"<!DOCTYPE html>"
);
out
.
println
(
"<html><head>"
);
out
.
println
(
"<title>Kalkulator serwletowy</title>"
);
out
.
println
(
"<link rel='stylesheet' type='text/css' href='styl.css'>"
);
out
.
println
(
"</head>"
);
out
.
println
(
"<body>"
);
out
.
println
(
"<h1>Kalkulator</h1>"
);
out
.
println
(
"<form>"
);
out
.
println
(
"<input type='number' name='liczba1'>"
);
out
.
println
(
"<select name='operacja'>"
);
out
.
println
(
"<option value='+'>+</option>"
);
out
.
println
(
"<option value='-'>-</option>"
);
out
.
println
(
"<option value='*'>*</option>"
);
out
.
println
(
"<option value='/'>/</option>"
);
out
.
println
(
"</select>"
);
out
.
println
(
"<input type='number' name='liczba2'>"
);
out
.
println
(
"<button>Oblicz</button>"
);
out
.
println
(
"</form>"
);
String
param1
=
request
.
getParameter
(
"liczba1"
);
String
param2
=
request
.
getParameter
(
"liczba2"
);
String
operacja
=
request
.
getParameter
(
"operacja"
);
if
(
StringUtils
.
isNoneBlank
(
param1
,
param2
,
operacja
))
{
try
{
long
liczba1
=
Long
.
parseLong
(
param1
);
long
liczba2
=
Long
.
parseLong
(
param2
);
long
wynik
=
switch
(
operacja
)
{
case
"+"
->
liczba1
+
liczba2
;
case
"-"
->
liczba1
-
liczba2
;
case
"*"
->
liczba1
*
liczba2
;
case
"/"
->
liczba1
/
liczba2
;
default
->
throw
new
IllegalArgumentException
(
"Nieznane działanie: "
+
operacja
);
};
out
.
printf
(
"<div class='wynik'>%d %s %d = <strong>%d</strong></div>\n"
,
liczba1
,
operacja
,
liczba2
,
wynik
);
}
catch
(
NumberFormatException
e
)
{
out
.
printf
(
"<div class='error'>Niepoprawny format liczby</div>\n"
);
}
catch
(
Exception
e
)
{
out
.
printf
(
"<div class='error'>Błąd: %s</div>\n"
,
e
.
getMessage
());
}
}
out
.
println
(
"</body>"
);
out
.
println
(
"</html>"
);
}
}
PC23-Serwlety/src/main/webapp/styl.css
0 → 100644
View file @
2606664f
body
{
background-color
:
#FFFFDD
;
}
h1
{
text-align
:
center
;
color
:
blue
;
}
form
{
width
:
600px
;
background-color
:
#AAEEFF
;
margin
:
2em
auto
;
padding
:
0.75em
;
border
:
4px
solid
blue
;
}
.wynik
{
width
:
600px
;
background-color
:
#CCFFDD
;
margin
:
2em
auto
;
padding
:
0.75em
;
border
:
4px
outset
green
;
}
.error
{
width
:
600px
;
background-color
:
white
;
color
:
red
;
margin
:
2em
auto
;
padding
:
0.75em
;
border
:
4px
double
red
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment