- inject DataSource in GenericDao

src/main/java/org/fhw/asta/kasse/client/components/SessionManagerComponent.java

@@ -20,7 +20,13 @@ public String getUserEmail() {
 	}
 
 	public void setLoggedIn(String email) {
-		Cookies.setCookie(COOKIE_NAME, email);
+
+		if (!Strings.isNullOrEmpty(email)) {
+			Cookies.setCookie(COOKIE_NAME, email);			
+		} else {
+			Cookies.removeCookie(COOKIE_NAME);
+		}
+
 	}
 
 }

src/main/java/org/fhw/asta/kasse/client/controller/TopbarController.java

@@ -36,23 +36,24 @@ public void init(EventBus eventBus) {
 	private void onLogin() {
 		//topbarWidget.setWidget(readyTopbarWidget);
 
-		readyTopbarWidget.getQuickBoxHandlers().addChangeHandler(new QuickBoxHandler());
+		//readyTopbarWidget.getQuickBoxHandlers().addChangeHandler(new QuickBoxHandler());
 	}
 
 	private class QuickBoxHandler implements ChangeHandler {
 
 		@Override
 		public void onChange(ChangeEvent event) {
-			HasText quickBox = readyTopbarWidget.getQuickBox();
-			String qText = quickBox.getText();
+			//HasText quickBox = readyTopbarWidget.getQuickBox();
+
+
+			String qText ="";
 
 			if(qText.matches("[a-zA-Z][0-9]+")){
 				if(qText.matches("[aA][0-9]+")){
 					articleService.getArticleById(qText.replaceAll("[a-zA-Z]", ""), new ArticleCallback());
 				} // else if(qText.matches.....
 			}
 
-			quickBox.setText("");
 		}
 
 	}

src/main/java/org/fhw/asta/kasse/client/widget/topbar/ready/ReadyTopBarWidget.java

@@ -2,9 +2,8 @@
 
 import org.fhw.asta.kasse.client.widget.topbar.TopbarWidget;
 import org.fhw.asta.kasse.client.widget.topbar.modules.navbar.NavBarWidget;
-import org.fhw.asta.kasse.client.widget.topbar.modules.quickbox.QuickBoxWidget;
 import org.fhw.asta.kasse.client.widget.topbar.modules.searchbox.SearchBoxWidget;
 
-public interface ReadyTopBarWidget extends TopbarWidget, NavBarWidget, QuickBoxWidget, SearchBoxWidget {
+public interface ReadyTopBarWidget extends TopbarWidget, NavBarWidget, SearchBoxWidget {
 
 }

src/main/java/org/fhw/asta/kasse/client/widget/topbar/ready/ReadyTopBarWidgetImpl.java

@@ -31,15 +31,9 @@ public ReadyTopBarWidgetImpl() {
 	@Inject
 	NavBarWidget navBar;
 
-	@Inject
-	QuickBoxWidget quickBox;
-
 	@Inject
 	SearchBoxWidget searchBox;
 
-	@UiField
-	HTMLPanel quickBoxPanel;
-
 	@UiField
 	HTMLPanel navBarPanel;
 
@@ -50,11 +44,9 @@ public ReadyTopBarWidgetImpl() {
 	public void init(NavBarWidget navBar, QuickBoxWidget quickBox, SearchBoxWidget searchBox)
 	{
 		this.navBar = navBar;
-		this.quickBox = quickBox;
 		this.searchBox = searchBox;
 
 		searchBoxPanel.add(searchBox);
-		quickBoxPanel.add(quickBox);
 		navBarPanel.add(navBar);		
 	}
 
@@ -63,19 +55,10 @@ public HasAnimation getNavBar() {
 		return navBar.getNavBar();
 	}
 
-	@Override
-	public HasText getQuickBox() {
-		return quickBox.getQuickBox();
-	}
-
 	@Override
 	public HasText getSearchBox() {
 		return searchBox.getSearchBox();
 	}
 
-	@Override
-	public HasChangeHandlers getQuickBoxHandlers() {
-		return quickBox.getQuickBoxHandlers();
-	}
 
 }

src/main/java/org/fhw/asta/kasse/client/widget/topbar/ready/ReadyTopBarWidgetImpl.ui.xml

@@ -5,6 +5,11 @@
 		<div class="brand">Kasse</div>
 		<g:HTMLPanel styleName="navbar-search pull-left" ui:field="searchBoxPanel" />
 		<g:HTMLPanel ui:field="navBarPanel" />
-		<g:HTMLPanel styleName="navbar-search pull-right" ui:field="quickBoxPanel" />
+
+		<div class="navbar-search pull-right">
+			<ul class="nav" >
+				<li><a href="#UserListPlace:">Logout</a></li>
+			</ul>		
+		</div>
 	</g:HTMLPanel>
 </ui:UiBinder> 

src/main/java/org/fhw/asta/kasse/server/dao/ArticleDao.java

@@ -1,12 +1,16 @@
 package org.fhw.asta.kasse.server.dao;
 
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.List;
 
 import org.fhw.asta.kasse.shared.common.EuroAmount;
 import org.fhw.asta.kasse.shared.model.Article;
 import org.fhw.asta.kasse.shared.model.Category;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.core.ConnectionCallback;
 import org.springframework.jdbc.core.RowMapper;
 
 public class ArticleDao extends GenericDao {
@@ -31,6 +35,7 @@ public Category mapRow(final ResultSet arg0, final int arg1)
 	}
 
 	public List<Article> getAllArticles() {
+
 		return this.template
 				.query("SELECT article_id,"
 						+ "article_revision, name, description, price, tax_category_name,"

src/main/java/org/fhw/asta/kasse/server/dao/GenericDao.java

@@ -1,26 +1,30 @@
 package org.fhw.asta.kasse.server.dao;
 
+import javax.sql.DataSource;
+
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
 
-public abstract class GenericDao
-{
-  @Inject
-  protected JdbcTemplate template;
+public abstract class GenericDao {
+	@Inject
+	protected JdbcTemplate template;
+
+	@Inject
+	protected DataSource dataSource;
 
-  protected <T> Optional<T> queryForObject(String sql, Object[] objects, RowMapper<T> rowMapper) {
+	protected <T> Optional<T> queryForObject(String sql, Object[] objects,
+			RowMapper<T> rowMapper) {
+
+		try {
+			T result = template.queryForObject(sql, objects, rowMapper);
+			return Optional.of(result);
+		} catch (EmptyResultDataAccessException e) {
+			return Optional.absent();
+		}
+	}
 
-	  try {
-		  T result = template.queryForObject(sql, objects, rowMapper);
-		  return Optional.of(result);		  
-	  } catch (EmptyResultDataAccessException e) {
-		  return Optional.absent();
-	  }
-  }
-
-
 }