Refactoring: loadAll is more precise

master
Markus Kreth 7 years ago
parent dd1b063e2e
commit 4c228dc743
  1. 8
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/EventBusiness.java
  2. 3
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDaoImpl.java
  3. 2
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/IDao.java
  4. 9
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java

@ -40,7 +40,7 @@ public class EventBusiness {
boolean forceRefresh) {
if (forceRefresh == false) {
List<ClubEvent> list = dao.list();
List<ClubEvent> list = dao.listAll();
log.trace("Returning events from database: {}");
return list;
}
@ -105,12 +105,14 @@ public class EventBusiness {
Set<Person> store = current.getPersons();
if (store != null) {
store.clear();
log.debug("adding to existing person set.");
store.addAll(selected);
} else {
log.debug("setting persons to event without person set.");
current.setPersons(selected);
dao.update(current);
}
dao.update(current);
log.info("Updated {} with participants: {}", current, selected);
}
}
}

@ -38,8 +38,7 @@ public abstract class AbstractDaoImpl<T> implements IDao<T> {
}
@Override
public List<T> list() {
public List<T> listAll() {
TypedQuery<T> query = em.createNamedQuery(
entityClass.getSimpleName() + ".findAll", entityClass);
return query.getResultList();

@ -6,6 +6,6 @@ public interface IDao<T> {
void save(T obj);
T update(T obj);
List<T> list();
List<T> listAll();
T get(Object primaryKey);
}

@ -62,13 +62,13 @@ public class PersonGrid extends CustomComponent {
comboGroups.setEmptySelectionCaption("Alle");
comboGroups.setItemCaptionGenerator(GroupDef::getName);
comboGroups.addSelectionListener(ev -> onGroupSelected(ev));
List<GroupDef> items = groupDao.list();
comboGroups.setItems(items);
log.info("Loaded Groups: {}", items);
allGroups = groupDao.listAll();
comboGroups.setItems(allGroups);
log.info("Loaded Groups: {}", allGroups);
HorizontalLayout filters = new HorizontalLayout();
filters.addComponents(checkIncluded, comboGroups);
dataProvider = new ListDataProvider<>(new ArrayList<>());
dataProvider = new ListDataProvider<Person>(new ArrayList<>()).withConfigurableFilter();
grid = new Grid<>();
grid.setDataProvider(dataProvider);
grid.addColumn(Person::getPrename).setCaption("Vorname");
@ -76,6 +76,7 @@ public class PersonGrid extends CustomComponent {
grid.addColumn(Person::getBirth,
b -> b != null ? birthFormat.format(b) : "")
.setCaption("Geburtstag");
grid.addComponentColumn(this::buildDeleteButton);
grid.setSelectionMode(SelectionMode.MULTI);
Button close = new Button("Schließen", ev -> {

Loading…
Cancel
Save