From 3a344e2e496a2f974dbd91786ed6d4154dc98ef1 Mon Sep 17 00:00:00 2001 From: asharani-murugesh Date: Wed, 2 Mar 2016 09:59:22 +0100 Subject: [PATCH] Renamed the component id's Signed-off-by: asharani-murugesh --- .../hawkbit/ui/common/grid/AbstractGrid.java | 5 +++-- .../hawkbit/ui/rollout/rollout/RolloutListGrid.java | 13 +++++-------- .../rollout/rolloutgroup/RolloutGroupListGrid.java | 7 +++---- .../RolloutGroupTargetsListGrid.java | 4 ++-- .../hawkbit/ui/utils/SPUIComponetIdProvider.java | 12 ++++++------ 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java index 22fb055ed..0b080a6d9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java @@ -30,7 +30,8 @@ public abstract class AbstractGrid extends Grid { protected void init() { setSizeFull(); setImmediate(true); - setId(getTableId()); + setId(getGridId()); + //TODO these styles are rwquired?? addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES); addStyleName(ValoTheme.TABLE_SMALL); @@ -78,7 +79,7 @@ public abstract class AbstractGrid extends Grid { protected abstract void setColumnHeaderNames(); - protected abstract String getTableId(); + protected abstract String getGridId(); protected abstract void setColumnProperties(); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java index 5f7b62cef..89bac0b69 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java @@ -46,9 +46,6 @@ import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; import com.vaadin.spring.annotation.ViewScope; -import com.vaadin.ui.Grid.CellDescriptionGenerator; -import com.vaadin.ui.Grid.CellReference; -import com.vaadin.ui.Grid.CellStyleGenerator; import com.vaadin.ui.UI; import com.vaadin.ui.Window; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; @@ -96,12 +93,12 @@ public class RolloutListGrid extends AbstractGrid { void onEvent(final RolloutEvent event) { if (event == RolloutEvent.FILTER_BY_TEXT || event == RolloutEvent.CREATE_ROLLOUT || event == RolloutEvent.UPDATE_ROLLOUT || event == RolloutEvent.SHOW_ROLLOUTS) { - refreshTable(); + refreshGrid(); } } /** - * Handles the RolloutChangeEvent to refresh the item in the table. + * Handles the RolloutChangeEvent to refresh the item in the grid. * * @param rolloutChangeEvent * the event which contains the rollout which has been changed @@ -208,8 +205,8 @@ public class RolloutListGrid extends AbstractGrid { } @Override - protected String getTableId() { - return SPUIComponetIdProvider.ROLLOUT_LIST_TABLE_ID; + protected String getGridId() { + return SPUIComponetIdProvider.ROLLOUT_LIST_GRID_ID; } @Override @@ -451,7 +448,7 @@ public class RolloutListGrid extends AbstractGrid { } } - private void refreshTable() { + private void refreshGrid() { ((LazyQueryContainer) getContainerDataSource()).refresh(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java index c1b445b7a..16c65cc32 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java @@ -83,7 +83,7 @@ public class RolloutGroupListGrid extends AbstractGrid { /** * - * Handles the RolloutGroupChangeEvent to refresh the item in the table. + * Handles the RolloutGroupChangeEvent to refresh the item in the grid. * * * @param rolloutGroupChangeEvent @@ -102,7 +102,6 @@ public class RolloutGroupListGrid extends AbstractGrid { item.getItemProperty(SPUILabelDefinitions.VAR_STATUS).setValue(rolloutGroup.getStatus()); item.getItemProperty(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS) .setValue(rolloutGroup.getTotalTargetCountStatus()); - } } } @@ -191,8 +190,8 @@ public class RolloutGroupListGrid extends AbstractGrid { } @Override - protected String getTableId() { - return SPUIComponetIdProvider.ROLLOUT_GROUP_LIST_TABLE_ID; + protected String getGridId() { + return SPUIComponetIdProvider.ROLLOUT_GROUP_LIST_GRID_ID; } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java index 39ad4fcca..3008dee1b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java @@ -136,8 +136,8 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid { } @Override - protected String getTableId() { - return SPUIComponetIdProvider.ROLLOUT_GROUP_TARGETS_LIST_TABLE_ID; + protected String getGridId() { + return SPUIComponetIdProvider.ROLLOUT_GROUP_TARGETS_LIST_GRID_ID; } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java index 84346149c..c599ef0d0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java @@ -738,19 +738,19 @@ public final class SPUIComponetIdProvider { public static final String ROLLOUT_ADD_ICON_ID = "rollout.add.button.id"; /** - * Rollout list table id. + * Rollout list grid id. */ - public static final String ROLLOUT_LIST_TABLE_ID = "rollout.table.id"; + public static final String ROLLOUT_LIST_GRID_ID = "rollout.grid.id"; /** - * Rollout group list table id. + * Rollout group list grid id. */ - public static final String ROLLOUT_GROUP_LIST_TABLE_ID = "rollout.group.table.id"; + public static final String ROLLOUT_GROUP_LIST_GRID_ID = "rollout.group.grid.id"; /** - * Rollout group list table id. + * Rollout group list grid id. */ - public static final String ROLLOUT_GROUP_TARGETS_LIST_TABLE_ID = "rollout.group.targets.table.id"; + public static final String ROLLOUT_GROUP_TARGETS_LIST_GRID_ID = "rollout.group.targets.grid.id"; /** * Rollout delete button id.