Skip to content
Snippets Groups Projects
Commit 51ca13ed authored by hkarwa2s's avatar hkarwa2s
Browse files

Test

parent 84c674b2
Branches TabelleTestAnhandTutorial
No related tags found
No related merge requests found
Showing
with 85 additions and 53 deletions
<?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>
......@@ -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;
}
......@@ -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();
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
}
}
......@@ -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) {
......
No preview for this file type
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
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment