diff --git a/src/main/java/AppWidgetset.gwt.xml b/src/main/java/AppWidgetset.gwt.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04626bb011c978eaf63d9426dd804a8e0010a896
--- /dev/null
+++ b/src/main/java/AppWidgetset.gwt.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.5.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.5.1/distro-source/core/src/gwt-module.dtd">
+<module>
+ <!--
+ Uncomment the following to compile the widgetset for one browser only.
+
+ Multiple browsers can be specified as a comma separated list. The
+ supported user agents at the moment of writing were:
+ ie8,ie9,gecko1_8,safari,opera
+
+ The value gecko1_8 is used for Firefox and safari is used for webkit
+ based browsers including Google Chrome.
+ -->
+ <!-- <set-property name="user.agent" value="safari"/> -->
+
+ <!--
+ To enable SuperDevMode, uncomment this line.
+
+ See https://vaadin.com/wiki/-/wiki/Main/Using%20SuperDevMode for more
+ information and instructions.
+ -->
+ <!-- <set-configuration-property name="devModeRedirectEnabled" value="true" /> -->
+
+
+
+ <inherits name="com.vaadin.DefaultWidgetSet" />
+</module>
diff --git a/src/main/java/org/s4s/dao/KundenDAO.java b/src/main/java/org/s4s/dao/KundenDAO.java
index 6f56bfcb3e70057dc807ab7d8c0873a92860edd9..adeb3287a11f99880d13e63d654534bf9f1819c1 100644
--- a/src/main/java/org/s4s/dao/KundenDAO.java
+++ b/src/main/java/org/s4s/dao/KundenDAO.java
@@ -5,7 +5,7 @@
*/
package org.s4s.dao;
-import org.s4s.modell.objects.dto.Kunde;
+import org.s4s.modell.objects.dto.User;
/**
*
@@ -13,5 +13,5 @@ import org.s4s.modell.objects.dto.Kunde;
*/
public interface KundenDAO {
- Kunde getKundeByCredentials(String username, String password) throws NoSuchUserOrPassword, DAOException;
+ User getUserByCredentials(String username, String password) throws NoSuchUserOrPassword, DAOException;
}
diff --git a/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java b/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java
index 919f1f565803e678d022d4d90b3f4a8d4e9bb6dc..e98ec72bb07c7579633ceedece27aaaf84d664ba 100644
--- a/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java
+++ b/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java
@@ -16,7 +16,7 @@ import org.s4s.services.db.JDBCConnection;
*/
public abstract class AbstractDatabaseClass {
- private JDBCConnection conn = JDBCConnection.getInstance();
+ private final JDBCConnection conn = JDBCConnection.getInstance();
protected ResultSet executeQuery(String sql) throws SQLException {
Statement stat = conn.getStatement();
diff --git a/src/main/java/org/s4s/dao/impl/LoginControl.java b/src/main/java/org/s4s/dao/impl/LoginControl.java
index 7eab3810ec3a24c4975329cf98a179a5f9891a51..39af53bdd10edbf1e18e86dc3deeb339eb592bd1 100644
--- a/src/main/java/org/s4s/dao/impl/LoginControl.java
+++ b/src/main/java/org/s4s/dao/impl/LoginControl.java
@@ -9,7 +9,7 @@ import java.sql.*;
import org.s4s.dao.DAOException;
import org.s4s.dao.KundenDAO;
import org.s4s.dao.NoSuchUserOrPassword;
-import org.s4s.modell.objects.dto.Kunde;
+import org.s4s.modell.objects.dto.User;
/**
*
@@ -18,7 +18,7 @@ import org.s4s.modell.objects.dto.Kunde;
public class LoginControl extends AbstractDatabaseClass implements KundenDAO {
@Override
- public Kunde getKundeByCredentials(String username, String password) throws NoSuchUserOrPassword, DAOException {
+ public User getUserByCredentials(String username, String password) throws NoSuchUserOrPassword, DAOException {
try (ResultSet set = executeQuery("SELECT username, vorname, nachname FROM realm.user WHERE login = " + username
+ " AND password = " + password + ";")) {
if (!set.next()) {
@@ -28,7 +28,7 @@ public class LoginControl extends AbstractDatabaseClass implements KundenDAO {
String nname = set.getString("nachname");
String uname = set.getString("username");
- return new Kunde(vname, nname, uname);
+ return new User(vname, nname, uname);
} catch (SQLException ex) {
throw new DAOException(ex);
diff --git a/src/main/java/org/s4s/gui/views/LoginView.java b/src/main/java/org/s4s/gui/views/LoginView.java
index d38ddee945516ab8d3dbfa0245dffafff2ae6dd3..23d3697e258469ee9c0be36d32abeb7aac3bc82d 100644
--- a/src/main/java/org/s4s/gui/views/LoginView.java
+++ b/src/main/java/org/s4s/gui/views/LoginView.java
@@ -63,7 +63,7 @@ public class LoginView extends VerticalLayout implements View {
String password = passwordField.getValue();
try {
- kundenDAO.getKundeByCredentials(login, password);
+ kundenDAO.getUserByCredentials(login, password);
} catch (NoSuchUserOrPassword ex) {
Notification.show("Fehler", "Login oder Passwort falsch", Notification.Type.ERROR_MESSAGE);
diff --git a/src/main/java/org/s4s/modell/objects/dto/Kunde.java b/src/main/java/org/s4s/modell/objects/dto/User.java
similarity index 87%
rename from src/main/java/org/s4s/modell/objects/dto/Kunde.java
rename to src/main/java/org/s4s/modell/objects/dto/User.java
index 6b0609540a9e37019894d86fc63a521ce739f536..015bab2cd2d1b78b56cc89998b378faf8dbf5356 100644
--- a/src/main/java/org/s4s/modell/objects/dto/Kunde.java
+++ b/src/main/java/org/s4s/modell/objects/dto/User.java
@@ -9,13 +9,13 @@ package org.s4s.modell.objects.dto;
*
* @author Holger
*/
-public class Kunde {
+public class User {
private String vorname;
private String nachname;
private String username;
- public Kunde(String vorname, String nachname, String username) {
+ public User(String vorname, String nachname, String username) {
this.vorname = vorname;
this.nachname = nachname;
this.username = username;
diff --git a/src/main/java/org/s4s/modell/objects/dto/Warenkorb.java b/src/main/java/org/s4s/modell/objects/dto/Warenkorb.java
index 8e80c8c2f0da707ea63cb3b8e19c0afd405be3ef..26df7dccdae4b8dd83305d6682964dfb332f3678 100644
--- a/src/main/java/org/s4s/modell/objects/dto/Warenkorb.java
+++ b/src/main/java/org/s4s/modell/objects/dto/Warenkorb.java
@@ -13,39 +13,45 @@ import java.util.List;
* @author Holger
*/
public class Warenkorb {
-
+
private final List<Product> products;
-
-
- public Warenkorb(){
+ private int anzahl = 0;
+
+ public Warenkorb() {
products = new ArrayList<>();
}
-
- public void add(Product p){
- if(p == null){
+
+ public void add(Product p) {
+ if (p == null) {
throw new NullPointerException("Produkt darf nicht null sein!");
}
+ ++anzahl;
products.add(p);
}
-
- public void remove(Product p){
- if(p == null){
+
+ public void remove(Product p) {
+ if (p == null) {
throw new NullPointerException("Produkt darf nicht null sein!");
}
- if(!products.contains(p)){
+ if (!products.contains(p)) {
throw new IllegalArgumentException("Das Produkt ist nicht im Warenkorb enthalten!");
}
products.remove(p);
+ --anzahl;
}
-
- public double sum(){
- return products.stream().mapToDouble(p-> p.getPrice()).sum();
+
+ public double sum() {
+ return products.stream().mapToDouble(p -> p.getPrice()).sum();
}
-
- public boolean contains(Product p){
- if(p == null){
+
+ public boolean contains(Product p) {
+ if (p == null) {
throw new NullPointerException("Produkt darf nicht null sein!");
}
return products.contains(p);
}
-}
\ No newline at end of file
+
+ public int getAnzahl() {
+ return anzahl;
+ }
+}
diff --git a/src/main/java/org/s4s/services/db/JDBCConnection.java b/src/main/java/org/s4s/services/db/JDBCConnection.java
index f4b335a5216c82e5dc1659bfd4ce80217f490572..bab50cd45de2ca940937d3dbefeebfc828143889 100644
--- a/src/main/java/org/s4s/services/db/JDBCConnection.java
+++ b/src/main/java/org/s4s/services/db/JDBCConnection.java
@@ -18,7 +18,7 @@ public class JDBCConnection {
private static JDBCConnection connection = null;
- private String url = "";
+ private String url = "jdbc:postgresql://dumbo.inf.fh-bonn-rhein-sieg.de/svolle2s";
private Connection conn;
public static JDBCConnection getInstance() {
@@ -44,13 +44,12 @@ public class JDBCConnection {
private void openConnection() {
try {
- if (!this.conn.isClosed()) {
- return;
- }
-
+ // if (!this.conn.isClosed()) {
+ // return;
+ // }
Properties props = new Properties();
- props.setProperty("userLogin", "");
- props.setProperty("password", "");
+ props.setProperty("userLogin", "svolle2s");
+ props.setProperty("password", "svolle2s");
this.conn = DriverManager.getConnection(this.url, props);
} catch (SQLException ex) {
diff --git a/target/classes/org/s4s/MyUI.class b/target/classes/org/s4s/MyUI.class
index 5ff9f4de69e653b2c20be79ae6ebc5b343f275ef..b7c2a3afa945bd0a41c50b09c320e030d3531a00 100644
Binary files a/target/classes/org/s4s/MyUI.class and b/target/classes/org/s4s/MyUI.class differ
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 0b959c4e04f86fb9b7ae5ed03a66f0cd6f4ee914..2c5883f675cfb93063ef62f0607974fbfc870217 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,20 +1,18 @@
-org\s4s\gui\views\KaufbestaetigungView.class
org\s4s\gui\views\PasswortView.class
-org\s4s\modell\objects\dto\Kunde.class
org\s4s\modell\objects\dto\Product.class
-org\s4s\process\controll\exceptions\NoSuchUserOrPassword.class
-org\s4s\process\controll\ProductSearch.class
-org\s4s\gui\views\WarenkorbView.class
org\s4s\gui\views\VerkaeuferbewertungView.class
-org\s4s\gui\views\CheckoutView.class
-org\s4s\gui\views\WelcomeView.class
org\s4s\modell\objects\dto\Warenkorb.class
-org\s4s\gui\views\ShopView.class
org\s4s\MyUI.class
-org\s4s\gui\views\BenutzerkontoView.class
org\s4s\gui\views\ImpressumView.class
org\s4s\gui\views\FaqView.class
-org\s4s\process\controll\LoginControl.class
+org\s4s\gui\views\KaufbestaetigungView.class
+org\s4s\gui\views\WarenkorbView.class
+org\s4s\gui\views\CheckoutView.class
+org\s4s\gui\views\WelcomeView.class
+org\s4s\gui\views\ShopView.class
+org\s4s\dao\DAOException.class
+org\s4s\gui\views\BenutzerkontoView.class
+org\s4s\dao\NoSuchUserOrPassword.class
org\s4s\services\util\Views.class
org\s4s\gui\views\ArtikeldetailsView.class
org\s4s\MyUI$MyUIServlet.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 071d902842dace9a103069594bccda8549e5eb4d..d5ef86ce3e216908225081a34ea0d21d51aafc0e 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,23 +1,25 @@
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\WelcomeView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\ProductDAO.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\PasswortView.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\db\JDBCConnection.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ArtikeldetailsView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\BenutzerkontoView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\CheckoutView.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\FaqView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\WarenkorbView.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\process\controll\ProductSearch.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\KundenDAO.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\process\controll\LoginControl.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\process\controll\exceptions\NoSuchUserOrPassword.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\MyUI.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Product.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ImpressumView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\LoginView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Warenkorb.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\util\Views.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ShopView.java
-C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Kunde.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\AbstractDatabaseClass.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\KaufbestaetigungView.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\ProductSearch.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\DAOException.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\db\JDBCConnection.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\FaqView.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\LoginControl.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Product.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ImpressumView.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\User.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\util\Views.java
+C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\NoSuchUserOrPassword.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\VerkaeuferbewertungView.java