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

Merge from master

Browse Source 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-08-17 09:34:59 +02:00
parent 7ea17c54f1
commit e6f80756f1
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -806,10 +806,12 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
final TargetIdName targetIdName) { final TargetIdName targetIdName) {
final LazyQueryContainer targetContainer = (LazyQueryContainer) getContainerDataSource(); final LazyQueryContainer targetContainer = (LazyQueryContainer) getContainerDataSource();
final Item item = targetContainer.getItem(targetIdName); final Item item = targetContainer.getItem(targetIdName);
item.getItemProperty(SPUILabelDefinitions.VAR_TARGET_STATUS).setValue(targetInfo.getUpdateStatus());
item.getItemProperty(SPUILabelDefinitions.VAR_NAME).setValue(target.getName()); item.getItemProperty(SPUILabelDefinitions.VAR_NAME).setValue(target.getName());
item.getItemProperty(SPUILabelDefinitions.VAR_POLL_STATUS_TOOL_TIP) if (targetInfo != null) {
.setValue(HawkbitCommonUtil.getPollStatusToolTip(targetInfo.getPollStatus(), i18n)); item.getItemProperty(SPUILabelDefinitions.VAR_POLL_STATUS_TOOL_TIP)
.setValue(HawkbitCommonUtil.getPollStatusToolTip(targetInfo.getPollStatus(), i18n));
item.getItemProperty(SPUILabelDefinitions.VAR_TARGET_STATUS).setValue(targetInfo.getUpdateStatus());
}
} }
private boolean isLastSelectedTarget(final TargetIdName targetIdName) { private boolean isLastSelectedTarget(final TargetIdName targetIdName) {
@@ -854,14 +856,12 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
} }
} }
private void onTargetUpdateEvents(final List<TargetUpdatedEvent> events) {
private void onTargetUpdateEvents(List<TargetUpdatedEvent> events) {
final List<Object> visibleItemIds = (List<Object>) getVisibleItemIds(); final List<Object> visibleItemIds = (List<Object>) getVisibleItemIds();
boolean shoulTargetsUpdated = false; boolean shoulTargetsUpdated = false;
Target lastSelectedTarget = null; Target lastSelectedTarget = null;
for (final TargetUpdatedEvent targetUpdatedEvent : events) { for (final TargetUpdatedEvent targetUpdatedEvent : events) {
Target target = targetUpdatedEvent.getEntity(); final Target target = targetUpdatedEvent.getEntity();
final TargetIdName targetIdName = target.getTargetIdName(); final TargetIdName targetIdName = target.getTargetIdName();
if (Filters.or(getTargetTableFilters(target)).doFilter()) { if (Filters.or(getTargetTableFilters(target)).doFilter()) {
shoulTargetsUpdated = true; shoulTargetsUpdated = true;
@@ -882,8 +882,6 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
} }
} }
private void onTargetCreatedEvents() { private void onTargetCreatedEvents() {
refreshTargets(); refreshTargets();
} }