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

remove localization from DistributionBar html class (#842)

Browse Source 
Signed-off-by: Stefan Klotz <stefan.klotz@bosch-si.com>
This commit is contained in:
Stefan Klotz
2019-05-17 15:12:49 +02:00
committed by Jeroen Laverman
parent b50515367e
commit d34e7f35c5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java
View File

@@ -44,7 +44,7 @@ public final class DistributionBarHelper {
* *
* @return string of format "status1:count,status2:count" * @return string of format "status1:count,status2:count"
*/ */
public static String getDistributionBarAsHTMLString(final Map<Status, Long> statusTotalCountMap, final VaadinMessageSource i18n) { public static String getDistributionBarAsHTMLString(final Map<Status, Long> statusTotalCountMap) {
final StringBuilder htmlString = new StringBuilder(); final StringBuilder htmlString = new StringBuilder();
final Map<Status, Long> statusMapWithNonZeroValues = getStatusMapWithNonZeroValues(statusTotalCountMap); final Map<Status, Long> statusMapWithNonZeroValues = getStatusMapWithNonZeroValues(statusTotalCountMap);
final Long totalValue = getTotalSizes(statusTotalCountMap); final Long totalValue = getTotalSizes(statusTotalCountMap);
@@ -55,7 +55,7 @@ public final class DistributionBarHelper {
htmlString.append(getParentDivStart()); htmlString.append(getParentDivStart());
for (final Map.Entry<Status, Long> entry : statusMapWithNonZeroValues.entrySet()) { for (final Map.Entry<Status, Long> entry : statusMapWithNonZeroValues.entrySet()) {
if (entry.getValue() > 0) { if (entry.getValue() > 0) {
htmlString.append(getPart(partIndex, getLabel(entry.getKey(), i18n), entry.getValue(), totalValue, htmlString.append(getPart(partIndex, entry.getKey(), entry.getValue(), totalValue,
statusMapWithNonZeroValues.size())); statusMapWithNonZeroValues.size()));
partIndex++; partIndex++;
} }
@@ -129,7 +129,7 @@ public final class DistributionBarHelper {
return i18n.getMessage(label); return i18n.getMessage(label);
} }
private static String getPartStyle(final int partIndex, final int noOfParts, final String customStyle) { private static String getPartStyle(final int partIndex, final int noOfParts, final Status status) {
final StringBuilder mainStyle = new StringBuilder(); final StringBuilder mainStyle = new StringBuilder();
final StringBuilder styleName = new StringBuilder(GwtDistributionBar.CLASSNAME); final StringBuilder styleName = new StringBuilder(GwtDistributionBar.CLASSNAME);
if (noOfParts == 1) { if (noOfParts == 1) {
@@ -144,8 +144,8 @@ public final class DistributionBarHelper {
mainStyle.append(styleName).append(" "); mainStyle.append(styleName).append(" ");
mainStyle.append(DISTRIBUTION_BAR_PART_MAIN_STYLE).append(" "); mainStyle.append(DISTRIBUTION_BAR_PART_MAIN_STYLE).append(" ");
mainStyle.append(DISTRIBUTION_BAR_PART_CLASSNAME_PREFIX).append(partIndex); mainStyle.append(DISTRIBUTION_BAR_PART_CLASSNAME_PREFIX).append(partIndex);
if (customStyle != null) { if (status != null) {
mainStyle.append(" ").append("status-bar-part-").append(customStyle); mainStyle.append(" ").append("status-bar-part-").append(status.toString().toLowerCase());
} }
return mainStyle.toString(); return mainStyle.toString();
} }
@@ -159,7 +159,7 @@ public final class DistributionBarHelper {
return String.format(Locale.ENGLISH, "%.3f", val) + "%"; return String.format(Locale.ENGLISH, "%.3f", val) + "%";
} }
private static String getPart(final int partIndex, final String status, final Long value, final Long totalValue, private static String getPart(final int partIndex, final Status status, final Long value, final Long totalValue,
final int noOfParts) { final int noOfParts) {
return "<div class=\"" + getPartStyle(partIndex, noOfParts, status) + "\" style=\"width: " return "<div class=\"" + getPartStyle(partIndex, noOfParts, status) + "\" style=\"width: "
+ getPartWidth(value, totalValue, noOfParts) + ";\"><span class=\"" + getPartWidth(value, totalValue, noOfParts) + ";\"><span class=\""

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
View File

@@ -799,7 +799,7 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
@Override @Override
public String convertToPresentation(final TotalTargetCountStatus value, public String convertToPresentation(final TotalTargetCountStatus value,
final Class<? extends String> targetType, final Locale locale) { final Class<? extends String> targetType, final Locale locale) {
return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap(), i18n); return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap());
} }
@Override @Override

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
View File

@@ -326,7 +326,7 @@ public class RolloutGroupListGrid extends AbstractGrid<LazyQueryContainer> {
@Override @Override
public String convertToPresentation(final TotalTargetCountStatus value, public String convertToPresentation(final TotalTargetCountStatus value,
final Class<? extends String> targetType, final Locale locale) { final Class<? extends String> targetType, final Locale locale) {
return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap(), i18n); return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap());
} }
@Override @Override