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

Renamed the component id's

Browse Source 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
This commit is contained in:
asharani-murugesh
2016-03-02 09:59:22 +01:00
parent 7937c16c9b
commit 3a344e2e49
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java
View File

@@ -30,7 +30,8 @@ public abstract class AbstractGrid extends Grid {
protected void init() { protected void init() {
setSizeFull(); setSizeFull();
setImmediate(true); setImmediate(true);
setId(getTableId()); setId(getGridId());
//TODO these styles are rwquired??
addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES); addStyleName(ValoTheme.TABLE_NO_VERTICAL_LINES);
addStyleName(ValoTheme.TABLE_SMALL); addStyleName(ValoTheme.TABLE_SMALL);
@@ -78,7 +79,7 @@ public abstract class AbstractGrid extends Grid {
protected abstract void setColumnHeaderNames(); protected abstract void setColumnHeaderNames();
protected abstract String getTableId(); protected abstract String getGridId();
protected abstract void setColumnProperties(); protected abstract void setColumnProperties();

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

@@ -46,9 +46,6 @@ import com.vaadin.server.AbstractClientConnector;
import com.vaadin.server.FontAwesome; import com.vaadin.server.FontAwesome;
import com.vaadin.spring.annotation.SpringComponent; import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.ViewScope; 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.UI;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent;
@@ -96,12 +93,12 @@ public class RolloutListGrid extends AbstractGrid {
void onEvent(final RolloutEvent event) { void onEvent(final RolloutEvent event) {
if (event == RolloutEvent.FILTER_BY_TEXT || event == RolloutEvent.CREATE_ROLLOUT if (event == RolloutEvent.FILTER_BY_TEXT || event == RolloutEvent.CREATE_ROLLOUT
|| event == RolloutEvent.UPDATE_ROLLOUT || event == RolloutEvent.SHOW_ROLLOUTS) { || 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 * @param rolloutChangeEvent
* the event which contains the rollout which has been changed * the event which contains the rollout which has been changed
@@ -208,8 +205,8 @@ public class RolloutListGrid extends AbstractGrid {
} }
@Override @Override
protected String getTableId() { protected String getGridId() {
return SPUIComponetIdProvider.ROLLOUT_LIST_TABLE_ID; return SPUIComponetIdProvider.ROLLOUT_LIST_GRID_ID;
} }
@Override @Override
@@ -451,7 +448,7 @@ public class RolloutListGrid extends AbstractGrid {
} }
} }
private void refreshTable() { private void refreshGrid() {
((LazyQueryContainer) getContainerDataSource()).refresh(); ((LazyQueryContainer) getContainerDataSource()).refresh();
} }

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

@@ -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 * @param rolloutGroupChangeEvent
@@ -102,7 +102,6 @@ public class RolloutGroupListGrid extends AbstractGrid {
item.getItemProperty(SPUILabelDefinitions.VAR_STATUS).setValue(rolloutGroup.getStatus()); item.getItemProperty(SPUILabelDefinitions.VAR_STATUS).setValue(rolloutGroup.getStatus());
item.getItemProperty(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS) item.getItemProperty(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS)
.setValue(rolloutGroup.getTotalTargetCountStatus()); .setValue(rolloutGroup.getTotalTargetCountStatus());
} }
} }
} }
@@ -191,8 +190,8 @@ public class RolloutGroupListGrid extends AbstractGrid {
} }
@Override @Override
protected String getTableId() { protected String getGridId() {
return SPUIComponetIdProvider.ROLLOUT_GROUP_LIST_TABLE_ID; return SPUIComponetIdProvider.ROLLOUT_GROUP_LIST_GRID_ID;
} }
@Override @Override

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java
View File

@@ -136,8 +136,8 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
} }
@Override @Override
protected String getTableId() { protected String getGridId() {
return SPUIComponetIdProvider.ROLLOUT_GROUP_TARGETS_LIST_TABLE_ID; return SPUIComponetIdProvider.ROLLOUT_GROUP_TARGETS_LIST_GRID_ID;
} }
@Override @Override

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
View File

@@ -738,19 +738,19 @@ public final class SPUIComponetIdProvider {
public static final String ROLLOUT_ADD_ICON_ID = "rollout.add.button.id"; 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. * Rollout delete button id.