diff --git a/nbactions.xml b/nbactions.xml index 921ab9ca91e096cfca383820a1770330732b1e62..86d7b89b28a64f420183051a9c85fe901b4369b1 100644 --- a/nbactions.xml +++ b/nbactions.xml @@ -11,4 +11,26 @@ <goal>jetty:run</goal> </goals> </action> + <action> + <actionName>debug</actionName> + <packagings> + <packaging>war</packaging> + <packaging>ear</packaging> + <packaging>ejb</packaging> + </packagings> + <goals> + <goal>jetty:run</goal> + </goals> + <properties> + <netbeans.deploy.debugmode>true</netbeans.deploy.debugmode> + <jpda.listen>maven</jpda.listen> + </properties> + </action> + <action> + <actionName>CUSTOM-Sonarqube</actionName> + <displayName>Sonarqube</displayName> + <goals> + <goal>sonar:sonar</goal> + </goals> + </action> </actions> diff --git a/src/main/java/org/s4s/dao/KundenDAO.java b/src/main/java/org/s4s/dao/KundenDAO.java index 7470823a8a09601581eeb4a0c36ca80857782a50..1e9085f0fe41e63e0e689801ebbd1116921afc89 100644 --- a/src/main/java/org/s4s/dao/KundenDAO.java +++ b/src/main/java/org/s4s/dao/KundenDAO.java @@ -1,12 +1,7 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao; -import org.s4s.exceptions.NoSuchUserOrPassword; import org.s4s.exceptions.DAOException; +import org.s4s.exceptions.NoSuchUserOrPassword; import org.s4s.modell.dto.User; /** diff --git a/src/main/java/org/s4s/dao/ProductDAO.java b/src/main/java/org/s4s/dao/ProductDAO.java index 8539e13a8b000b5d4e788e79114d2a802c37bde6..ceaefd370c6a11c1129bee03f485fcfd25476af1 100644 --- a/src/main/java/org/s4s/dao/ProductDAO.java +++ b/src/main/java/org/s4s/dao/ProductDAO.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao; import java.util.List; diff --git a/src/main/java/org/s4s/dao/RegistrationDAO.java b/src/main/java/org/s4s/dao/RegistrationDAO.java index cdc41f3b72389ea1de0bd4fead3fb6cd02efaef8..79b576a06eb22a3f97b6104f42b49969c52449c8 100644 --- a/src/main/java/org/s4s/dao/RegistrationDAO.java +++ b/src/main/java/org/s4s/dao/RegistrationDAO.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao; import java.sql.*; @@ -15,24 +10,24 @@ import org.s4s.services.db.JDBCConnection; * @author Simon */ public class RegistrationDAO extends AbstractDatabaseClass { - + Statement st = JDBCConnection.getInstance().getStatement(); String sql_update; - + public void addUser(String benutzer, String nachname, String vorname, java.util.Date gebDate, int fBereich, String email, String emailwdh, String passwort, String passwortWdh) { try { - sql_update = "INSERT INTO \"ERR\".\"user\"(benutzername, nachname, vorname, geburtsdatum, fachbreichid, email, passwort)" + - "VALUES(\'" + benutzer + "\', \'" + nachname + "\', \'" + vorname + "\', \'" + gebDate + "\', \'" + fBereich + "\', \'" + email + "\', \'" + passwort + "\')"; - + sql_update = "INSERT INTO \"ERR\".\"user\"(benutzername, nachname, vorname, geburtsdatum, fachbreichid, email, passwort)" + + "VALUES(\'" + benutzer + "\', \'" + nachname + "\', \'" + vorname + "\', \'" + gebDate + "\', \'" + fBereich + "\', \'" + email + "\', \'" + passwort + "\')"; + int exe = st.executeUpdate(sql_update); - if(exe < 0) { + if (exe < 0) { throw new WrongInputException("Wrong Input!"); } - + } catch (Exception ex) { ex.printStackTrace(); System.out.println("Exception occur: " + ex); } - + } } diff --git a/src/main/java/org/s4s/dao/ShopDAO.java b/src/main/java/org/s4s/dao/ShopDAO.java index 252742ee951eaa595da644830e7e637935c425a0..428185361cd82d192a60f9fd9eb8d141e0f07587 100644 --- a/src/main/java/org/s4s/dao/ShopDAO.java +++ b/src/main/java/org/s4s/dao/ShopDAO.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao; import java.sql.ResultSet; @@ -18,10 +13,12 @@ import org.s4s.services.db.JDBCConnection; * @author Benjamin */ public class ShopDAO { + public static ShopDAO dao = null; private final Statement statement = JDBCConnection.getInstance().getStatement(); + private ShopDAO() { - + } public static ShopDAO getInstance() { @@ -30,14 +27,14 @@ public class ShopDAO { } return dao; } - + //Shop anhand von User/Besitzer auslesen - public boolean viewShop (User user) { + public boolean viewShop(User user) { boolean result = true; try { ResultSet set = statement.executeQuery("SELECT *" - + "FROM ERR.shop" - + "WHERE besitzer = \'" + user.getBenutzername() + "\'"); + + "FROM ERR.shop" + + "WHERE besitzer = \'" + user.getBenutzername() + "\'"); if (set != null) { result = false; @@ -47,20 +44,20 @@ public class ShopDAO { } return result; } - - public boolean addShop (User user, String shopName, String shopDescription) { + + public boolean addShop(User user, String shopName, String shopDescription) { //Shop via Benutzername anlegen da dieser idR eindeutig ist try { // vorausgesetzt ID wird automatisch gesetzt von der DB - statement.execute("INSERT INTO ERR.shop (name, besitzer, beschreibung) VALUES (" - + shopName + "," - + user.getBenutzername() + "," + statement.execute("INSERT INTO ERR.shop (name, besitzer, beschreibung) VALUES (" + + shopName + "," + + user.getBenutzername() + "," + shopDescription + ");"); return true; } catch (SQLException ex) { Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex); return false; } - + } } diff --git a/src/main/java/org/s4s/dao/ShopSearchDAO.java b/src/main/java/org/s4s/dao/ShopSearchDAO.java index a249379bcb291527e1c65db74fd738c6a21d20c8..d9d5b7972772e1c2cd878f37fe326a4ec203cc12 100644 --- a/src/main/java/org/s4s/dao/ShopSearchDAO.java +++ b/src/main/java/org/s4s/dao/ShopSearchDAO.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao; import java.util.List; diff --git a/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java b/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java index 8f2a8bfa88ec00086b2cef2bf11e4ac288d66adc..6b80843ae3d25d13beab6f24e4660ea1f358c746 100644 --- a/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java +++ b/src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.dao.impl; import java.sql.ResultSet; @@ -28,12 +23,11 @@ public abstract class AbstractDatabaseClass { stat.closeOnCompletion(); return set; } - + /*protected int executeUpdate(String sql) throws SQLException { Statement stat = conn.getStatement(); int set = stat.executeUpdate(sql); stat.closeOnCompletion(); return set; }*/ - } diff --git a/src/main/java/org/s4s/exceptions/DAOException.java b/src/main/java/org/s4s/exceptions/DAOException.java index c5665929a2b02d0ae2d4747eda1eabf256fa4f37..32721078faaa1db0341550472cfa6b561c496dfc 100644 --- a/src/main/java/org/s4s/exceptions/DAOException.java +++ b/src/main/java/org/s4s/exceptions/DAOException.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.exceptions; /** diff --git a/src/main/java/org/s4s/exceptions/NoSuchProduct.java b/src/main/java/org/s4s/exceptions/NoSuchProduct.java index dbb9a78c298809923de08977a23fe189d0924d95..3abdd896a5e945984e9188695bf31930f68b7b4d 100644 --- a/src/main/java/org/s4s/exceptions/NoSuchProduct.java +++ b/src/main/java/org/s4s/exceptions/NoSuchProduct.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.exceptions; /** diff --git a/src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.java b/src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.java index b0a77e638b2663bf037f1c174f40a4068ff0312a..631dae37700e6f473368d5d2d32118e048129a39 100644 --- a/src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.java +++ b/src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.exceptions; /** diff --git a/src/main/java/org/s4s/exceptions/OwnsAlreadyShop.java b/src/main/java/org/s4s/exceptions/OwnsAlreadyShop.java index e7ea93de0b5d8f0ecb611f6f3457ac5272946b91..be7f3daadbfdf36d16e9537d4577e7635893fef0 100644 --- a/src/main/java/org/s4s/exceptions/OwnsAlreadyShop.java +++ b/src/main/java/org/s4s/exceptions/OwnsAlreadyShop.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.exceptions; /** @@ -20,9 +15,9 @@ public class OwnsAlreadyShop extends Exception { public void setReason(String reason) { this.reason = reason; } - - public OwnsAlreadyShop (String reason) { + + public OwnsAlreadyShop(String reason) { this.reason = reason; } - + } diff --git a/src/main/java/org/s4s/exceptions/WrongInputException.java b/src/main/java/org/s4s/exceptions/WrongInputException.java index 21646e16139436662a52f472d9b6e4750ce0c226..fe5857e1c52231f3068016c5c49e76d3bc7f4720 100644 --- a/src/main/java/org/s4s/exceptions/WrongInputException.java +++ b/src/main/java/org/s4s/exceptions/WrongInputException.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.exceptions; /** @@ -10,8 +5,9 @@ package org.s4s.exceptions; * @author Simon */ public class WrongInputException extends Exception { + String reason = null; - + public String getReason() { return reason; } @@ -19,6 +15,7 @@ public class WrongInputException extends Exception { public void setReason(String reason) { this.reason = reason; } + public WrongInputException(String reason) { this.reason = reason; } diff --git a/src/main/java/org/s4s/gui/InitView.java b/src/main/java/org/s4s/gui/InitView.java index 71f695a96c42ba598df5464e8c202280697b77a0..bd210837b552621e2e7c90b148bf0c24c29a2f16 100644 --- a/src/main/java/org/s4s/gui/InitView.java +++ b/src/main/java/org/s4s/gui/InitView.java @@ -47,8 +47,8 @@ public class InitView extends UI { navi.addView(Views.KONTAKTBESTAETIGUNG, Kontaktbestaetigung.class); //Test der RegistrierungsView UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); - setHeight(100f,Unit.PERCENTAGE); - setWidth(100f,Unit.PERCENTAGE); + setHeight(100f, Unit.PERCENTAGE); + setWidth(100f, Unit.PERCENTAGE); //UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG); //this.setWidth(64f, Unit.PERCENTAGE); diff --git a/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java b/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java index 6ec1e3caf79b8057d540b75ebcdf9e56acde352c..7e77a81f35b26d36390e14194e5d8ac6b52171af 100644 --- a/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java +++ b/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java @@ -1,24 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class ArtikeldetailsView extends TemplateView{ +public class ArtikeldetailsView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - } diff --git a/src/main/java/org/s4s/gui/views/BenutzerkontoView.java b/src/main/java/org/s4s/gui/views/BenutzerkontoView.java index b1883a79ad3e013262c85570bfc02465c2d39384..a79010eeb7d48c03c9f4a6d2fbe6f25f200c5fe8 100644 --- a/src/main/java/org/s4s/gui/views/BenutzerkontoView.java +++ b/src/main/java/org/s4s/gui/views/BenutzerkontoView.java @@ -1,23 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class BenutzerkontoView extends TemplateView{ +public class BenutzerkontoView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - + } diff --git a/src/main/java/org/s4s/gui/views/CheckoutView.java b/src/main/java/org/s4s/gui/views/CheckoutView.java index fed2aa2dd585b70a95195825b0aa5af1bdf70cef..46e4b14438a65d8bc708f8e8ed9a437173d61f11 100644 --- a/src/main/java/org/s4s/gui/views/CheckoutView.java +++ b/src/main/java/org/s4s/gui/views/CheckoutView.java @@ -1,23 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class CheckoutView extends TemplateView{ +public class CheckoutView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - + } diff --git a/src/main/java/org/s4s/gui/views/ContactView.java b/src/main/java/org/s4s/gui/views/ContactView.java index 486e59fab3f05c320fd83d8f35ffebd63c26fcf3..1edc4aad38889c3e6cd887dd7860c865622b1fa5 100644 --- a/src/main/java/org/s4s/gui/views/ContactView.java +++ b/src/main/java/org/s4s/gui/views/ContactView.java @@ -3,7 +3,6 @@ package org.s4s.gui.views; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -16,36 +15,35 @@ import org.s4s.services.util.Views; /** * Created by Max-Desktop on 16.05.2017. */ -public class ContactView extends TemplateView{ - +public class ContactView extends TemplateView { + @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } - + public void setUp() { setMargin(true); - + final TextField tfEMail = new TextField("E-Mail"); final TextField tfBetreff = new TextField("Betreff"); final TextArea taNachricht = new TextArea("Ihr Anliegen"); final Button bSenden = new Button("Senden", FontAwesome.SEND); final Label lSpace = new Label(" ", ContentMode.HTML); - + VerticalLayout vLayout = new VerticalLayout(); vLayout.addComponents(tfEMail, tfBetreff, taNachricht, lSpace, bSenden); - + Panel pKontakt = new Panel("Kontakt Anfrage"); // pKontakt.addStyleName("kontakt"); //this.addComponent(pKontakt); //this.setComponentAlignment(pKontakt, Alignment.MIDDLE_CENTER); - - bSenden.addClickListener(e -> - UI.getCurrent().getNavigator().navigateTo(Views.KONTAKTBESTAETIGUNG)); - + bSenden.addClickListener(e + -> UI.getCurrent().getNavigator().navigateTo(Views.KONTAKTBESTAETIGUNG)); + pKontakt.setContent(vLayout); - + super.setUpFooterAndHeader(pKontakt); } } diff --git a/src/main/java/org/s4s/gui/views/FaqView.java b/src/main/java/org/s4s/gui/views/FaqView.java index 0089e9366a3660db8a7e9b08737cc2a662052fec..4607cbe1d1d1523698e18a9c082785a3fd61bdec 100644 --- a/src/main/java/org/s4s/gui/views/FaqView.java +++ b/src/main/java/org/s4s/gui/views/FaqView.java @@ -1,23 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class FaqView extends TemplateView{ +public class FaqView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - + } diff --git a/src/main/java/org/s4s/gui/views/ImpressumView.java b/src/main/java/org/s4s/gui/views/ImpressumView.java index 16992134209629980d18c43f6284b5a799d5a65d..e39dc2ab9402bd2227f6a8db5cab63bc4ebc76d7 100644 --- a/src/main/java/org/s4s/gui/views/ImpressumView.java +++ b/src/main/java/org/s4s/gui/views/ImpressumView.java @@ -1,11 +1,5 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; @@ -15,14 +9,14 @@ import com.vaadin.ui.VerticalLayout; * * @author Holger */ -public class ImpressumView extends TemplateView{ +public class ImpressumView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } - - private void setUp(){ + + private void setUp() { VerticalLayout vertLayout = new VerticalLayout(); vertLayout.setSizeFull(); Label label = new Label("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, " @@ -34,8 +28,7 @@ public class ImpressumView extends TemplateView{ + " At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, " + "no sea takimata sanctus est Lorem ipsum dolor sit amet."); vertLayout.addComponent(label); - vertLayout.setComponentAlignment(label,Alignment.MIDDLE_CENTER); - + vertLayout.setComponentAlignment(label, Alignment.MIDDLE_CENTER); super.setUpFooterAndHeader(vertLayout); diff --git a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java index d23c8ff45c639730e4ca753739dd72b7fdd0d4e9..5687bec6ced3c03ef190637635974003d9b66c7e 100644 --- a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java +++ b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java @@ -1,11 +1,5 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.FontAwesome; import com.vaadin.ui.Button; @@ -19,7 +13,7 @@ import org.s4s.services.util.Views; * * @author JanPhilipp */ -public class KaufbestaetigungView extends TemplateView{ +public class KaufbestaetigungView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { @@ -27,26 +21,27 @@ public class KaufbestaetigungView extends TemplateView{ } private void setUp() { - Panel panel = new Panel(); + Panel panel = new Panel(); panel.setSizeUndefined(); - + VerticalLayout content = new VerticalLayout(); - + Button button = new Button("Weiter shoppen"); button.setIcon(FontAwesome.BOOK); - button.addClickListener(e -> - UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); - + button.addClickListener(e + -> UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + Label label = new Label("Vielen Dank für ihren Einkauf! Wenn sie weitershoppen wollen... :)"); - - content.addComponent(label); - content.addComponent(button); - - content.setMargin(true); - - panel.setContent(content); - //this.addComponent(panel); - //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); - - super.setUpFooterAndHeader(panel); -}} + + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); + } +} diff --git a/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java index 2656c044d091c88225ac27d53ff33afc62182285..d313af7980321825347d8b9bacae10a8072b468b 100644 --- a/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java +++ b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.ViewChangeListener; @@ -18,8 +13,8 @@ import org.s4s.services.util.Views; * @author JanPhilipp */ public class Kontaktbestaetigung extends TemplateView { - - @Override + + @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } @@ -27,27 +22,24 @@ public class Kontaktbestaetigung extends TemplateView { private void setUp() { Panel panel = new Panel(); panel.setSizeUndefined(); - + VerticalLayout content = new VerticalLayout(); - + Button button = new Button("Zurück zur Startseite"); - button.addClickListener(e -> - UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); - + button.addClickListener(e + -> UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + Label label = new Label("Vielen Dank für ihre Kontaktanfrage, Wir werden diese in Kürze beantworten und so schnell wie möglich beantworten"); - - content.addComponent(label); - content.addComponent(button); - - content.setMargin(true); - - panel.setContent(content); - //this.addComponent(panel); - //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); - - super.setUpFooterAndHeader(panel); -}} - - - + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); + } +} diff --git a/src/main/java/org/s4s/gui/views/LoginView.java b/src/main/java/org/s4s/gui/views/LoginView.java index 74487a11a9b1a32b5aee0d469184964df971378c..fddbd26a6970e992961610a79fca6ee22e3cb669 100644 --- a/src/main/java/org/s4s/gui/views/LoginView.java +++ b/src/main/java/org/s4s/gui/views/LoginView.java @@ -1,19 +1,13 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.*; - import java.util.logging.Level; import java.util.logging.Logger; -import org.s4s.exceptions.DAOException; import org.s4s.dao.KundenDAO; +import org.s4s.exceptions.DAOException; import org.s4s.exceptions.NoSuchUserOrPassword; import org.s4s.process.control.LoginControl; import org.s4s.services.util.Views; @@ -72,36 +66,30 @@ public class LoginView extends TemplateView { horSpacer.setComponentAlignment(layout, Alignment.MIDDLE_CENTER); this.setComponentAlignment(horSpacer, Alignment.MIDDLE_CENTER); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(Button.ClickEvent event) { - String login = userLogin.getValue(); - String password = passwordField.getValue(); - - try { - kundenDAO.getUserByCredentials(login, password); - - } catch (NoSuchUserOrPassword ex) { - Notification.show("Fehler", "Login oder Passwort falsch", Notification.Type.ERROR_MESSAGE); - userLogin.setValue(""); - passwordField.setValue(""); - } catch (DAOException ex) { - Notification.show("Fehler", "interner Fehler", Notification.Type.ERROR_MESSAGE); - Logger.getLogger(LoginView.class.getName()).log(Level.SEVERE, null, ex); - } - // bei Erfolg wird der Navigator angesprochen und man wird in wieder zur Landingpage geführt - UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); - + button.addClickListener((Button.ClickEvent event) -> { + String login = userLogin.getValue(); + String password = passwordField.getValue(); + + try { + kundenDAO.getUserByCredentials(login, password); + + } catch (NoSuchUserOrPassword ex) { + Notification.show("Fehler", "Login oder Passwort falsch", Notification.Type.ERROR_MESSAGE); + userLogin.setValue(""); + passwordField.setValue(""); + Logger.getLogger(LoginView.class.getName()).log(Level.SEVERE, null, ex); + } catch (DAOException ex) { + Notification.show("Fehler", "interner Fehler", Notification.Type.ERROR_MESSAGE); + Logger.getLogger(LoginView.class.getName()).log(Level.SEVERE, null, ex); } + // bei Erfolg wird der Navigator angesprochen und man wird in wieder zur Landingpage geführt + UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); }); horSpacer.setStyleName("LoginViewContainer"); // layout.addComponent(buttonReg); - buttonReg.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(Button.ClickEvent event) { - UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG); - } + buttonReg.addClickListener((Button.ClickEvent event) -> { + UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG); }); } diff --git a/src/main/java/org/s4s/gui/views/PasswortView.java b/src/main/java/org/s4s/gui/views/PasswortView.java index 527083d921cba6677bd189b2d5b24564471266ab..c9e0727d5357a59fd244f19fcdf086399c7ab3d0 100644 --- a/src/main/java/org/s4s/gui/views/PasswortView.java +++ b/src/main/java/org/s4s/gui/views/PasswortView.java @@ -1,23 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class PasswortView extends TemplateView{ +public class PasswortView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - + } diff --git a/src/main/java/org/s4s/gui/views/RegistrierungView.java b/src/main/java/org/s4s/gui/views/RegistrierungView.java index 05705a38e4319143bfbd4c1bab1f743f4dddad71..9c829e87ac4d94f881169cc3b7e0416e95246c7c 100644 --- a/src/main/java/org/s4s/gui/views/RegistrierungView.java +++ b/src/main/java/org/s4s/gui/views/RegistrierungView.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.View; @@ -14,7 +9,6 @@ import com.vaadin.ui.DateField; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; import com.vaadin.ui.PasswordField; import com.vaadin.ui.TextField; @@ -23,127 +17,115 @@ import java.util.Date; import org.s4s.process.control.RegistrationControl; import org.s4s.services.util.Views; - /** * * @author JanPhilipp */ public class RegistrierungView extends TemplateView implements View { - + // RegistrierungControl regControl; -// VerticalLayout layout; - +// VerticalLayout layout; @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } - private void setUp() { - - - Panel panel = new Panel("Registrierung"); - panel.setSizeUndefined(); - - FormLayout content = new FormLayout(); - - TextField benutzername = new TextField("Benutzername"); - content.addComponent(benutzername); - - DateField bday = new DateField("Geburtstag"); - content.addComponent(bday); - - TextField nachnameTxt = new TextField("Nachname:"); - nachnameTxt.setIcon(FontAwesome.USER); - content.addComponent(nachnameTxt); - - - TextField vornameTxt = new TextField("Vorname:"); - vornameTxt.setIcon(FontAwesome.ANDROID); - content.addComponent(vornameTxt); - - - /* NativeSelect fachbereich = new NativeSelect("Fachbereich"); //hier braucht die Datenbank Integer Werte! Fachbereich ist nicht Student, Hiwi oder Prof sonder FB01, 02,03 etc!! + + Panel panel = new Panel("Registrierung"); + panel.setSizeUndefined(); + + FormLayout content = new FormLayout(); + + TextField benutzername = new TextField("Benutzername"); + content.addComponent(benutzername); + + DateField bday = new DateField("Geburtstag"); + content.addComponent(bday); + + TextField nachnameTxt = new TextField("Nachname:"); + nachnameTxt.setIcon(FontAwesome.USER); + content.addComponent(nachnameTxt); + + TextField vornameTxt = new TextField("Vorname:"); + vornameTxt.setIcon(FontAwesome.ANDROID); + content.addComponent(vornameTxt); + + /* NativeSelect fachbereich = new NativeSelect("Fachbereich"); //hier braucht die Datenbank Integer Werte! Fachbereich ist nicht Student, Hiwi oder Prof sonder FB01, 02,03 etc!! fachbereich.addItems("Student", "Hivi", "Prof"); //ich kann das grad nicht selber machen, weil ich beim deployen fehler kriege und nicht ungetestetes commiten möchte! Also bitte abändern! fachbereich.setNullSelectionAllowed(false); content.addComponent(fachbereich); -*/ - TextField fachbereich = new TextField("Fachbereich:"); - fachbereich.setConverter(Integer.class); - fachbereich.setIcon(FontAwesome.ANDROID); - content.addComponent(fachbereich); - - - TextField emailTxt = new TextField("E-Mail:"); - emailTxt.setIcon(FontAwesome.MAIL_FORWARD); - content.addComponent(emailTxt); - - TextField emailTxtWdh = new TextField("E-Mail wiederholen:"); - emailTxtWdh.setIcon(FontAwesome.MAIL_FORWARD); - content.addComponent(emailTxtWdh); - - PasswordField passwortTxt = new PasswordField("Passwort:"); - passwortTxt.setIcon(FontAwesome.KEY); - content.addComponent(passwortTxt); - - PasswordField passwortTxtWdh = new PasswordField("Passwort wiederholen:"); - passwortTxtWdh.setIcon(FontAwesome.KEY); - content.addComponent(passwortTxtWdh); - - - - HorizontalLayout buttons = new HorizontalLayout(); - Button abbruch = new Button("Abbruch"); - abbruch.setIcon(FontAwesome.STOP_CIRCLE); - buttons.addComponent(abbruch); - buttons.addComponent(new Label(" ", ContentMode.HTML)); - Button bestätigen = new Button("Bestätigen"); - bestätigen.setIcon(FontAwesome.CHECK); - buttons.addComponent(bestätigen); - - content.addComponent(buttons); + */ + TextField fachbereich = new TextField("Fachbereich:"); + fachbereich.setConverter(Integer.class); + fachbereich.setIcon(FontAwesome.ANDROID); + content.addComponent(fachbereich); + + TextField emailTxt = new TextField("E-Mail:"); + emailTxt.setIcon(FontAwesome.MAIL_FORWARD); + content.addComponent(emailTxt); + + TextField emailTxtWdh = new TextField("E-Mail wiederholen:"); + emailTxtWdh.setIcon(FontAwesome.MAIL_FORWARD); + content.addComponent(emailTxtWdh); + + PasswordField passwortTxt = new PasswordField("Passwort:"); + passwortTxt.setIcon(FontAwesome.KEY); + content.addComponent(passwortTxt); + + PasswordField passwortTxtWdh = new PasswordField("Passwort wiederholen:"); + passwortTxtWdh.setIcon(FontAwesome.KEY); + content.addComponent(passwortTxtWdh); + + HorizontalLayout buttons = new HorizontalLayout(); + Button abbruch = new Button("Abbruch"); + abbruch.setIcon(FontAwesome.STOP_CIRCLE); + buttons.addComponent(abbruch); + buttons.addComponent(new Label(" ", ContentMode.HTML)); + Button bestätigen = new Button("Bestätigen"); + bestätigen.setIcon(FontAwesome.CHECK); + buttons.addComponent(bestätigen); + + content.addComponent(buttons); // content.setSizeUndefined(); - content.setMargin(true); - - panel.setContent(content); - //this.addComponent(panel); - //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); - - - - bestätigen.addClickListener( e -> { - String benutzer = benutzername.getValue(); - String nachname = nachnameTxt.getValue(); - String vorname = vornameTxt.getValue(); - Date gebDate = bday.getValue(); - int fBereich = (int) fachbereich.getConvertedValue(); - String email = emailTxt.getValue(); - String emailwdh = emailTxtWdh.getValue(); - String passwort = passwortTxt.getValue(); - String passwortWdh = passwortTxtWdh.getValue(); - UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNGSBESTAETIGUNG); - - //Anbindungstestblock. svolle2s - //RegistrationControl.init(new String[]{nachname, vorname, email, emailwdh, passwort, passwortWdh, benutzer,}); // diverse Daten fehlen siehe bday fachbereich - RegistrationControl.init(benutzer, nachname, vorname, gebDate, fBereich, email, emailwdh, passwort, passwortWdh); - - System.out.println(benutzer); - System.out.println(nachname); - System.out.println(vorname); - System.out.println(gebDate); - System.out.println(email); - System.out.println(emailwdh); - System.out.println(passwort); - System.out.println(passwortWdh); - System.out.println(fBereich); - - // Weiterleitung auf Bestätigunsseite - + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + bestätigen.addClickListener(e -> { + String benutzer = benutzername.getValue(); + String nachname = nachnameTxt.getValue(); + String vorname = vornameTxt.getValue(); + Date gebDate = bday.getValue(); + int fBereich = (int) fachbereich.getConvertedValue(); + String email = emailTxt.getValue(); + String emailwdh = emailTxtWdh.getValue(); + String passwort = passwortTxt.getValue(); + String passwortWdh = passwortTxtWdh.getValue(); + UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNGSBESTAETIGUNG); + + //Anbindungstestblock. svolle2s + //RegistrationControl.init(new String[]{nachname, vorname, email, emailwdh, passwort, passwortWdh, benutzer,}); // diverse Daten fehlen siehe bday fachbereich + RegistrationControl.init(benutzer, nachname, vorname, gebDate, fBereich, email, emailwdh, passwort, passwortWdh); + + System.out.println(benutzer); + System.out.println(nachname); + System.out.println(vorname); + System.out.println(gebDate); + System.out.println(email); + System.out.println(emailwdh); + System.out.println(passwort); + System.out.println(passwortWdh); + System.out.println(fBereich); + + // Weiterleitung auf Bestätigunsseite }); abbruch.addClickListener(e -> { UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); }); - - super.setUpFooterAndHeader(panel); + + super.setUpFooterAndHeader(panel); } } diff --git a/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java b/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java index e1603ad43c770aecb458384e84cc2542a978ac56..aed1d7068947b6b9d61bb7fbf2f8c7e8e42444c5 100644 --- a/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java +++ b/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java @@ -1,19 +1,12 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -import org.s4s.gui.views.TemplateView; import org.s4s.services.util.Views; /** @@ -21,8 +14,8 @@ import org.s4s.services.util.Views; * @author JanPhilipp */ public class RegistrierungsBestaetigung extends TemplateView implements View { - - @Override + + @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } @@ -30,23 +23,24 @@ public class RegistrierungsBestaetigung extends TemplateView implements View { private void setUp() { Panel panel = new Panel(); panel.setSizeUndefined(); - + VerticalLayout content = new VerticalLayout(); - + Button button = new Button("Zurück zur Startseite"); - button.addClickListener(e -> - UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); - + button.addClickListener(e + -> UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + Label label = new Label("Vielen Dank für ihre Registrierung"); - - content.addComponent(label); - content.addComponent(button); - - content.setMargin(true); - - panel.setContent(content); - //this.addComponent(panel); - //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); - - super.setUpFooterAndHeader(panel); -}} + + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); + } +} diff --git a/src/main/java/org/s4s/gui/views/ShopErstellung.java b/src/main/java/org/s4s/gui/views/ShopErstellung.java index 31c2e141006bb5e57c6062f8ea1020b8264fe3d1..fdf1ad2eb8b48a55c02538579f5098fee9653a8e 100644 --- a/src/main/java/org/s4s/gui/views/ShopErstellung.java +++ b/src/main/java/org/s4s/gui/views/ShopErstellung.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.View; @@ -20,8 +15,8 @@ import com.vaadin.ui.UI; import java.sql.SQLException; import java.util.logging.Level; import java.util.logging.Logger; -import org.s4s.process.control.ShopControl; import org.s4s.exceptions.OwnsAlreadyShop; +import org.s4s.process.control.ShopControl; import org.s4s.services.util.Views; /** diff --git a/src/main/java/org/s4s/gui/views/ShopView.java b/src/main/java/org/s4s/gui/views/ShopView.java index e84eac49d03c61677dbe55df9fb4394eb656dc8d..f3c2615a4f94f0e2c61dbad16244d473b383c392 100644 --- a/src/main/java/org/s4s/gui/views/ShopView.java +++ b/src/main/java/org/s4s/gui/views/ShopView.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.data.util.BeanContainer; @@ -10,6 +5,7 @@ import com.vaadin.data.util.BeanItem; import com.vaadin.event.ItemClickEvent; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.FontAwesome; +import com.vaadin.server.VaadinSession; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -17,15 +13,18 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; +import com.vaadin.ui.UI; import java.util.HashSet; import java.util.Set; import org.s4s.dao.ProductDAO; import org.s4s.dao.ShopSearchDAO; +import org.s4s.exceptions.DAOException; import org.s4s.modell.dto.Product; import org.s4s.modell.dto.Shop; import org.s4s.modell.dto.Warenkorb; import org.s4s.process.control.ProductSearch; import org.s4s.process.control.ShopSearch; +import org.s4s.services.util.Roles; /** * @@ -41,6 +40,11 @@ public class ShopView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); + if (event.getParameters() != null) { + // split at "/", add each part as a label + String str = event.getParameters(); + search(str); + } } public void setUp() { @@ -69,59 +73,100 @@ public class ShopView extends TemplateView { final BeanContainer<Integer, Product> data = new BeanContainer<>(Product.class); data.setBeanIdProperty("id"); final Table table = new Table("Products", data); - /*final BeanContainer<Integer, Shop> data = new BeanContainer<>(Shop.class); - data.setBeanIdProperty("id"); - final Table table = new Table("Shops", data);*/ table.setSizeFull(); table.setSelectable(true); - Set<Product> liste = new HashSet<>(); + + final BeanContainer<Integer, Shop> dataShops = new BeanContainer<>(Shop.class); + dataShops.setBeanIdProperty("id"); + final Table tableShops = new Table("Shops", dataShops); + tableShops.setSizeFull(); Set<Shop> listeShops = new HashSet<>(); - button.addClickListener((Button.ClickEvent event) -> { - String str = textfield.getValue().trim(); - if (str.equals("")) { + VaadinSession session = UI.getCurrent().getSession(); + if (session.getAttribute(Roles.CURRENTUSER) != null) { + System.out.println(session.getAttribute(Roles.CURRENTUSER)); + Button addButton = new Button("Hinzufügen"); + + addButton.addClickListener((event) -> { + if (this.product == null) { + Notification.show(null, "Bitte Produkt(e) auswählen!", Notification.Type.HUMANIZED_MESSAGE); + } else { + warenkorb.add(product); + System.out.println(warenkorb.getAnzahl()); + } + }); + + addComponent(addButton); + setComponentAlignment(addButton, Alignment.MIDDLE_CENTER); + } + table.addItemClickListener(new ItemClickEvent.ItemClickListener() { + @Override + public void itemClick(ItemClickEvent event) { + BeanItem<Product> productBean = data.getItem(event.getItemId()); + product = productBean.getBean(); + } + }); + + button.addClickListener(new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent event) { + String str = textfield.getValue().trim(); + search(str); + /* + if (str.equals("")) { Notification.show(null, "Bitte gesuchtes Produkt eingeben!", Notification.Type.WARNING_MESSAGE); - } else { + } else { addComponent(table); - + addComponent(tableShops); try { - liste.addAll(products.getProductByName(str)); - liste.addAll(products.getProductByDescription(str)); - //listeShops.addAll(shops.getShopByName(str)); - //listeShops.addAll(shops.getShopByOwner(str)); + liste.addAll(products.getProductByName(str)); + liste.addAll(products.getProductByDescription(str)); + listeShops.addAll(shops.getShopByName(str)); + listeShops.addAll(shops.getShopByOwner(str)); } catch (Exception ex) { - //eig. DAO Exception, aber fehler... + //eig. DAO Exception, aber fehler... } data.removeAllItems(); + dataShops.removeAllItems(); data.addAll(liste); + dataShops.addAll(listeShops); table.setPageLength(table.size()); + tableShops.setPageLength(tableShops.size()); + } + }); + */ + // BeanItem<Product> item = (BeanItem) liste.getItem(liste.getValue); + // Product myBean = item.getBean(); } }); + } - Button addButton = new Button("Hinzufügen"); + private void search(String str) { + final BeanContainer<Integer, Product> data = new BeanContainer<>(Product.class); + data.setBeanIdProperty("id"); + final Table table = new Table("Products", data); + table.setSizeFull(); + table.setSelectable(true); + Set<Product> liste = new HashSet<>(); + if ("".equals(str)) { + Notification.show(null, "Bitte gesuchtes Produkt eingeben!", Notification.Type.WARNING_MESSAGE); + } else { + addComponent(table); + try { + liste.addAll(products.getProductByName(str)); + liste.addAll(products.getProductByDescription(str)); + } catch (DAOException ex) { - addButton.addClickListener((event) -> { - if (this.product == null) { - Notification.show(null, "Bitte Produkt(e) auswählen!", Notification.Type.HUMANIZED_MESSAGE); - } else { - warenkorb.add(product); - System.out.println(warenkorb.getAnzahl()); } - }); - - addComponent(addButton); - setComponentAlignment(addButton, Alignment.MIDDLE_CENTER); + data.removeAllItems(); + data.addAll(liste); + table.setPageLength(table.size()); - table.addItemClickListener(new ItemClickEvent.ItemClickListener() { - @Override - public void itemClick(ItemClickEvent event) { + table.addItemClickListener((ItemClickEvent event) -> { BeanItem<Product> productBean = data.getItem(event.getItemId()); product = productBean.getBean(); - } - }); - - // BeanItem<Product> item = (BeanItem) liste.getItem(liste.getValue); - // Product myBean = item.getBean(); + }); + } } } diff --git "a/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java" "b/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java" index e401933486c3703c39fe3c689f1e7a8e0064a78d..a6a531e5bf80e9137242304acfdc479c42ae64fa 100644 --- "a/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java" +++ "b/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java" @@ -1,13 +1,7 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -20,8 +14,8 @@ import org.s4s.services.util.Views; * @author JanPhilipp */ public class ShoperstellungsBestätigung extends TemplateView implements View { - - @Override + + @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } @@ -29,24 +23,24 @@ public class ShoperstellungsBestätigung extends TemplateView implements View { private void setUp() { Panel panel = new Panel(); panel.setSizeUndefined(); - + VerticalLayout content = new VerticalLayout(); - + Button button = new Button("Zurück zur Startseite"); - button.addClickListener(e -> - UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); - + button.addClickListener(e + -> UI.getCurrent().getNavigator().navigateTo(Views.WELCOME)); + Label label = new Label("Vielen Dank für ihre Shoperstellung"); - - content.addComponent(label); - content.addComponent(button); - - content.setMargin(true); - - panel.setContent(content); - //this.addComponent(panel); - //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); - - super.setUpFooterAndHeader(panel); + + content.addComponent(label); + content.addComponent(button); + + content.setMargin(true); + + panel.setContent(content); + //this.addComponent(panel); + //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER); + + super.setUpFooterAndHeader(panel); } } diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java index 06c91bcd47a4123aba98bbb57051f90b604812b9..19cee2e59bebf6852c84ba12838d953a87748552 100644 --- a/src/main/java/org/s4s/gui/views/TemplateView.java +++ b/src/main/java/org/s4s/gui/views/TemplateView.java @@ -6,47 +6,47 @@ import com.vaadin.server.*; import com.vaadin.ui.*; import com.vaadin.ui.themes.BaseTheme; import java.io.File; - +import org.s4s.process.control.LogoutControl; +import org.s4s.process.control.ProductSearch; import org.s4s.services.util.Roles; import org.s4s.services.util.Views; - /** * Created by Max-Desktop on 14.05.2017. */ public class TemplateView extends VerticalLayout implements View { + VaadinSession session = UI.getCurrent().getSession(); + ProductSearch search = ProductSearch.getInstance(); private Image createLogo() { HorizontalLayout logoLayout = new HorizontalLayout(); logoLayout.addStyleName("logoLayout"); - + String rootpath = VaadinService.getCurrent().getBaseDirectory().getAbsolutePath(); - + FileResource srcLogo = new FileResource(new File(rootpath + "/WEB-INF/images/logo4.jpeg")); - + Image logo = new Image(); - + logo.setSource(srcLogo); logo.setStyleName("logo"); return logo; } - @Override public void enter(ViewChangeListener.ViewChangeEvent viewChangeEvent) { - - } - public void setLoginButton () { } + public void setLoginButton() { + + } public void setUpFooterAndHeader(AbstractComponent content) { //HEADER - - final GridLayout headerLayout = new GridLayout(3,1); + final GridLayout headerLayout = new GridLayout(3, 1); //@Max: Logo eingefügt, brauchen wir meiner Meinung nach nicht mehr. #svolle2s headerLayout.setSpacing(true); // refactored Code --> header and Footer are outsourced by there own methodes #mkomp2s @@ -56,18 +56,17 @@ public class TemplateView extends VerticalLayout implements View { content.addStyleName("MainContenLocation"); //Final Content warpping Header and Footer around Content #mkomp2s - final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, content, footerLayout); + final VerticalLayout mainLayout = new VerticalLayout(headerLayout, navigationPanelGrid, content, footerLayout); mainLayout.setSizeFull(); ///mainLayout.setExpandRatio(content, 1); mainLayout.setSpacing(true);; mainLayout.setComponentAlignment(footerLayout, Alignment.BOTTOM_CENTER); addComponent(mainLayout); - mainLayout.setWidthUndefined(); //setComponentAlignment(navigationPanelGrid,Alignment.MIDDLE_CENTER); - setComponentAlignment(mainLayout,Alignment.MIDDLE_CENTER); + setComponentAlignment(mainLayout, Alignment.MIDDLE_CENTER); this.setSpacing(true); this.setHeightUndefined(); @@ -75,13 +74,13 @@ public class TemplateView extends VerticalLayout implements View { this.setMargin(true); } - HorizontalLayout buildNavigationHeader () { + HorizontalLayout buildNavigationHeader() { HorizontalLayout navigationPanelGrid = new HorizontalLayout(); MenuBar.Command mycommand = new MenuBar.Command() { public void menuSelected(MenuBar.MenuItem selectedItem) { System.out.println(selectedItem); - switch (selectedItem.getText()){ + switch (selectedItem.getText()) { case "Home": UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); break; @@ -103,27 +102,38 @@ public class TemplateView extends VerticalLayout implements View { UI.getCurrent().getNavigator().navigateTo(Views.BENUTZERKONTO); break; case "Logout": - session.setAttribute(Roles.CURRENTUSER, null); + LogoutControl.logout(); UI.getCurrent().getNavigator().navigateTo(Views.WELCOME); break; case "Kontakt": UI.getCurrent().getNavigator().navigateTo(Views.CONTACT); break; + // Edit Holger Anfang + case "Literatur": + UI.getCurrent().getNavigator().navigateTo(Views.SHOP + "/literatur"); + break; - } + case "Mitschriften": + UI.getCurrent().getNavigator().navigateTo(Views.SHOP + "/mitschriften"); + break; + case "Nachhilfe": + UI.getCurrent().getNavigator().navigateTo(Views.SHOP + "/nachhilfe"); + break; + // Edit Ende + } } + ; }; MenuBar barmenu = new MenuBar(); MenuBar.MenuItem homeItem = barmenu.addItem("Home", null, mycommand); - // Another top-level item MenuBar.MenuItem categoryItem = barmenu.addItem("Kategorien", null, null); categoryItem.addItem("Literatur", null, mycommand); - categoryItem.addItem("Mitschriften", null, mycommand); + categoryItem.addItem("Mitschriften", null, mycommand); categoryItem.addItem("Nachhilfe", null, mycommand); // Yet another top-level item @@ -137,10 +147,8 @@ public class TemplateView extends VerticalLayout implements View { userItem.addItem("Einstellungen", null, mycommand); userItem.addItem("Logout", null, mycommand); - TextField tfSeach = new TextField(); - Button btnSearch = new Button("Suche" , FontAwesome.SEARCH); - + Button btnSearch = new Button("Suche", FontAwesome.SEARCH); navigationPanelGrid.addComponent(createLogo()); navigationPanelGrid.addComponent(barmenu); @@ -148,21 +156,21 @@ public class TemplateView extends VerticalLayout implements View { navigationPanelGrid.addComponent(btnSearch); navigationPanelGrid.setSpacing(true); navigationPanelGrid.setSizeUndefined(); - if (session.getAttribute(Roles.CURRENTUSER) == null){ + if (session.getAttribute(Roles.CURRENTUSER) == null) { userItem.setVisible(false); } else { registerItem.setVisible(false); loginItem.setVisible(false); } navigationPanelGrid.setStyleName("navbarGardient"); - navigationPanelGrid.setComponentAlignment(barmenu,Alignment.MIDDLE_CENTER); - navigationPanelGrid.setComponentAlignment(tfSeach,Alignment.MIDDLE_RIGHT); - navigationPanelGrid.setComponentAlignment(btnSearch,Alignment.MIDDLE_RIGHT); + navigationPanelGrid.setComponentAlignment(barmenu, Alignment.MIDDLE_CENTER); + navigationPanelGrid.setComponentAlignment(tfSeach, Alignment.MIDDLE_RIGHT); + navigationPanelGrid.setComponentAlignment(btnSearch, Alignment.MIDDLE_RIGHT); return navigationPanelGrid; } - HorizontalLayout buildFooter () { + HorizontalLayout buildFooter() { //FOOTER HorizontalLayout footerLayout = new HorizontalLayout(); @@ -181,8 +189,8 @@ public class TemplateView extends VerticalLayout implements View { btnContact.addClickListener((Button.ClickEvent event) -> { UI.getCurrent().getNavigator().navigateTo(Views.CONTACT); }); - footerLayout.setComponentAlignment(btnContact,Alignment.MIDDLE_CENTER); - footerLayout.setComponentAlignment(btnImpressum,Alignment.MIDDLE_CENTER); + footerLayout.setComponentAlignment(btnContact, Alignment.MIDDLE_CENTER); + footerLayout.setComponentAlignment(btnImpressum, Alignment.MIDDLE_CENTER); footerLayout.setStyleName("customfooter"); return footerLayout; diff --git a/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java b/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java index 0cbf405316c0719ce7a059325e2cdbb5d84f3faa..531a43ef9afacf514ced340bb0111f88c88c1742 100644 --- a/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java +++ b/src/main/java/org/s4s/gui/views/VerkaeuferbewertungView.java @@ -1,27 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; -import com.vaadin.ui.VerticalLayout; /** * * @author Holger */ -public class VerkaeuferbewertungView extends TemplateView{ +public class VerkaeuferbewertungView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } - - public void setUp(){ - + + public void setUp() { + } - + } diff --git a/src/main/java/org/s4s/gui/views/WarenkorbView.java b/src/main/java/org/s4s/gui/views/WarenkorbView.java index 8a23dea4044536dcf0bec571a14e460a7f550358..453e9f4872e6b30bb88c6699ca1346813a75dae1 100644 --- a/src/main/java/org/s4s/gui/views/WarenkorbView.java +++ b/src/main/java/org/s4s/gui/views/WarenkorbView.java @@ -1,20 +1,14 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.server.VaadinSession; import com.vaadin.ui.Alignment; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; -import com.vaadin.ui.Table; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -import java.util.HashSet; -import java.util.Set; +import java.util.List; import org.s4s.modell.dto.Product; import org.s4s.modell.dto.Warenkorb; import org.s4s.services.util.Roles; @@ -49,25 +43,23 @@ public class WarenkorbView extends TemplateView { this.addComponent(panel); this.setComponentAlignment(panel, Alignment.TOP_LEFT); } else { + HorizontalLayout horizontalLayout = new HorizontalLayout(); Panel pAnzahl = new Panel("In Ihrem Warenkorb sind momentan: " + warenkorb.getAnzahl() + " Artikel!"); - this.addComponent(pAnzahl); - this.setComponentAlignment(pAnzahl, Alignment.TOP_LEFT); + horizontalLayout.addComponent(pAnzahl); + horizontalLayout.setComponentAlignment(pAnzahl, Alignment.TOP_LEFT); Panel pSum = new Panel("Gesamtwert im Warenkorb beträgt: " + warenkorb.sum()); - this.addComponent(pSum); - this.setComponentAlignment(pSum, Alignment.TOP_RIGHT); - warenkorb.auflisten(); - final Table table = new Table("Ihr Warenkorb"); - table.addContainerProperty("Bezeichnung", String.class, null); - table.addContainerProperty("Preis", Double.class, null); - table.addContainerProperty("Menge", Integer.class, null); - // table.setSizeFull(); - // table.setSelectable(true); - addComponent(table); - Set<Product> liste = new HashSet<>(); - liste.addAll(warenkorb.inhalt()); - //data.addAll(liste); - this.setComponentAlignment(table, Alignment.TOP_CENTER); + horizontalLayout.addComponent(pSum); + horizontalLayout.setComponentAlignment(pSum, Alignment.TOP_RIGHT); + + this.addComponent(horizontalLayout); + + List<Product> list = warenkorb.inhalt(); + list.forEach((p) -> { + HorizontalLayout layout = new HorizontalLayout(); + layout.addComponent(new Panel(p.getName() + ", " + p.getDescription() + ", " + p.getPrice())); + this.addComponent(layout); + }); } } } diff --git a/src/main/java/org/s4s/gui/views/WelcomeView.java b/src/main/java/org/s4s/gui/views/WelcomeView.java index 62a76137a9e639a3477772cfe06d50675aad2a9b..b2717df1bd4555ccb1d3a4d1049cfb759757c6b9 100644 --- a/src/main/java/org/s4s/gui/views/WelcomeView.java +++ b/src/main/java/org/s4s/gui/views/WelcomeView.java @@ -1,68 +1,60 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.gui.views; -import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.ui.*; -import org.s4s.services.util.Views; /** * * @author Holger */ -public class WelcomeView extends TemplateView{ +public class WelcomeView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { this.setUp(); } - - public void setUp(){ + + public void setUp() { //CONTENT goes here final VerticalLayout contentLayout = new VerticalLayout(); - super.setUpFooterAndHeader(contentLayout); -/* setSizeFull(); + /* setSizeFull(); setMargin(true); final HorizontalLayout horizontalLayout = new HorizontalLayout(); final HorizontalLayout buttonLayout = new HorizontalLayout(); - - + + Button sucheButton = new Button("Besuche Shop"); buttonLayout.addComponent(sucheButton); buttonLayout.setComponentAlignment(sucheButton, Alignment.TOP_LEFT); - - + + Button loginButton = new Button("Login"); buttonLayout.addComponent(loginButton); buttonLayout.setComponentAlignment(loginButton, Alignment.TOP_RIGHT); - - + + Button impressumButton = new Button("Impressum"); horizontalLayout.addComponent(impressumButton); horizontalLayout.setComponentAlignment(impressumButton, Alignment.MIDDLE_LEFT); - - + + addComponent(buttonLayout); buttonLayout.setSizeFull(); sucheButton.addClickListener((Button.ClickEvent event) ->{ - UI.getCurrent().getNavigator().navigateTo(Views.SHOP); + UI.getCurrent().getNavigator().navigateTo(Views.SHOP); }); - + loginButton.addClickListener((Button.ClickEvent event) ->{ UI.getCurrent().getNavigator().navigateTo(Views.LOGIN); }); - + impressumButton.addClickListener((Button.ClickEvent event) -> { UI.getCurrent().getNavigator().navigateTo(Views.IMPRESSUM); }); - + Label label = new Label("Willkommen in unserem Shop in Shop System!"); horizontalLayout.addComponent(label); horizontalLayout.setComponentAlignment(label, Alignment.MIDDLE_CENTER); @@ -71,5 +63,5 @@ public class WelcomeView extends TemplateView{ addComponent(horizontalLayout); setComponentAlignment(horizontalLayout, Alignment.TOP_CENTER);*/ } - + } diff --git a/src/main/java/org/s4s/modell/dto/Product.java b/src/main/java/org/s4s/modell/dto/Product.java index fb5c0148a80d548bb1fdf440d00130cd3f72bdc4..3bc792e652e4331d9ecbb021a196009deb6369a6 100644 --- a/src/main/java/org/s4s/modell/dto/Product.java +++ b/src/main/java/org/s4s/modell/dto/Product.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.modell.dto; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/src/main/java/org/s4s/modell/dto/Shop.java b/src/main/java/org/s4s/modell/dto/Shop.java index a98cd454e84431c391538118b4ea03df19335671..aca3f8017dde7810513dee3968ae1091a5da4b68 100644 --- a/src/main/java/org/s4s/modell/dto/Shop.java +++ b/src/main/java/org/s4s/modell/dto/Shop.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.modell.dto; /** @@ -16,12 +11,12 @@ public class Shop { private int besitzer; private double bewertung; private int bewertunganzahl; - - public Shop(){ - + + public Shop() { + } - - public Shop(int shopId, String name, int besitzer, double bewertung, int bewertunganzahl){ + + public Shop(int shopId, String name, int besitzer, double bewertung, int bewertunganzahl) { this.shopId = shopId; this.name = name; this.besitzer = besitzer; @@ -68,7 +63,5 @@ public class Shop { public void setBewertungsanzahl(int bewertunganzahl) { this.bewertunganzahl = bewertunganzahl; } - - - + } diff --git a/src/main/java/org/s4s/modell/dto/User.java b/src/main/java/org/s4s/modell/dto/User.java index e78eda6af4183e67fe7c9c37e8e898ad859b5ecd..3f05ccd645ac7c6fa0f3bc9ccb33fb7d4f52175c 100644 --- a/src/main/java/org/s4s/modell/dto/User.java +++ b/src/main/java/org/s4s/modell/dto/User.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.modell.dto; /** @@ -20,10 +15,10 @@ public class User { private final String benutzername; - public User(String benutzername){ + public User(String benutzername) { this.benutzername = benutzername; } - + public int getUserId() { return userId; } @@ -44,7 +39,6 @@ public class User { return benutzername; } - public String getVorname() { return vorname; } diff --git a/src/main/java/org/s4s/modell/dto/Warenkorb.java b/src/main/java/org/s4s/modell/dto/Warenkorb.java index 4937c7e795f773819c478e09aaf5fc3f127b2c65..5af4bce6abcfc765a5fc978fa766e4834cbe4707 100644 --- a/src/main/java/org/s4s/modell/dto/Warenkorb.java +++ b/src/main/java/org/s4s/modell/dto/Warenkorb.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.modell.dto; import java.util.ArrayList; diff --git a/src/main/java/org/s4s/process/control/ContactControl.java b/src/main/java/org/s4s/process/control/ContactControl.java index b53a22b08a9310215d6d30980abdc72ad7b09330..a00198f01822a7c09c73644abe867bea3a185b88 100644 --- a/src/main/java/org/s4s/process/control/ContactControl.java +++ b/src/main/java/org/s4s/process/control/ContactControl.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; /** @@ -10,5 +5,5 @@ package org.s4s.process.control; * @author synot */ public class ContactControl { - + } diff --git a/src/main/java/org/s4s/process/control/LoginControl.java b/src/main/java/org/s4s/process/control/LoginControl.java index 7c49938fa4d53f42f88ab6d957fd9a08844bcecd..58c7cfc9c5e56f52c1db52ab25ef9aa2fe438937 100644 --- a/src/main/java/org/s4s/process/control/LoginControl.java +++ b/src/main/java/org/s4s/process/control/LoginControl.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; import com.vaadin.server.VaadinSession; diff --git a/src/main/java/org/s4s/process/control/LogoutControl.java b/src/main/java/org/s4s/process/control/LogoutControl.java index 620313e17e08521964980928ea07e766101449bb..3fc36c3dceacdceb6d232e7051658227e516b172 100644 --- a/src/main/java/org/s4s/process/control/LogoutControl.java +++ b/src/main/java/org/s4s/process/control/LogoutControl.java @@ -1,21 +1,19 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; import com.vaadin.server.VaadinSession; import com.vaadin.ui.UI; +import org.s4s.services.util.Roles; /** * * @author Sebastian */ public class LogoutControl { - private void logout() { + + public static void logout() { VaadinSession session = UI.getCurrent().getSession(); - session.close(); + session.setAttribute(Roles.CURRENTUSER, null); + // session.close(); } - + } diff --git a/src/main/java/org/s4s/process/control/ProductSearch.java b/src/main/java/org/s4s/process/control/ProductSearch.java index 5664a3c7a6ff79b87eeca76089a71f8a8d6f60cd..b147da1cbc57a8279a2fb561e3919ccd59af76c9 100644 --- a/src/main/java/org/s4s/process/control/ProductSearch.java +++ b/src/main/java/org/s4s/process/control/ProductSearch.java @@ -1,17 +1,12 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.s4s.exceptions.DAOException; import org.s4s.dao.ProductDAO; import org.s4s.dao.impl.AbstractDatabaseClass; +import org.s4s.exceptions.DAOException; import org.s4s.modell.dto.Product; /** @@ -41,7 +36,7 @@ public class ProductSearch extends AbstractDatabaseClass implements ProductDAO { List<Product> liste = new ArrayList<>(); try (ResultSet set = executeQuery("SELECT *" + " FROM \"ERR\".\"artikel\" a" - + " WHERE LOWER(a.name) = LOWER('" + kate + "');")) { + + " WHERE LOWER(a.name) ILIKE LOWER('%" + kate + "%');")) { while (set.next()) { String name = set.getString("name"); int id = set.getInt("artikelID"); diff --git a/src/main/java/org/s4s/process/control/RegistrationControl.java b/src/main/java/org/s4s/process/control/RegistrationControl.java index 076dfbb932c0c0e5f7301299572a7015e9ac581a..cc82cd32c484438ffe17740dce72612f166adfa8 100644 --- a/src/main/java/org/s4s/process/control/RegistrationControl.java +++ b/src/main/java/org/s4s/process/control/RegistrationControl.java @@ -1,32 +1,22 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.validator.routines.EmailValidator; import org.s4s.dao.RegistrationDAO; import org.s4s.exceptions.WrongInputException; - - /** * * @author Simon */ public class RegistrationControl { + //User-Block private static String nachname; private static String vorname; private static String email; private static String passwort; private static RegistrationDAO regDAO = new RegistrationDAO(); - - - + /** * * @param benutzer @@ -39,59 +29,56 @@ public class RegistrationControl { * @param passwort * @param passwortWdh */ - public static void init(String benutzer, String nachname, String vorname, java.util.Date gebDate, int fBereich, String email, String emailwdh, String passwort, String passwortWdh) { - - + try { - if(!passwort.equals(passwortWdh)) { - throw new WrongInputException("Passwort entspricht nicht den Anforderungen!"); - } - - if(!email.equals(emailwdh) && !emailValidator()) { - throw new WrongInputException("Email-Adressen stimmen nicht überein oder sind nicht gültig!"); - } - if (!nameValidator(nachname)) { - throw new WrongInputException("Nachname enthält ungültige Zeichen!"); - } - - if (!nameValidator(vorname)) { - throw new WrongInputException("Vorname enthält ungültige Zeichen!"); - } - - if (!passwordValidator()) { - throw new WrongInputException("Passwort ungültig!"); - } - } catch(WrongInputException w) { + if (!passwort.equals(passwortWdh)) { + throw new WrongInputException("Passwort entspricht nicht den Anforderungen!"); + } + + if (!email.equals(emailwdh) && !emailValidator()) { + throw new WrongInputException("Email-Adressen stimmen nicht überein oder sind nicht gültig!"); + } + if (!nameValidator(nachname)) { + throw new WrongInputException("Nachname enthält ungültige Zeichen!"); + } + + if (!nameValidator(vorname)) { + throw new WrongInputException("Vorname enthält ungültige Zeichen!"); + } + + if (!passwordValidator()) { + throw new WrongInputException("Passwort ungültig!"); + } + } catch (WrongInputException w) { w.printStackTrace(); System.out.println("Exception occur: " + w.getMessage()); } regDAO.addUser(benutzer, nachname, vorname, gebDate, fBereich, email, emailwdh, passwort, passwortWdh); } - - + public static boolean nameValidator(String toValidate) { - //wenn Eingabe falsch -> Notification - - for (int i = 0; i < toValidate.length(); ++i) { - if (!Character.isLetter(toValidate.charAt(i))) { - return false; - } - } - return true; + //wenn Eingabe falsch -> Notification + + for (int i = 0; i < toValidate.length(); ++i) { + if (!Character.isLetter(toValidate.charAt(i))) { + return false; + } + } + return true; } - + public static boolean emailValidator() { return EmailValidator.getInstance().isValid(email); } - + public static boolean passwordValidator() { - + return passwort.length() > 8; /* String regex = "^.*(?=.{8,})(?=..*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&+=]).*$"; Pattern p = Pattern.compile(regex); Matcher m = p.matcher(passwort); return m.matches(); */ } - + } diff --git a/src/main/java/org/s4s/process/control/ShopControl.java b/src/main/java/org/s4s/process/control/ShopControl.java index 5c0e8b72c1f0afbd5083c982e7c7d627c833ccd8..0aa7c10a8196b7ad4c422c759b26f6e66f0e4242 100644 --- a/src/main/java/org/s4s/process/control/ShopControl.java +++ b/src/main/java/org/s4s/process/control/ShopControl.java @@ -1,17 +1,12 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; import com.vaadin.server.VaadinSession; import com.vaadin.ui.UI; import java.sql.SQLException; import org.s4s.dao.ShopDAO; -import org.s4s.services.util.Roles; import org.s4s.exceptions.OwnsAlreadyShop; import org.s4s.modell.dto.User; +import org.s4s.services.util.Roles; import org.s4s.services.util.Views; /** @@ -19,29 +14,30 @@ import org.s4s.services.util.Views; * @author Benjamin */ public class ShopControl { + private static final User user = (User) VaadinSession.getCurrent().getAttribute(Roles.CURRENTUSER); //bekommt User aus der View übergeben und prüft ob dieser schon in der Shopdb vorhanden ist (= hat schon einen Shop). - public static void checkUserShop( String shopName, String shopBeschreibung) throws OwnsAlreadyShop, SQLException { + public static void checkUserShop(String shopName, String shopBeschreibung) throws OwnsAlreadyShop, SQLException { boolean test = ShopDAO.getInstance().viewShop(user); //Shop mit dem Nutzer schon vorhanden if (test == false) { throw new OwnsAlreadyShop("Sie besitzen bereits einen Shop!"); - } //noch kein Shop vorhanden + } //noch kein Shop vorhanden else { - addUserShop(shopName, shopBeschreibung); + addUserShop(shopName, shopBeschreibung); } } private static void addUserShop(String shopName, String shopBeschreibung) throws SQLException { boolean erstellung = ShopDAO.getInstance().addShop(user, shopName, shopBeschreibung); - - if (erstellung == true){ + + if (erstellung == true) { //Weiterleitung zur Shopseite, wenn Shop erfolgreich erstellt - UI.getCurrent().getNavigator().navigateTo(Views.SHOP); + UI.getCurrent().getNavigator().navigateTo(Views.SHOP); } else { - //Fehlerhandling - throw new SQLException("Fehler beim Anlegen des Shops bitte noch einmal versuchen oder Programmierer kontaktieren!"); + //Fehlerhandling + throw new SQLException("Fehler beim Anlegen des Shops bitte noch einmal versuchen oder Programmierer kontaktieren!"); } } } diff --git a/src/main/java/org/s4s/process/control/ShopSearch.java b/src/main/java/org/s4s/process/control/ShopSearch.java index a9437f4e848039f5617bbf0b32ffdbe48777c4be..79a8afbb74088c760d33358a11f3c11fbed915b6 100644 --- a/src/main/java/org/s4s/process/control/ShopSearch.java +++ b/src/main/java/org/s4s/process/control/ShopSearch.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.process.control; import java.sql.ResultSet; diff --git a/src/main/java/org/s4s/process/control/TransactionControl.java b/src/main/java/org/s4s/process/control/TransactionControl.java index cf77e7e12ae6adc098f951d8573a90537a13460f..f708ad1168da90bd561f8da838e47fbcc36816a5 100644 --- a/src/main/java/org/s4s/process/control/TransactionControl.java +++ b/src/main/java/org/s4s/process/control/TransactionControl.java @@ -1,13 +1,9 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.s4s.dao.impl; +package org.s4s.process.control; import com.vaadin.ui.UI; import java.sql.ResultSet; import java.sql.SQLException; +import org.s4s.dao.impl.AbstractDatabaseClass; import org.s4s.exceptions.DAOException; import org.s4s.modell.dto.Product; import org.s4s.modell.dto.User; diff --git a/src/main/java/org/s4s/services/db/JDBCConnection.java b/src/main/java/org/s4s/services/db/JDBCConnection.java index 4adca2ef05011ee89bed6128f7787eed02ed295b..a457a8ae8f9ddf23d8b6e01bf8e9304c749011e1 100644 --- a/src/main/java/org/s4s/services/db/JDBCConnection.java +++ b/src/main/java/org/s4s/services/db/JDBCConnection.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.services.db; import java.sql.*; @@ -38,7 +33,7 @@ public class JDBCConnection { this.openConnection(); } catch (SQLException ex) { Logger.getLogger(JDBCConnection.class.getName()).log(Level.SEVERE, null, ex); - } + } } private void openConnection() { @@ -54,7 +49,7 @@ public class JDBCConnection { Logger.getLogger(JDBCConnection.class.getName()).log(Level.SEVERE, null, ex); } } - + public Statement getStatement() { try { if (this.conn.isClosed()) { diff --git a/src/main/java/org/s4s/services/util/EmailValidator.java b/src/main/java/org/s4s/services/util/EmailValidator.java deleted file mode 100644 index f7a051e89ec8bfacebcde9121c9f8054f6686648..0000000000000000000000000000000000000000 --- a/src/main/java/org/s4s/services/util/EmailValidator.java +++ /dev/null @@ -1,41 +0,0 @@ -///* -// * To change this license header, choose License Headers in Project Properties. -// * To change this template file, choose Tools | Templates -// * and open the template in the editor. -// */ -//package org.s4s.services.util; -// -//import com.vaadin.data.Validator; -// -///** -// * -// * @author synot -// */ -//public class EmailValidator implements Validator { -// /** -// * Tests if the given value is valid -// * @param value the value to test -// */ -// public boolean isValid(Object value) { -// try { -// validate(value); -// } catch (Validator.InvalidValueException ive) { -// return false; -// } -// return true; -// } -// -// /** -// * Validates -// * @param value the value to test -// */ -// public void validate(Object value) throws Validator.InvalidValueException { -// // Here value is a String containing what *should* be an e-mail address -// if (value instanceof String) { -// String email = (String)value; -// // Match the email string against a (simplistic) regular expression matching e-mail addresses -// if (!email.matches("^[_\\w\\.\\-]+@[\\w\\.-]+\\.[a-z]{2,6}$")) -// throw new Validator.InvalidValueException("The e-mail address provided is not valid!"); -// } -// } -//} diff --git a/src/main/java/org/s4s/services/util/Roles.java b/src/main/java/org/s4s/services/util/Roles.java index a314e79396c7a740d5ff71610496ffb69a6a6caf..52fcb790f685fbaf54936e0316330d715310af66 100644 --- a/src/main/java/org/s4s/services/util/Roles.java +++ b/src/main/java/org/s4s/services/util/Roles.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.services.util; /** @@ -10,6 +5,7 @@ package org.s4s.services.util; * @author Holger */ public class Roles { + public static final String CURRENTUSER = "currentUser"; public static final String HIWI = "hiWi"; public static final String STUDENT = "student"; diff --git a/src/main/java/org/s4s/services/util/Views.java b/src/main/java/org/s4s/services/util/Views.java index 16120194681eadc0b147938af4ef491563a5c73a..e5e6381b50260c20c0fe86779d0cf62ecb870bfe 100644 --- a/src/main/java/org/s4s/services/util/Views.java +++ b/src/main/java/org/s4s/services/util/Views.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package org.s4s.services.util; /** @@ -10,6 +5,7 @@ package org.s4s.services.util; * @author Holger */ public final class Views { + public final static String REGISTRIERUNG = "registrierung"; public final static String WELCOME = "welcome"; public final static String SHOP = "shop"; @@ -28,8 +24,8 @@ public final class Views { public final static String SHOPERSTELLUNGSBESTAETIGUNG = "shoperstellungsbestaetigung"; public final static String REGISTRIERUNGSBESTAETIGUNG = "registrierungsbestaetigung"; public final static String KONTAKTBESTAETIGUNG = "kontaktbestaetigung"; - - private Views(){ - + + private Views() { + } }