Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

# Conflicts:
#	src/main/java/org/s4s/dao/RegistrationDAO.java
#	src/main/java/org/s4s/gui/views/RegistrierungView.java
#	src/main/java/org/s4s/process/control/RegistrationControl.java

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>

pom.xml

@@ -113,11 +113,11 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency> 
-        <dependency>
+       <!-- <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>LATEST</version>
-        </dependency>
+        </dependency>-->
 
          
          

src/main/java/org/s4s/dao/KundenDAO.java

-/*
- * 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;
 
 /**

src/main/java/org/s4s/dao/ProductDAO.java

-/*
- * 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.DAOException;
 import java.util.List;
+import org.s4s.exceptions.DAOException;
 import org.s4s.modell.dto.Product;
 
 /**
@@ -15,7 +10,9 @@ import org.s4s.modell.dto.Product;
  */
 public interface ProductDAO {
 
-    List<Product> getProductByTyp(String typ) throws DAOException;
+    List<Product> getProductByName(String typ) throws DAOException;
 
     List<Product> getProductByDescription(String typ) throws DAOException;
+
+    Product getProductById(int id) throws DAOException;
 }

src/main/java/org/s4s/dao/ShopDAO.java

-/*
- * 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;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.s4s.modell.dto.User;
-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 interface ShopDAO {
 
-    public static ShopDAO getInstance() {
-        if (dao == null) {
-            dao = new ShopDAO();
-        }
-        return dao;
-    }
-    
-    //Shop anhand von User/Besitzer auslesen
-    public boolean viewShop (User user) {
-        boolean result = true;
-        try {
-            ResultSet set = statement.executeQuery("SELECT *"
-                        + "FROM ERR.shop"
-                        + "WHERE besitzer = \'" + user.getBenutzername() + "\'");
+    boolean viewShop(User user);
 
-            if (set != null) {
-                result = false;
-            }
-        } catch (SQLException ex) {
-            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return result;
-    }
-    
-    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() + "," 
-                    + shopDescription + ");");
-            return true;
-        } catch (SQLException ex) {
-            Logger.getLogger(ShopDAO.class.getName()).log(Level.SEVERE, null, ex);
-            return false;
-        }
-        
-    }
+    boolean addShop(User user, String shopName);
 }

src/main/java/org/s4s/dao/ShopSearchDAO.java

+package org.s4s.dao;
+
+import java.util.List;
+import org.s4s.exceptions.DAOException;
+import org.s4s.modell.dto.Shop;
+
+/**
+ *
+ * @author Holger
+ */
+public interface ShopSearchDAO {
+
+    List<Shop> getShopByName(String typ) throws DAOException;
+
+    List<Shop> getShopByOwner(String typ) throws DAOException;
+}

src/main/java/org/s4s/dao/impl/AbstractDatabaseClass.java

-/*
- * 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;
     }*/
-    
 }

src/main/java/org/s4s/dao/impl/ShopControl.java

-/*
- * 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 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.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 {
-        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 
-        else {
-           addUserShop(shopName, shopBeschreibung);
-        }
-    }
-
-    private static void addUserShop(String shopName, String shopBeschreibung) throws SQLException {
-        boolean erstellung = ShopDAO.getInstance().addShop(user, shopName, shopBeschreibung);
-           
-        if (erstellung == true){
-            //Weiterleitung zur Shopseite, wenn Shop erfolgreich erstellt
-                 UI.getCurrent().getNavigator().navigateTo(Views.SHOP);
-        } else {
-              //Fehlerhandling 
-              throw new SQLException("Fehler beim Anlegen des Shops bitte noch einmal versuchen oder Programmierer kontaktieren!");
-        }
-    }
-}

src/main/java/org/s4s/exceptions/DAOException.java

-/*
- * 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;
 
 /**

src/main/java/org/s4s/exceptions/NoSuchProduct.java

-/*
- * 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;
 
 /**

src/main/java/org/s4s/exceptions/NoSuchUserOrPassword.java

-/*
- * 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;
 
 /**

src/main/java/org/s4s/exceptions/OwnsAlreadyShop.java

-/*
- * 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;
     }
-    
+
 }

src/main/java/org/s4s/exceptions/WrongInputException.java

-/*
- * 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;
     }

src/main/java/org/s4s/gui/InitView.java

@@ -27,7 +27,7 @@ public class InitView extends UI {
     @Override
     protected void init(VaadinRequest vaadinRequest) {
         Navigator navi = new Navigator(this, this);
-        navi.addView(Views.SHOP, ShopView.class);
+        navi.addView(Views.SUCHE, SucheView.class);
         navi.addView(Views.WELCOME, WelcomeView.class);
         navi.addView(Views.LOGIN, LoginView.class);
         navi.addView(Views.WARENKORB, WarenkorbView.class);
@@ -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);

src/main/java/org/s4s/gui/views/ArtikeldetailsView.java

-/*
- * 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.HorizontalLayout;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.s4s.dao.ProductDAO;
+import org.s4s.exceptions.DAOException;
+import org.s4s.modell.dto.Product;
+import org.s4s.process.control.ProductSearch;
+import org.s4s.services.util.Views;
 
 /**
  *
  * @author Holger
  */
-public class ArtikeldetailsView extends TemplateView{
+public class ArtikeldetailsView extends TemplateView {
+
+    private Product product = new Product();
+    private final ProductDAO products = ProductSearch.getInstance();
+    private VerticalLayout verticalLayout = new VerticalLayout();
 
     @Override
     public void enter(ViewChangeListener.ViewChangeEvent event) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        if (event.getParameters() != null) {
+            // split at "/", add each part as a label
+            String str = event.getParameters();
+            int id = Integer.parseInt(str);
+
+            this.setUp(id);
+        } else {
+            Notification.show(null, "Kein Artikel ausgewählt!", Notification.Type.HUMANIZED_MESSAGE);
+            UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
+        }
     }
 
-    
+    public void setUp(int id) {
+        getInformation(id);
+        super.setUpFooterAndHeader(verticalLayout);
+    }
+
+    private void getInformation(int id) {
+        try {
+            product = products.getProductById(id);
+            HorizontalLayout horizontalLayout = new HorizontalLayout();
+            Panel p = new Panel("Name: " + product.getName());
+            horizontalLayout.addComponent(p);
+            horizontalLayout.setComponentAlignment(p, Alignment.MIDDLE_LEFT);
+            verticalLayout.addComponent(horizontalLayout);
+            this.addComponent(verticalLayout);
+        } catch (DAOException ex) {
+            Logger.getLogger(ArtikeldetailsView.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 }

src/main/java/org/s4s/gui/views/BenutzerkontoView.java

-/*
- * 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.
     }
-    
+
 }

src/main/java/org/s4s/gui/views/CheckoutView.java

-/*
- * 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.
     }
-    
+
 }

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("&nbsp", 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);
     }
 }

src/main/java/org/s4s/gui/views/FaqView.java

-/*
- * 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.
     }
-    
+
 }

src/main/java/org/s4s/gui/views/ImpressumView.java

-/*
- * 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);