From abf9136e7e0f67a53eadfdcc83da2284fc8765a3 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 8 Feb 2016 08:27:54 +0100 Subject: [PATCH] format source code correctly and add javadoc to TargetFields. Signed-off-by: Michael Hirsch --- .../org/eclipse/hawkbit/repository/TargetFields.java | 6 ++++++ .../ui/filtermanagement/CustomTargetBeanQuery.java | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index 0f38671d8..d941f214f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -51,8 +51,14 @@ public enum TargetFields implements FieldNameProvider { */ ATTRIBUTE("targetInfo.controllerAttributes", true), + /** + * distribution sets which is assigned to the target. + */ ASSIGNEDDS("assignedDistributionSet", "name", "version"), + /** + * distribution sets which is installed on the target. + */ INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"), /** * The tags field. diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java index 8cc0be3d7..51e384946 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java @@ -99,11 +99,11 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { Slice targetBeans; final List proxyTargetBeans = new ArrayList<>(); if (!Strings.isNullOrEmpty(filterQuery)) { - targetBeans = targetManagement.findTargetsAll(filterQuery, new PageRequest(startIndex - / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll(filterQuery, + new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); } else { - targetBeans = targetManagement.findTargetsAll(new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, - SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll( + new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); } for (final Target targ : targetBeans) { @@ -138,8 +138,8 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus()); prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery()); prxyTarget.setTargetInfo(targ.getTargetInfo()); - prxyTarget.setPollStatusToolTip(HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo() - .getPollStatus(), getI18N())); + prxyTarget.setPollStatusToolTip( + HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo().getPollStatus(), getI18N())); proxyTargetBeans.add(prxyTarget); } return proxyTargetBeans;