diff --git a/pom.xml b/pom.xml
index e79dc04..7307ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,6 @@
jakarta.jakartaee-web-api
10.0.0
provided
-
- org.hibernate.orm
- hibernate-core
- 6.4.5.Final
org.glassfish.jaxb
@@ -39,9 +35,14 @@
jakarta
- com.oracle.database.jdbc
- ojdbc11
- 23.6.0.24.10
+ org.eclipse.persistence
+ eclipselink
+ 4.0.5
+
+
+ org.postgresql
+ postgresql
+ 42.7.5
diff --git a/src/main/java/me/zinch/jsf/model/entities/HitResult.java b/src/main/java/igorrr/jsf/model/entities/HitResult.java
similarity index 93%
rename from src/main/java/me/zinch/jsf/model/entities/HitResult.java
rename to src/main/java/igorrr/jsf/model/entities/HitResult.java
index 36935d5..ee0f593 100644
--- a/src/main/java/me/zinch/jsf/model/entities/HitResult.java
+++ b/src/main/java/igorrr/jsf/model/entities/HitResult.java
@@ -1,4 +1,4 @@
-package me.zinch.jsf.model.entities;
+package igorrr.jsf.model.entities;
public class HitResult {
double x;
diff --git a/src/main/java/me/zinch/jsf/model/entities/ShootResult.java b/src/main/java/igorrr/jsf/model/entities/ShootResult.java
similarity index 91%
rename from src/main/java/me/zinch/jsf/model/entities/ShootResult.java
rename to src/main/java/igorrr/jsf/model/entities/ShootResult.java
index d066c94..5f8803a 100644
--- a/src/main/java/me/zinch/jsf/model/entities/ShootResult.java
+++ b/src/main/java/igorrr/jsf/model/entities/ShootResult.java
@@ -1,4 +1,4 @@
-package me.zinch.jsf.model.entities;
+package igorrr.jsf.model.entities;
import jakarta.inject.Named;
import jakarta.persistence.Entity;
diff --git a/src/main/java/me/zinch/jsf/model/entities/Shoots.java b/src/main/java/igorrr/jsf/model/entities/Shoots.java
similarity index 92%
rename from src/main/java/me/zinch/jsf/model/entities/Shoots.java
rename to src/main/java/igorrr/jsf/model/entities/Shoots.java
index edd9d80..2452b76 100644
--- a/src/main/java/me/zinch/jsf/model/entities/Shoots.java
+++ b/src/main/java/igorrr/jsf/model/entities/Shoots.java
@@ -1,9 +1,8 @@
-package me.zinch.jsf.model.entities;
+package igorrr.jsf.model.entities;
import jakarta.annotation.PostConstruct;
import jakarta.enterprise.context.SessionScoped;
import jakarta.inject.Named;
-import me.zinch.jsf.model.pages.FormState;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/src/main/java/me/zinch/jsf/model/pages/FormState.java b/src/main/java/igorrr/jsf/model/pages/FormState.java
similarity index 73%
rename from src/main/java/me/zinch/jsf/model/pages/FormState.java
rename to src/main/java/igorrr/jsf/model/pages/FormState.java
index b3e72ae..8785132 100644
--- a/src/main/java/me/zinch/jsf/model/pages/FormState.java
+++ b/src/main/java/igorrr/jsf/model/pages/FormState.java
@@ -1,19 +1,19 @@
-package me.zinch.jsf.model.pages;
+package igorrr.jsf.model.pages;
-import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.faces.context.FacesContext;
import jakarta.inject.Inject;
import jakarta.inject.Named;
-import me.zinch.jsf.model.entities.HitResult;
-import me.zinch.jsf.model.entities.ShootResult;
-import me.zinch.jsf.model.entities.Shoots;
-import org.primefaces.PrimeFaces;
+import igorrr.jsf.model.entities.HitResult;
+import igorrr.jsf.model.entities.ShootResult;
+import igorrr.jsf.model.entities.Shoots;
import services.ShootResultService;
import services.ShootService;
import java.io.Serializable;
@Named
-@RequestScoped
+@ApplicationScoped
public class FormState implements Serializable {
@Inject
Shoots shoots;
@@ -23,7 +23,7 @@ public class FormState implements Serializable {
private double X = 0;
private double Y = 0;
- private double R = 4;
+ private double R = 1;
public double getX() {
return X;
@@ -49,6 +49,11 @@ public class FormState implements Serializable {
R = r;
}
+ public void changeX() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ X = Double.parseDouble(context.getExternalContext().getRequestParameterMap().get("value"));
+ }
+
@Override
public String toString() {
return "FormState{" +
diff --git a/src/main/java/services/ShootResultService.java b/src/main/java/services/ShootResultService.java
index 8984e57..4712487 100644
--- a/src/main/java/services/ShootResultService.java
+++ b/src/main/java/services/ShootResultService.java
@@ -6,7 +6,7 @@ import jakarta.inject.Named;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;
-import me.zinch.jsf.model.entities.ShootResult;
+import igorrr.jsf.model.entities.ShootResult;
@Named
@ApplicationScoped
diff --git a/src/main/java/services/ShootService.java b/src/main/java/services/ShootService.java
index b8319c0..c9be7c9 100644
--- a/src/main/java/services/ShootService.java
+++ b/src/main/java/services/ShootService.java
@@ -2,8 +2,8 @@ package services;
public class ShootService {
public static boolean checkShoot(double x, double y, double r) {
- if (x <= 0 && y <= 0 && (x*x + y*y <= r*r/4)) return true;
- if (x >= 0 && y <= 0 && x <= r/2 && y >= -r) return true;
- return x >= 0 && y >= 0 && y <= (-0.5 * x + r / 2);
+ if (x <= 0 && y <= 0 && x >= -r && y >= -r) return true;
+ if (x >= 0 && y <= 0 && x*x + y*y <= r*r) return true;
+ return x <= 0 && y >= 0 && y <= (0.5 * x + r / 2);
}
}
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index f734540..fa41a8e 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -4,19 +4,18 @@
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
version="3.0">
- me.zinch.jsf.model.entities.ShootResult
+ igorrr.jsf.model.entities.ShootResult
-
-
-
-
+
+
+
+
-
-
-
+
+
diff --git a/src/main/webapp/components/head.xhtml b/src/main/webapp/components/head.xhtml
index 50d8e57..089e038 100644
--- a/src/main/webapp/components/head.xhtml
+++ b/src/main/webapp/components/head.xhtml
@@ -9,7 +9,7 @@
ЛАБА 3
diff --git a/src/main/webapp/components/target.xhtml b/src/main/webapp/components/target.xhtml
index 32773fa..d072eff 100644
--- a/src/main/webapp/components/target.xhtml
+++ b/src/main/webapp/components/target.xhtml
@@ -4,16 +4,53 @@
xmlns:h="jakarta.faces.html"
xmlns:ui="jakarta.faces.facelets">
-
-
-