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

Resolved merge conflicts

Browse Source 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
This commit is contained in:
asharani-murugesh
2016-03-07 16:01:29 +01:00
parent ebcc50965d
commit fd9ff8fdc5
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/HtmlButtonRenderer.java
View File

@@ -18,25 +18,19 @@ import com.vaadin.ui.renderers.ButtonRenderer;
public class HtmlButtonRenderer extends ButtonRenderer { public class HtmlButtonRenderer extends ButtonRenderer {
private static final long serialVersionUID = -1242995370043404892L; private static final long serialVersionUID = -1242995370043404892L;
<<<<<<< HEAD
/** /**
* Intialize button renderer. * Intialize button renderer.
*/ */
=======
>>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
public HtmlButtonRenderer() { public HtmlButtonRenderer() {
super(); super();
} }
<<<<<<< HEAD
/** /**
* Intialize button renderer with {@link RendererClickListener} * Intialize button renderer with {@link RendererClickListener}
* *
* @param listener * @param listener
* RendererClickListener * RendererClickListener
*/ */
=======
>>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
public HtmlButtonRenderer(RendererClickListener listener) { public HtmlButtonRenderer(RendererClickListener listener) {
super(listener); super(listener);
} }

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/LinkRenderer.java
View File

@@ -34,8 +34,4 @@ public class LinkRenderer extends ButtonRenderer {
public LinkRenderer(RendererClickListener listener) { public LinkRenderer(RendererClickListener listener) {
super(listener); super(listener);
} }
<<<<<<< HEAD
=======
>>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
} }

14
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
View File

@@ -1361,25 +1361,13 @@ public final class HawkbitCommonUtil {
*/ */
public static String getFormattedString(Map<Status, Long> details) { public static String getFormattedString(Map<Status, Long> details) {
StringBuilder val = new StringBuilder(); StringBuilder val = new StringBuilder();
<<<<<<< HEAD
if (details == null || details.isEmpty()) { if (details == null || details.isEmpty()) {
return null; return null;
======= }
if (null != details && !details.isEmpty()) {
for (Entry<Status, Long> entry : details.entrySet()) { for (Entry<Status, Long> entry : details.entrySet()) {
val.append(entry.getKey()).append(":").append(entry.getValue()).append(","); val.append(entry.getKey()).append(":").append(entry.getValue()).append(",");
} }
return val.substring(0, val.length() - 1); return val.substring(0, val.length() - 1);
>>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
}
<<<<<<< HEAD
for (Entry<Status, Long> entry : details.entrySet()) {
val.append(entry.getKey()).append(":").append(entry.getValue()).append(",");
}
return val.substring(0, val.length() - 1);
=======
return null;
>>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
} }
/** /**