From 1b5975523947795ecd5e38e2d20992e90448b23e Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Mon, 13 Jun 2016 17:49:09 +0200 Subject: [PATCH] Optimize multiselect Signed-off-by: Melanie Retter --- .../filterlayout/AbstractFilterButtons.java | 12 --------- .../dstable/DistributionSetTableLayout.java | 7 +++--- .../event/DistributionSetTableEvent.java | 25 +++++++++++++++++++ .../event/DistributionSetTypeEvent.java | 2 +- .../event/SoftwareModuleTableEvent.java | 25 +++---------------- .../dstable/DistributionTableLayout.java | 7 +++--- .../event/DistributionTableEvent.java | 23 ++--------------- .../ui/management/event/TargetTableEvent.java | 4 +-- 8 files changed, 41 insertions(+), 64 deletions(-) create mode 100644 hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTableEvent.java diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java index 2b0eee279..aec0029d0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java @@ -77,7 +77,6 @@ public abstract class AbstractFilterButtons extends Table { setDragMode(TableDragMode.NONE); setSelectable(false); setSizeFull(); - setMultiSelect(true); } private void setStyle() { @@ -194,17 +193,6 @@ public abstract class AbstractFilterButtons extends Table { setContainerDataSource(createButtonsLazyQueryContainer()); } - // /** - // * Select all rows in the table. - // */ - // public void selectAll() { - // setValue(createButtonsLazyQueryContainer().getItemIds()); - // } - // - // public void unSelectAll() { - // setValue(null); - // } - /** * Id of the buttons table to be used in test cases. * diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java index ef6d3ae4a..cf365b081 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java @@ -11,8 +11,8 @@ package org.eclipse.hawkbit.ui.distributions.dstable; import javax.annotation.PostConstruct; import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; -import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent; -import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent.DistributionSetTypeEnum; +import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent; +import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent.DistributionTableComponentEvent; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.event.Action; @@ -77,7 +77,8 @@ public class DistributionSetTableLayout extends AbstractTableLayout { public void handleAction(final Action action, final Object sender, final Object target) { if (ACTION_CTRL_A.equals(action)) { dsTable.selectAll(); - getEventBus().publish(this, new DistributionSetTypeEvent(DistributionSetTypeEnum.SELECT_ALL)); + getEventBus().publish(this, + new DistributionSetTableEvent(DistributionTableComponentEvent.SELECT_ALL)); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTableEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTableEvent.java new file mode 100644 index 000000000..d1a5643a1 --- /dev/null +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTableEvent.java @@ -0,0 +1,25 @@ +package org.eclipse.hawkbit.ui.distributions.event; + +public class DistributionSetTableEvent { + + private final DistributionTableComponentEvent distributionSetTableEvent; + + /** + * The component event. + * + * @param distributionSetTableEvent + * the distributionSet component event. + */ + public DistributionSetTableEvent(final DistributionTableComponentEvent distributionSetTableEvent) { + this.distributionSetTableEvent = distributionSetTableEvent; + } + + /** + * DistributionSet table components events. + * + */ + public enum DistributionTableComponentEvent { + SELECT_ALL + } + +} diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTypeEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTypeEvent.java index 3df0a7dd3..c6a625b10 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTypeEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionSetTypeEvent.java @@ -19,7 +19,7 @@ public class DistributionSetTypeEvent { * DistributionSet type events in the Distribution UI. */ public enum DistributionSetTypeEnum { - ADD_DIST_SET_TYPE, DELETE_DIST_SET_TYPE, UPDATE_DIST_SET_TYPE, ON_VALUE_CHANGE, SELECT_ALL + ADD_DIST_SET_TYPE, DELETE_DIST_SET_TYPE, UPDATE_DIST_SET_TYPE, ON_VALUE_CHANGE } private DistributionSetType distributionSetType; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/SoftwareModuleTableEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/SoftwareModuleTableEvent.java index f722c3a23..772afd927 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/SoftwareModuleTableEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/SoftwareModuleTableEvent.java @@ -8,36 +8,20 @@ */ package org.eclipse.hawkbit.ui.distributions.event; -import org.eclipse.hawkbit.repository.model.SoftwareModule; -import org.eclipse.hawkbit.ui.common.table.BaseEntityEvent; -import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType; - /** - * Class which contains the Event when selecting all entries of a table + * Class which contains the Event when selecting all entries of the + * softwareModule table */ -public class SoftwareModuleTableEvent extends BaseEntityEvent { +public class SoftwareModuleTableEvent { /** * SoftwareModule table components events. - * */ public enum SoftwareModuleComponentEvent { SELECT_ALL } - private SoftwareModuleComponentEvent softwareModuleComponentEvent; - - /** - * Constructor. - * - * @param eventType - * the event type. - * @param entity - * the entity - */ - public SoftwareModuleTableEvent(final BaseEntityEventType eventType, final SoftwareModule entity) { - super(eventType, entity); - } + private final SoftwareModuleComponentEvent softwareModuleComponentEvent; /** * The component event. @@ -46,7 +30,6 @@ public class SoftwareModuleTableEvent extends BaseEntityEvent { * the softwareModule component event. */ public SoftwareModuleTableEvent(final SoftwareModuleComponentEvent softwareModuleComponentEvent) { - super(null, null); this.softwareModuleComponentEvent = softwareModuleComponentEvent; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java index 213dda654..2cd34d3fa 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java @@ -11,8 +11,8 @@ package org.eclipse.hawkbit.ui.management.dstable; import javax.annotation.PostConstruct; import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; -import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent; -import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent.DistributionTableComponentEvent; +import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent; +import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent.DistributionTableComponentEvent; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.event.Action; @@ -73,7 +73,8 @@ public class DistributionTableLayout extends AbstractTableLayout { public void handleAction(final Action action, final Object sender, final Object target) { if (ACTION_CTRL_A.equals(action)) { dsTable.selectAll(); - getEventBus().publish(this, new DistributionTableEvent(DistributionTableComponentEvent.SELECT_ALL)); + getEventBus().publish(this, + new DistributionSetTableEvent(DistributionTableComponentEvent.SELECT_ALL)); } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTableEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTableEvent.java index e60f432e7..c35942682 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTableEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTableEvent.java @@ -13,20 +13,11 @@ import org.eclipse.hawkbit.ui.common.table.BaseEntityEvent; import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType; /** - * - * - * + * Class which contains the Event when selecting all entries of the + * distributions table */ public class DistributionTableEvent extends BaseEntityEvent { - /** - * DistributionSet table components events. - * - */ - public enum DistributionTableComponentEvent { - SELECT_ALL - } - /** * Constructor. * @@ -39,14 +30,4 @@ public class DistributionTableEvent extends BaseEntityEvent { super(eventType, entity); } - /** - * The component event. - * - * @param DistributionSetTableEvent - * the distributionSet component event. - */ - public DistributionTableEvent(final DistributionTableComponentEvent distributionComponentEvent) { - super(null, null); - } - } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/TargetTableEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/TargetTableEvent.java index 04dd917a9..4cfbeecf5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/TargetTableEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/TargetTableEvent.java @@ -13,9 +13,7 @@ import org.eclipse.hawkbit.ui.common.table.BaseEntityEvent; import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType; /** - * - * - * + * Class which contains the Event when selecting all entries of the target table */ public class TargetTableEvent extends BaseEntityEvent {