From 53a0786c8911f7463dfa6d27a85b3293dabb328e Mon Sep 17 00:00:00 2001
From: hkarwa2s <holger.karwanni@smail.inf.h-brs.de>
Date: Wed, 24 May 2017 10:50:00 +0200
Subject: [PATCH] optisch funktionierender Logout
---
nbactions.xml | 14 ++++++++++++++
.../java/org/s4s/gui/views/ShopErstellung.java | 13 ++++++++++++-
src/main/java/org/s4s/gui/views/TemplateView.java | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 nbactions.xml
diff --git a/nbactions.xml b/nbactions.xml
new file mode 100644
index 0000000..921ab9c
--- /dev/null
+++ b/nbactions.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <packagings>
+ <packaging>war</packaging>
+ <packaging>ear</packaging>
+ <packaging>ejb</packaging>
+ </packagings>
+ <goals>
+ <goal>jetty:run</goal>
+ </goals>
+ </action>
+ </actions>
diff --git a/src/main/java/org/s4s/gui/views/ShopErstellung.java b/src/main/java/org/s4s/gui/views/ShopErstellung.java
index 5b9f1e3..d8a0816 100644
--- a/src/main/java/org/s4s/gui/views/ShopErstellung.java
+++ b/src/main/java/org/s4s/gui/views/ShopErstellung.java
@@ -19,6 +19,11 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
+import java.sql.SQLException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.s4s.dao.impl.ShopControl;
+import org.s4s.exceptions.OwnsAlreadyShop;
import org.s4s.services.util.Views;
/**
@@ -80,7 +85,13 @@ public class ShopErstellung extends TemplateView implements View {
// String email = emailTxt.getValue();
String shopName = shopname.getValue();
String beschreibung = area.getValue();
- // ShopControl.checkUserShop(shopName, beschreibung);
+ try {
+ ShopControl.checkUserShop(shopName, beschreibung);
+ } catch (OwnsAlreadyShop ex) {
+ Logger.getLogger(ShopErstellung.class.getName()).log(Level.SEVERE, null, ex);
+ } catch (SQLException ex) {
+ Logger.getLogger(ShopErstellung.class.getName()).log(Level.SEVERE, null, ex);
+ }
UI.getCurrent().getNavigator().navigateTo(Views.SHOPERSTELLUNGSBESTAETIGUNG);
// select.addValueChangeListener(event ->);
diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java
index c1c5a65..06c91bc 100644
--- a/src/main/java/org/s4s/gui/views/TemplateView.java
+++ b/src/main/java/org/s4s/gui/views/TemplateView.java
@@ -103,6 +103,7 @@ public class TemplateView extends VerticalLayout implements View {
UI.getCurrent().getNavigator().navigateTo(Views.BENUTZERKONTO);
break;
case "Logout":
+ session.setAttribute(Roles.CURRENTUSER, null);
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
break;
case "Kontakt":
--
GitLab