lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

STRG+A for selecting all table rows, remove contextMenu, remove empty

Browse Source 
lines

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-06-08 13:02:29 +02:00
parent 9254e9ba68
commit 1047219ad2
18 changed files with 18 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
View File

@@ -35,7 +35,6 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -213,14 +212,4 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
artifactUploadState.setNoDataAvilableSoftwareModule(!available);
}
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
if (actionSelectAll.equals(action)) {
selectAll();
eventBus.publish(this, new SoftwareModuleEvent());
}
if (actionUnSelectAll.equals(action)) {
unSelectAll();
}
}
}

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java
View File

@@ -21,9 +21,6 @@ import com.vaadin.spring.annotation.ViewScope;
/**
* Software module table layout. (Upload Management)
*
*
*
*/
@SpringComponent
@ViewScope

35
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java
View File

@@ -15,8 +15,6 @@ import javax.annotation.PreDestroy;
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
import org.eclipse.hawkbit.ui.decorators.SPUITagButtonStyle;
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
import org.eclipse.hawkbit.ui.management.event.TargetTableEvent.TargetComponentEvent;
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
import org.eclipse.hawkbit.ui.utils.I18N;
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
@@ -27,9 +25,6 @@ import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer;
import org.vaadin.spring.events.EventBus;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.ShortcutAction;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.server.FontAwesome;
import com.vaadin.ui.Button;
@@ -40,12 +35,8 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Parent class for filter button layout.
*
*
*
*
*/
public abstract class AbstractFilterButtons extends Table implements Handler {
public abstract class AbstractFilterButtons extends Table {
private static final long serialVersionUID = 7783305719009746375L;
@@ -58,9 +49,6 @@ public abstract class AbstractFilterButtons extends Table implements Handler {
private AbstractFilterButtonClickBehaviour filterButtonClickBehaviour;
private ShortcutAction actionSelectAll;
private ShortcutAction actionUnSelectAll;
@Autowired
protected I18N i18n;
@@ -94,8 +82,6 @@ public abstract class AbstractFilterButtons extends Table implements Handler {
setSelectable(false);
setSizeFull();
setMultiSelect(true);
actionSelectAll = new ShortcutAction(i18n.get("action.target.table.selectall"));
actionUnSelectAll = new ShortcutAction(i18n.get("action.target.table.clear"));
}
private void setStyle() {
@@ -140,8 +126,7 @@ public abstract class AbstractFilterButtons extends Table implements Handler {
} else if (id != null && isClickedByDefault(name)) {
filterButtonClickBehaviour.setDefaultClickedButton(typeButton);
}
final DragAndDropWrapper wrapper = createDragAndDropWrapper(typeButton, name, id);
return wrapper;
return createDragAndDropWrapper(typeButton, name, id);
}
protected boolean isNoTagSateSelected() {
@@ -211,22 +196,6 @@ public abstract class AbstractFilterButtons extends Table implements Handler {
setContainerDataSource(createButtonsLazyQueryContainer());
}
@Override
public Action[] getActions(final Object target, final Object sender) {
return new Action[] { actionSelectAll, actionUnSelectAll };
}
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
if (actionSelectAll.equals(action)) {
selectAll();
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.SELLECT_ALL));
}
if (actionUnSelectAll.equals(action)) {
unSelectAll();
}
}
/**
* Select all rows in the table.
*/

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractNamedVersionTable.java
View File

@@ -15,9 +15,6 @@ import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
import org.eclipse.hawkbit.ui.utils.TableColumn;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.ShortcutAction;
/**
* Abstract table to handling {@link NamedVersionedEntity}
@@ -27,23 +24,16 @@ import com.vaadin.event.ShortcutAction;
* @param <I>
* i is the id of the table
*/
public abstract class AbstractNamedVersionTable<E extends NamedVersionedEntity, I> extends AbstractTable<E, I>
implements Handler {
public abstract class AbstractNamedVersionTable<E extends NamedVersionedEntity, I> extends AbstractTable<E, I> {
private static final long serialVersionUID = 780050712209750719L;
protected ShortcutAction actionSelectAll;
protected ShortcutAction actionUnSelectAll;
/**
* Initialize the component.
*/
@Override
protected void init() {
super.init();
actionSelectAll = new ShortcutAction(i18n.get("action.target.table.selectall"));
actionUnSelectAll = new ShortcutAction(i18n.get("action.target.table.clear"));
setMultiSelect(true);
setSelectable(true);
}
@@ -64,11 +54,6 @@ public abstract class AbstractNamedVersionTable<E extends NamedVersionedEntity,
item.getItemProperty(SPUILabelDefinitions.VAR_VERSION).setValue(baseEntity.getVersion());
}
@Override
public Action[] getActions(final Object target, final Object sender) {
return new Action[] { actionSelectAll, actionUnSelectAll };
}
/**
* Select all rows in the table.
*/

1
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
View File

@@ -53,7 +53,6 @@ public abstract class AbstractTable<E extends NamedEntity, I> extends Table {
private static final Logger LOG = LoggerFactory.getLogger(AbstractTable.class);
// TODO MR should be private and use with getter/setter
@Autowired
protected transient EventBus.SessionEventBus eventBus;

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
View File

@@ -36,10 +36,6 @@ import com.vaadin.ui.VerticalLayout;
/**
* Parent class for table header.
*
*
*
*
*/
public abstract class AbstractTableHeader extends VerticalLayout {

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableLayout.java
View File

@@ -21,10 +21,6 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Parent class for table layout.
*
*
*
*
*/
public abstract class AbstractTableLayout extends VerticalLayout {

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java
View File

@@ -31,9 +31,6 @@ import com.vaadin.spring.annotation.ViewScope;
/**
* Distribution Set Type filter buttons.
*
*
*
*/
@SpringComponent
@ViewScope

16
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
View File

@@ -30,8 +30,6 @@ import org.eclipse.hawkbit.ui.common.DistributionSetIdName;
import org.eclipse.hawkbit.ui.common.table.AbstractNamedVersionTable;
import org.eclipse.hawkbit.ui.common.table.AbstractTable;
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent;
import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTableEvent.DistributionSetComponentEvent;
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteria;
import org.eclipse.hawkbit.ui.distributions.event.DragEvent;
@@ -56,7 +54,6 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -68,7 +65,6 @@ import com.vaadin.ui.UI;
/**
* Distribution set table.
*
*/
@SpringComponent
@ViewScope
@@ -471,18 +467,6 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
@Override
protected void setDataAvailable(final boolean available) {
manageDistUIState.setNoDataAvailableDist(!available);
}
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
if (actionSelectAll.equals(action)) {
selectAll();
eventBus.publish(this, new DistributionSetTableEvent(DistributionSetComponentEvent.SELECT_ALL));
}
if (actionUnSelectAll.equals(action)) {
unSelectAll();
}
}
}

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java
View File

@@ -21,10 +21,7 @@ import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.ViewScope;
/**
* Software module table layout.
*
*
*
* DistributionSet table layout.
*/
@SpringComponent
@ViewScope

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
View File

@@ -26,8 +26,6 @@ import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
import org.eclipse.hawkbit.ui.distributions.event.DistributionsUIEvent;
import org.eclipse.hawkbit.ui.distributions.event.DistributionsViewAcceptCriteria;
import org.eclipse.hawkbit.ui.distributions.event.SaveActionWindowEvent;
import org.eclipse.hawkbit.ui.distributions.event.SoftwareModuleTableEvent;
import org.eclipse.hawkbit.ui.distributions.event.SoftwareModuleTableEvent.SoftwareModuleComponentEvent;
import org.eclipse.hawkbit.ui.distributions.state.ManageDistUIState;
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
@@ -44,8 +42,6 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -66,7 +62,7 @@ import com.vaadin.ui.Window;
*/
@SpringComponent
@ViewScope
public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Long> implements Handler {
public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Long> {
private static final long serialVersionUID = 6785314784507424750L;
@@ -392,15 +388,4 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
}
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
if (actionSelectAll.equals(action)) {
selectAll();
eventBus.publish(this, new SoftwareModuleTableEvent(SoftwareModuleComponentEvent.SELECT_ALL));
}
if (actionUnSelectAll.equals(action)) {
unSelectAll();
}
}
}

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java
View File

@@ -22,9 +22,6 @@ import com.vaadin.spring.annotation.ViewScope;
/**
* Implementation of software module Layout .
*
*
*
*/
@SpringComponent
@ViewScope

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
View File

@@ -53,7 +53,6 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -639,9 +638,9 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
/**
* Added by Saumya Target pin listener.
*
* @param installedDistItemIds
* @param installedDistItemId
* Item ids of installed distribution set
* @param assignedDistTableItemIds
* @param assignedDistTableItemId
* Item ids of assigned distribution set
*/
public void styleDistributionSetTable(final Long installedDistItemId, final Long assignedDistTableItemId) {
@@ -659,11 +658,4 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
}
//TODO MR
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
// TODO Auto-generated method stub
}
}

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java
View File

