From 3b5f12b7a477e1ee75b397b49c1e88902c9f60bd Mon Sep 17 00:00:00 2001
From: Melanie Retter <melanie.retter@bosch-si.com>
Date: Tue, 20 Jun 2017 07:55:31 +0200
Subject: [PATCH] Refactor error message if software module assignment to
 distribution fails (#540)

* Refactor error message if sw module assignment to distribution fails

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Refactor message

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
---
 .../distributions/dstable/DistributionSetTable.java  | 12 +++++++-----
 hawkbit-ui/src/main/resources/messages.properties    |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index c4cfd60a8..7ab6ba590 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -93,7 +93,8 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
 
     DistributionSetTable(final UIEventBus eventBus, final VaadinMessageSource i18n, final UINotification notification,
             final SpPermissionChecker permissionChecker, final ManageDistUIState manageDistUIState,
-            final DistributionSetManagement distributionSetManagement, final SoftwareModuleManagement softwareManagement,
+            final DistributionSetManagement distributionSetManagement,
+            final SoftwareModuleManagement softwareManagement,
             final DistributionsViewClientCriterion distributionsViewClientCriterion,
             final TargetManagement targetManagement, final DsMetadataPopupLayout dsMetadataPopupLayout) {
         super(eventBus, i18n, notification);
@@ -259,7 +260,8 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
             final String name = (String) softwareItem.getItemProperty(SPUILabelDefinitions.VAR_NAME).getValue();
             final String swVersion = (String) softwareItem.getItemProperty(SPUILabelDefinitions.VAR_VERSION).getValue();
 
-            final Optional<SoftwareModule> softwareModule = softwareModuleManagement.findSoftwareModuleById(softwareModuleId);
+            final Optional<SoftwareModule> softwareModule = softwareModuleManagement
+                    .findSoftwareModuleById(softwareModuleId);
 
             if (softwareModule.isPresent() && validSoftwareModule((Long) distId, softwareModule.get())) {
                 final SoftwareModuleIdName softwareModuleIdName = new SoftwareModuleIdName(softwareModuleId,
@@ -342,8 +344,8 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
         if (ds.getModules().contains(sm)) {
             /* Already has software module */
             notification.displayValidationError(i18n.getMessage("message.software.dist.already.assigned",
-                    HawkbitCommonUtil.concatStrings(":", ds.getName(), ds.getVersion()),
-                    HawkbitCommonUtil.concatStrings(":", sm.getName(), sm.getVersion())));
+                    HawkbitCommonUtil.concatStrings(":", sm.getName(), sm.getVersion()),
+                    HawkbitCommonUtil.concatStrings(":", ds.getName(), ds.getVersion())));
             return false;
         }
 
@@ -351,7 +353,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
             /* Invalid type of the software module */
             notification.displayValidationError(i18n.getMessage("message.software.dist.type.notallowed",
                     HawkbitCommonUtil.concatStrings(":", sm.getName(), sm.getVersion()),
-                    HawkbitCommonUtil.concatStrings(":", ds.getName(), ds.getVersion())));
+                    HawkbitCommonUtil.concatStrings(":", ds.getName(), ds.getVersion()), sm.getType().getName()));
             return false;
         }
         return true;
diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties
index 24851c5eb..fbf11f882 100644
--- a/hawkbit-ui/src/main/resources/messages.properties
+++ b/hawkbit-ui/src/main/resources/messages.properties
@@ -402,11 +402,11 @@ label.drop.dist.delete.area = Drop here<br>to delete
 label.no.tag.assigned = NO TAG
 caption.assign.software.dist.accordion.tab = Assign Software Modules
 message.software.assignment = {0} Software Module(s) Assignment(s) done
-message.dist.inuse = {0} Distribution is already assigned to target
-message.software.dist.already.assigned = {0} Distribution already has Software Module {1}
-message.software.dist.type.notallowed = {0} Software Module type can not assign to Distribution {1}
+message.dist.inuse = Distribution {0} is already assigned to target
+message.software.dist.already.assigned = Software Module {0} is already assigned to Distribution {1}
+message.software.dist.type.notallowed = Software Module {0} cannot be assigned, because Distribution {1} does not support the Software Module Type {2}
 message.target.assigned =  {0} is assigned to {1}
-message.dist.type.delete = {0} DistributionType(s) Deleted successfully.
+message.dist.type.delete = {0} Distribution Type(s) deleted successfully.
 message.sw.module.type.delete = {0} Software Module Type(s) deleted successfully.
 message.dist.type.discard.success = All Distribution Types are discarded successfully !
 message.dist.discard.success = All Distributions are discarded successfully !