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

improve code quality

Browse Source 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2016-07-25 17:12:56 +02:00
parent 5ae190c8c3
commit 7a32d931b5
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
View File

@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.DistributionSetManagement;
import org.eclipse.hawkbit.repository.EntityFactory;
import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.SpPermissionChecker;
import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.TargetManagement;
import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -100,9 +99,6 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
@Autowired @Autowired
private transient DistributionSetManagement distributionSetManagement; private transient DistributionSetManagement distributionSetManagement;
@Autowired
private EntityFactory entityFactory;
private String notAllowedMsg; private String notAllowedMsg;
private Boolean isDistPinned = false; private Boolean isDistPinned = false;
@@ -229,11 +225,11 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
@Override @Override
public Object generateCell(final Table source, final Object itemId, final Object columnId) { public Object generateCell(final Table source, final Object itemId, final Object columnId) {
HorizontalLayout iconLayout = new HorizontalLayout(); final HorizontalLayout iconLayout = new HorizontalLayout();
final String nameVersionStr = getNameAndVerion(itemId); final String nameVersionStr = getNameAndVerion(itemId);
final Button manageMetaDataBtn = createManageMetadataButton(nameVersionStr); final Button manageMetaDataBtn = createManageMetadataButton(nameVersionStr);
manageMetaDataBtn.addClickListener(event -> showMetadataDetails(itemId)); manageMetaDataBtn.addClickListener(event -> showMetadataDetails(itemId));
iconLayout.addComponent((Button)getPinButton(itemId)); iconLayout.addComponent((Button) getPinButton(itemId));
iconLayout.addComponent(manageMetaDataBtn); iconLayout.addComponent(manageMetaDataBtn);
return iconLayout; return iconLayout;
} }
@@ -241,7 +237,6 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
}); });
} }
private String getNameAndVerion(final Object itemId) { private String getNameAndVerion(final Object itemId) {
final Item item = getItem(itemId); final Item item = getItem(itemId);
final String name = (String) item.getItemProperty(SPUILabelDefinitions.VAR_NAME).getValue(); final String name = (String) item.getItemProperty(SPUILabelDefinitions.VAR_NAME).getValue();
@@ -249,7 +244,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
return name + "." + version; return name + "." + version;
} }
private Button createManageMetadataButton(String nameVersionStr) { private Button createManageMetadataButton(final String nameVersionStr) {
final Button manageMetadataBtn = SPUIComponentProvider.getButton( final Button manageMetadataBtn = SPUIComponentProvider.getButton(
SPUIComponentIdProvider.DS_TABLE_MANAGE_METADATA_ID + "." + nameVersionStr, "", "", null, false, SPUIComponentIdProvider.DS_TABLE_MANAGE_METADATA_ID + "." + nameVersionStr, "", "", null, false,
FontAwesome.LIST_ALT, SPUIButtonStyleSmallNoBorder.class); FontAwesome.LIST_ALT, SPUIButtonStyleSmallNoBorder.class);
@@ -281,9 +276,9 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
@Override @Override
protected void publishEntityAfterValueChange(final DistributionSet selectedLastEntity) { protected void publishEntityAfterValueChange(final DistributionSet selectedLastEntity) {
eventBus.publish(this, new DistributionTableEvent(BaseEntityEventType.SELECTED_ENTITY, selectedLastEntity)); eventBus.publish(this, new DistributionTableEvent(BaseEntityEventType.SELECTED_ENTITY, selectedLastEntity));
if(selectedLastEntity!=null){ if (selectedLastEntity != null) {
managementUIState.setLastSelectedDistribution(new DistributionSetIdName(selectedLastEntity.getId(), managementUIState.setLastSelectedDistribution(new DistributionSetIdName(selectedLastEntity.getId(),
selectedLastEntity.getName(),selectedLastEntity.getVersion())); selectedLastEntity.getName(), selectedLastEntity.getVersion()));
} }
} }
@@ -534,8 +529,8 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
} }
} }
private String getPinnedDistributionStyle(final Long installedDistItemIds, final Long assignedDistTableItemIds, private static String getPinnedDistributionStyle(final Long installedDistItemIds,
final Object itemId) { final Long assignedDistTableItemIds, final Object itemId) {
final Long distId = ((DistributionSetIdName) itemId).getId(); final Long distId = ((DistributionSetIdName) itemId).getId();
if (distId != null && distId.equals(installedDistItemIds)) { if (distId != null && distId.equals(installedDistItemIds)) {
return SPUIDefinitions.HIGHTLIGHT_GREEN; return SPUIDefinitions.HIGHTLIGHT_GREEN;
@@ -602,7 +597,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
resetPinStyle(eventBtn); resetPinStyle(eventBtn);
} }
private void resetPinStyle(final Button pinBtn) { private static void resetPinStyle(final Button pinBtn) {
pinBtn.setStyleName(getPinStyle()); pinBtn.setStyleName(getPinStyle());
} }
@@ -638,14 +633,14 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
}); });
} }
private void applyPinStyle(final Button eventBtn) { private static void applyPinStyle(final Button eventBtn) {
final StringBuilder style = new StringBuilder(SPUIComponentProvider.getPinButtonStyle()); final StringBuilder style = new StringBuilder(SPUIComponentProvider.getPinButtonStyle());
style.append(' ').append(SPUIStyleDefinitions.DIST_PIN).append(' ').append("tablePin").append(' ') style.append(' ').append(SPUIStyleDefinitions.DIST_PIN).append(' ').append("tablePin").append(' ')
.append("pin-icon-red"); .append("pin-icon-red");
eventBtn.setStyleName(style.toString()); eventBtn.setStyleName(style.toString());
} }
private String getPinButtonId(final String distName, final String distVersion) { private static String getPinButtonId(final String distName, final String distVersion) {
final StringBuilder pinBtnId = new StringBuilder(SPUIComponentIdProvider.DIST_PIN_BUTTON); final StringBuilder pinBtnId = new StringBuilder(SPUIComponentIdProvider.DIST_PIN_BUTTON);
pinBtnId.append('.'); pinBtnId.append('.');
pinBtnId.append(distName); pinBtnId.append(distName);
@@ -654,7 +649,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
return pinBtnId.toString(); return pinBtnId.toString();
} }
private Button getPinBtn(final Object itemId, final String distName, final String distVersion) { private static Button getPinBtn(final Object itemId, final String distName, final String distVersion) {
final Button pinBtn = new Button(); final Button pinBtn = new Button();
pinBtn.setIcon(FontAwesome.THUMB_TACK); pinBtn.setIcon(FontAwesome.THUMB_TACK);
pinBtn.setHeightUndefined(); pinBtn.setHeightUndefined();
@@ -665,7 +660,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
return pinBtn; return pinBtn;
} }
private String getPinStyle() { private static String getPinStyle() {
final StringBuilder pinBtnStyle = new StringBuilder(SPUIComponentProvider.getPinButtonStyle()); final StringBuilder pinBtnStyle = new StringBuilder(SPUIComponentProvider.getPinButtonStyle());
pinBtnStyle.append(' '); pinBtnStyle.append(' ');
pinBtnStyle.append(SPUIStyleDefinitions.DIST_PIN); pinBtnStyle.append(SPUIStyleDefinitions.DIST_PIN);
@@ -697,10 +692,10 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
} }
private void showMetadataDetails(Object itemId) { private void showMetadataDetails(final Object itemId) {
final DistributionSetIdName distIdName = (DistributionSetIdName) getContainerDataSource().getItem(itemId) final DistributionSetIdName distIdName = (DistributionSetIdName) getContainerDataSource().getItem(itemId)
.getItemProperty(SPUILabelDefinitions.VAR_DIST_ID_NAME).getValue(); .getItemProperty(SPUILabelDefinitions.VAR_DIST_ID_NAME).getValue();
DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(distIdName.getId()); final DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(distIdName.getId());
UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds, null)); UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds, null));
} }