@@ -22,9 +22,6 @@ import com.vaadin.spring.annotation.ViewScope;
/**
* Software module table layout.
*
*
*
*/
@SpringComponent
@ViewScope

89
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
View File

@@ -10,7 +10,6 @@ package org.eclipse.hawkbit.ui.management.targettable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -24,7 +23,6 @@ import org.eclipse.hawkbit.repository.TargetManagement;
import org.eclipse.hawkbit.repository.eventbus.event.TargetCreatedEvent;
import org.eclipse.hawkbit.repository.eventbus.event.TargetInfoUpdateEvent;
import org.eclipse.hawkbit.repository.model.Target;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
import org.eclipse.hawkbit.repository.model.TargetIdName;
import org.eclipse.hawkbit.repository.model.TargetInfo;
import org.eclipse.hawkbit.repository.model.TargetTagAssignmentResult;
@@ -63,7 +61,6 @@ import org.eclipse.hawkbit.ui.utils.UINotification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory;
import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer;
import org.vaadin.addons.lazyquerycontainer.LazyQueryDefinition;
@@ -71,12 +68,8 @@ import org.vaadin.spring.events.EventScope;
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.ShortcutAction;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
@@ -95,11 +88,10 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Concrete implementation of Target table.
*
*/
@SpringComponent
@ViewScope
public class TargetTable extends AbstractTable<Target, TargetIdName> implements Handler {
public class TargetTable extends AbstractTable<Target, TargetIdName> {
private static final Logger LOG = LoggerFactory.getLogger(TargetTable.class);
private static final String TARGET_PINNED = "targetPinned";
@@ -127,15 +119,10 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
private Button targetPinnedBtn;
private Boolean isTargetPinned = Boolean.FALSE;
private ShortcutAction actionSelectAll;
private ShortcutAction actionUnSelectAll;
@Override
protected void init() {
super.init();
addActionHandler(this);
actionSelectAll = new ShortcutAction(i18n.get("action.target.table.selectall"));
actionUnSelectAll = new ShortcutAction(i18n.get("action.target.table.clear"));
setItemDescriptionGenerator(new AssignInstalledDSTooltipGenerator());
}
@@ -260,22 +247,6 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
HawkbitCommonUtil.addTargetTableContainerProperties(container);
}
@Override
public Action[] getActions(final Object target, final Object sender) {
return new Action[] { actionSelectAll, actionUnSelectAll };
}
@Override
public void handleAction(final Action action, final Object sender, final Object target) {
if (actionSelectAll.equals(action)) {
selectAll();
eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.SELLECT_ALL));
}
if (actionUnSelectAll.equals(action)) {
unSelectAll();
}
}
@Override
protected void addCustomGeneratedColumns() {
addGeneratedColumn(SPUIDefinitions.TARGET_STATUS_PIN_TOGGLE_ICON,
@@ -354,7 +325,6 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
};
}
// TODO MR
private void onTargetDeletedEvent(final List<TargetDeletedEvent> events) {
final LazyQueryContainer targetContainer = (LazyQueryContainer) getContainerDataSource();
final List<Object> visibleItemIds = (List<Object>) getVisibleItemIds();
@@ -454,7 +424,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
pinBtn.setHeightUndefined();
pinBtn.setData(itemId);
pinBtn.setId(SPUIComponentIdProvider.TARGET_PIN_ICON + "." + itemId);
pinBtn.addClickListener(event -> addPinClickListener(event));
pinBtn.addClickListener(this::addPinClickListener);
if (isPinned(((TargetIdName) itemId).getControllerId())) {
pinBtn.addStyleName(TARGET_PINNED);
isTargetPinned = Boolean.TRUE;
@@ -931,62 +901,11 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
*/
public void selectAll() {
// final PageRequest pageRequest = new OffsetBasedPageRequest(0, size(),
// new Sort(SPUIDefinitions.TARGET_TABLE_CREATE_AT_SORT_ORDER,
// "createdAt"));
// List<TargetIdName> targetIdList;
// // is custom filter selected
// if
// (managementUIState.getTargetTableFilters().getTargetFilterQuery().isPresent())
// {
// targetIdList = getTargetIdsByCustomFilters(pageRequest);
// } else {
// targetIdList = getTargetIdsBySimpleFilters(pageRequest);
// }
// setValue(targetIdList);
// TODO MR
// As Vaadin Table only returns the current ItemIds which are visible
// you don't need to search explicit for them.
setValue(getItemIds());
}
private List<TargetIdName> getTargetIdsBySimpleFilters(final PageRequest pageRequest) {
final Long filterByDistId = managementUIState.getTargetTableFilters().getDistributionSet().isPresent()
? managementUIState.getTargetTableFilters().getDistributionSet().get().getId() : null;
final List<TargetUpdateStatus> statusList = new ArrayList<>();
if (isFilteredByStatus()) {
statusList.addAll(managementUIState.getTargetTableFilters().getClickedStatusTargetTags());
}
final List<String> tagList = new ArrayList<>();
if (isFilteredByTags()) {
tagList.addAll(managementUIState.getTargetTableFilters().getClickedTargetTags());
}
String searchText = managementUIState.getTargetTableFilters().getSearchText().isPresent()
? managementUIState.getTargetTableFilters().getSearchText().get() : null;
if (!Strings.isNullOrEmpty(searchText)) {
searchText = String.format("%%%s%%", searchText);
}
final Boolean noTagSelected = managementUIState.getTargetTableFilters().isNoTagSelected();
final String[] tagArray = tagList.toArray(new String[tagList.size()]);
List<TargetIdName> targetIdList;
targetIdList = targetManagement.findAllTargetIdsByFilters(pageRequest, statusList, searchText, filterByDistId,
noTagSelected, tagList.toArray(tagArray));
Collections.reverse(targetIdList);
return targetIdList;
}
private List<TargetIdName> getTargetIdsByCustomFilters(final PageRequest pageRequest) {
List<TargetIdName> targetIdList;
final TargetFilterQuery targetFilterQuery = managementUIState.getTargetTableFilters().getTargetFilterQuery()
.isPresent() ? managementUIState.getTargetTableFilters().getTargetFilterQuery().get() : null;
targetIdList = targetManagement.findAllTargetIdsByTargetFilterQuery(pageRequest, targetFilterQuery);
Collections.reverse(targetIdList);
return targetIdList;
}
/**
* Clear all selections in the table.
*/
@@ -1073,10 +992,6 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> implements
return targetManagement.countTargetsAll();
}
private static TargetIdName getLastSelectedItem(final Set<TargetIdName> values) {
return Iterables.getLast(values);
}
private boolean isFilteredByStatus() {
return !managementUIState.getTargetTableFilters().getClickedStatusTargetTags().isEmpty();
}

21
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java
View File

@@ -65,9 +65,6 @@ public class TargetTableHeader extends AbstractTableHeader {
@Autowired
private ManagementUIState managementUIState;
@Autowired
private transient EventBus.SessionEventBus eventBus;
@Autowired
private ManagementViewAcceptCriteria managementViewAcceptCriteria;
@@ -231,14 +228,14 @@ public class TargetTableHeader extends AbstractTableHeader {
@Override
protected void showFilterButtonsLayout() {
managementUIState.setTargetTagFilterClosed(false);
eventBus.publish(this, ManagementUIEvent.SHOW_TARGET_TAG_LAYOUT);
eventbus.publish(this, ManagementUIEvent.SHOW_TARGET_TAG_LAYOUT);
}
@Override
protected void resetSearchText() {
if (managementUIState.getTargetTableFilters().getSearchText().isPresent()) {
managementUIState.getTargetTableFilters().setSearchText(null);
eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_TEXT);
eventbus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_TEXT);
}
}
@@ -255,13 +252,13 @@ public class TargetTableHeader extends AbstractTableHeader {
@Override
public void maximizeTable() {
managementUIState.setTargetTableMaximized(Boolean.TRUE);
eventBus.publish(this, new TargetTableEvent(BaseEntityEventType.MAXIMIZED,null));
eventbus.publish(this, new TargetTableEvent(BaseEntityEventType.MAXIMIZED,null));
}
@Override
public void minimizeTable() {
managementUIState.setTargetTableMaximized(Boolean.FALSE);
eventBus.publish(this, new TargetTableEvent(BaseEntityEventType.MINIMIZED,null));
eventbus.publish(this, new TargetTableEvent(BaseEntityEventType.MINIMIZED,null));
}
@Override
@@ -277,12 +274,12 @@ public class TargetTableHeader extends AbstractTableHeader {
@Override
protected void searchBy(final String newSearchText) {
managementUIState.getTargetTableFilters().setSearchText(newSearchText);
eventBus.publish(this, TargetFilterEvent.FILTER_BY_TEXT);
eventbus.publish(this, TargetFilterEvent.FILTER_BY_TEXT);
}
@Override
protected void addNewItem(final ClickEvent event) {
eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
eventbus.publish(this, DragEvent.HIDE_DROP_HINT);
targetAddUpdateWindow.resetComponents();
final Window addTargetWindow = targetAddUpdateWindow.getWindow();
addTargetWindow.setCaption(i18n.get("caption.add.new.target"));
@@ -402,12 +399,12 @@ public class TargetTableHeader extends AbstractTableHeader {
getFilterDroppedInfo().addComponent(filteredDistLabel);
getFilterDroppedInfo().addComponent(filterLabelClose);
getFilterDroppedInfo().setExpandRatio(filteredDistLabel, 1.0f);
eventBus.publish(this, TargetFilterEvent.FILTER_BY_DISTRIBUTION);
eventbus.publish(this, TargetFilterEvent.FILTER_BY_DISTRIBUTION);
}
private void closeFilterByDistribution() {
eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
eventbus.publish(this, DragEvent.HIDE_DROP_HINT);
/* Remove filter by distribution information. */
getFilterDroppedInfo().removeAllComponents();
getFilterDroppedInfo().setSizeUndefined();
@@ -415,7 +412,7 @@ public class TargetTableHeader extends AbstractTableHeader {
managementUIState.getTargetTableFilters().setDistributionSet(null);
/* Reload the table */
eventBus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_DISTRIBUTION);
eventbus.publish(this, TargetFilterEvent.REMOVE_FILTER_BY_DISTRIBUTION);
}
@Override

9
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java
View File

@@ -18,26 +18,17 @@ import org.vaadin.spring.events.EventBus;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.ShortcutAction;
import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.ViewScope;
/**
* Target table layout.
*
*
*
*/
@SpringComponent
@ViewScope
public class TargetTableLayout extends AbstractTableLayout {
private static final long serialVersionUID = 2248703121998709112L;
/**
* action for the shortcut key ctrl + 'A'.
*/
private static final ShortcutAction ACTION_CTRL_A = new ShortcutAction("Select All", ShortcutAction.KeyCode.A,
new int[] { ShortcutAction.ModifierKey.CTRL });
@Autowired
private transient EventBus.SessionEventBus eventBus;

4
hawkbit-ui/src/main/resources/messages_de.properties
View File

@@ -299,10 +299,6 @@ message.tag.use.bulk.upload = {0} cannot be deleted .It is in use in targets bul
message.bulk.upload.tag.assignment.failed = Tag {0} assignment failed as tag no longer exists
message.bulk.upload.tag.assignments.failed= Few tag assignments failed as tags no longer exists
# action info
action.target.table.selectall = Select all (Ctrl+A)
action.target.table.clear = Clear selections
#reused messages
soft.module.jvm =Runtime
soft.module.application =Application