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

Formatted the code

Browse Source
This commit is contained in:
gah6kor
2016-07-18 11:08:23 +02:00
parent 86427acd5f
commit 8200ca6da1
3 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java
View File

@@ -67,8 +67,8 @@ import com.vaadin.ui.themes.ValoTheme;
* M is the metadata * M is the metadata
* *
*/ */
public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity, M extends MetaData> extends public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity, M extends MetaData>
CustomComponent { extends CustomComponent {
private static final String DELETE_BUTTON = "DELETE_BUTTON"; private static final String DELETE_BUTTON = "DELETE_BUTTON";
@@ -103,7 +103,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
private E selectedEntity; private E selectedEntity;
private HorizontalLayout mainLayout ; private HorizontalLayout mainLayout;
@PostConstruct @PostConstruct
private void init() { private void init() {
@@ -123,16 +123,20 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
*/ */
public CommonDialogWindow getWindow(final E entity, final M metaData) { public CommonDialogWindow getWindow(final E entity, final M metaData) {
selectedEntity = entity; selectedEntity = entity;
String nameVersion = HawkbitCommonUtil.getFormattedNameVersion(entity.getName(), entity.getVersion()); final String nameVersion = HawkbitCommonUtil.getFormattedNameVersion(entity.getName(), entity.getVersion());
metadataWindow = SPUIWindowDecorator.getWindow(getMetadataCaption(nameVersion), null, metadataWindow = SPUIWindowDecorator.getWindow(getMetadataCaption(nameVersion), null,
SPUIDefinitions.CUSTOM_METADATA_WINDOW, this, event -> onSave(), event -> onCancel(), null, mainLayout, i18n); SPUIDefinitions.CUSTOM_METADATA_WINDOW, this, event -> onSave(), event -> onCancel(), null, mainLayout,
i18n);
metadataWindow.setId(SPUIComponentIdProvider.METADATA_POPUP_ID); metadataWindow.setId(SPUIComponentIdProvider.METADATA_POPUP_ID);
metadataWindow.setHeight(550, Unit.PIXELS); metadataWindow.setHeight(550, Unit.PIXELS);
metadataWindow.setWidth(800, Unit.PIXELS); metadataWindow.setWidth(800, Unit.PIXELS);
metadataWindow.getMainLayout().setSizeFull(); metadataWindow.getMainLayout().setSizeFull();
metadataWindow.setResizable(true); metadataWindow.setResizable(true);
metadataWindow.getButtonsLayout().setHeight("45px");
metadataWindow.addWindowModeChangeListener(event -> onResize(event)); metadataWindow.addWindowModeChangeListener(event -> onResize(event));
((HorizontalLayout)metadataWindow.getButtonsLayout()).addComponent(discardButton, 1); ((HorizontalLayout) metadataWindow.getButtonsLayout()).addComponent(discardButton, 1);
((HorizontalLayout) metadataWindow.getButtonsLayout()).setComponentAlignment(discardButton,
Alignment.MIDDLE_RIGHT);
setUpDetails(entity.getId(), metaData); setUpDetails(entity.getId(), metaData);
return metadataWindow; return metadataWindow;
} }
@@ -141,7 +145,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
return selectedEntity; return selectedEntity;
} }
public void setSelectedEntity(E selectedEntity) { public void setSelectedEntity(final E selectedEntity) {
this.selectedEntity = selectedEntity; this.selectedEntity = selectedEntity;
} }
@@ -182,11 +186,12 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
headerLayout.setExpandRatio(headerCaption, 1.0F); headerLayout.setExpandRatio(headerCaption, 1.0F);
final HorizontalLayout headerWrapperLayout = new HorizontalLayout(); final HorizontalLayout headerWrapperLayout = new HorizontalLayout();
headerWrapperLayout.addStyleName("bordered-layout" + " " + "no-border-bottom"); headerWrapperLayout.addStyleName("bordered-layout" + " " + "no-border-bottom" + " " + "metadata-table-margin");
headerWrapperLayout.addComponent(headerLayout); headerWrapperLayout.addComponent(headerLayout);
headerWrapperLayout.setWidth("100%"); headerWrapperLayout.setWidth("100%");
headerLayout.setHeight("30px"); headerLayout.setHeight("30px");
final VerticalLayout tableLayout = new VerticalLayout(); final VerticalLayout tableLayout = new VerticalLayout();
tableLayout.setSizeFull(); tableLayout.setSizeFull();
tableLayout.setHeight("100%"); tableLayout.setHeight("100%");
@@ -195,7 +200,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
tableLayout.addStyleName("table-layout"); tableLayout.addStyleName("table-layout");
tableLayout.setExpandRatio(metaDataGrid, 1.0F); tableLayout.setExpandRatio(metaDataGrid, 1.0F);
VerticalLayout metadataFieldsLayout = new VerticalLayout(); final VerticalLayout metadataFieldsLayout = new VerticalLayout();
metadataFieldsLayout.setSizeFull(); metadataFieldsLayout.setSizeFull();
metadataFieldsLayout.setHeight("100%"); metadataFieldsLayout.setHeight("100%");
metadataFieldsLayout.addComponent(keyTextField); metadataFieldsLayout.addComponent(keyTextField);
@@ -215,7 +220,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
private TextField createKeyTextField() { private TextField createKeyTextField() {
TextField keyField = SPUIComponentProvider.getTextField(i18n.get("textfield.key"), "", final TextField keyField = SPUIComponentProvider.getTextField(i18n.get("textfield.key"), "",
ValoTheme.TEXTFIELD_TINY, true, "", i18n.get("textfield.key"), true, 128); ValoTheme.TEXTFIELD_TINY, true, "", i18n.get("textfield.key"), true, 128);
keyField.setId(SPUIComponentIdProvider.METADATA_KEY_FIELD_ID); keyField.setId(SPUIComponentIdProvider.METADATA_KEY_FIELD_ID);
keyField.addTextChangeListener(event -> onKeyChange(event)); keyField.addTextChangeListener(event -> onKeyChange(event));
@@ -257,19 +262,18 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
return metadataGrid; return metadataGrid;
} }
private void onDelete(RendererClickEvent event) { private void onDelete(final RendererClickEvent event) {
Item item = metaDataGrid.getContainerDataSource().getItem(event.getItemId()); final Item item = metaDataGrid.getContainerDataSource().getItem(event.getItemId());
String key = (String) item.getItemProperty(KEY).getValue(); final String key = (String) item.getItemProperty(KEY).getValue();
String value = (String) item.getItemProperty(VALUE).getValue(); final String value = (String) item.getItemProperty(VALUE).getValue();
final ConfirmationDialog confirmDialog = new ConfirmationDialog( final ConfirmationDialog confirmDialog = new ConfirmationDialog(
i18n.get("caption.metadata.delete.action.confirmbox"), i18n.get("caption.metadata.delete.action.confirmbox"), i18n.get("message.confirm.delete.metadata", key),
i18n.get("message.confirm.delete.metadata", key), i18n.get("button.ok"), i18n.get("button.cancel"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> {
ok -> {
if (ok) { if (ok) {
deleteMetadata(getSelectedEntity(), key, value); deleteMetadata(getSelectedEntity(), key, value);
uiNotification.displaySuccess(i18n.get("message.metadata.deleted.successfully", key)); uiNotification.displaySuccess(i18n.get("message.metadata.deleted.successfully", key));
Object selectedRow = metaDataGrid.getSelectedRow(); final Object selectedRow = metaDataGrid.getSelectedRow();
metaDataGrid.getContainerDataSource().removeItem(event.getItemId()); metaDataGrid.getContainerDataSource().removeItem(event.getItemId());
// force grid to refresh // force grid to refresh
metaDataGrid.clearSortOrder(); metaDataGrid.clearSortOrder();
@@ -320,7 +324,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
private void popualateKeyValue(final Object metadataCompositeKey) { private void popualateKeyValue(final Object metadataCompositeKey) {
if (metadataCompositeKey != null) { if (metadataCompositeKey != null) {
Item item = metaDataGrid.getContainerDataSource().getItem(metadataCompositeKey); final Item item = metaDataGrid.getContainerDataSource().getItem(metadataCompositeKey);
keyTextField.setValue((String) item.getItemProperty(KEY).getValue()); keyTextField.setValue((String) item.getItemProperty(KEY).getValue());
valueTextArea.setValue((String) item.getItemProperty(VALUE).getValue()); valueTextArea.setValue((String) item.getItemProperty(VALUE).getValue());
keyTextField.setEnabled(false); keyTextField.setEnabled(false);
@@ -331,7 +335,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
private void populateGrid() { private void populateGrid() {
List<M> metadataList = getMetadataList(); final List<M> metadataList = getMetadataList();
for (final M metaData : metadataList) { for (final M metaData : metadataList) {
addItemToGrid(metaData.getKey(), metaData.getValue()); addItemToGrid(metaData.getKey(), metaData.getValue());
} }
@@ -350,7 +354,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
item.getItemProperty(VALUE).setValue(valueTextArea.getValue()); item.getItemProperty(VALUE).setValue(valueTextArea.getValue());
} }
private void onAdd(ClickEvent event) { private void onAdd(final ClickEvent event) {
metaDataGrid.deselect(metaDataGrid.getSelectedRow()); metaDataGrid.deselect(metaDataGrid.getSelectedRow());
valueTextArea.clear(); valueTextArea.clear();
keyTextField.clear(); keyTextField.clear();
@@ -360,13 +364,13 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
private void onSave() { private void onSave() {
String key = keyTextField.getValue(); final String key = keyTextField.getValue();
String value = valueTextArea.getValue(); final String value = valueTextArea.getValue();
if (mandatoryCheck()) { if (mandatoryCheck()) {
E entity = selectedEntity; final E entity = selectedEntity;
if (metaDataGrid.getSelectedRow() == null) { if (metaDataGrid.getSelectedRow() == null) {
if (!duplicateCheck(entity)) { if (!duplicateCheck(entity)) {
M metadata = createMetadata(entity, key, value); final M metadata = createMetadata(entity, key, value);
uiNotification.displaySuccess(i18n.get("message.metadata.saved", metadata.getKey())); uiNotification.displaySuccess(i18n.get("message.metadata.saved", metadata.getKey()));
addItemToGrid(metadata.getKey(), metadata.getValue()); addItemToGrid(metadata.getKey(), metadata.getValue());
metaDataGrid.scrollToEnd(); metaDataGrid.scrollToEnd();
@@ -379,7 +383,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
} }
} else { } else {
M metadata = updateMetadata(entity, key, value); final M metadata = updateMetadata(entity, key, value);
uiNotification.displaySuccess(i18n.get("message.metadata.updated", metadata.getKey())); uiNotification.displaySuccess(i18n.get("message.metadata.updated", metadata.getKey()));
updateItemInGrid(metadata.getKey()); updateItemInGrid(metadata.getKey());
metaDataGrid.select(metadata.getKey()); metaDataGrid.select(metadata.getKey());
@@ -402,7 +406,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
return true; return true;
} }
private boolean duplicateCheck(E entity) { private boolean duplicateCheck(final E entity) {
try { try {
checkForDuplicate(entity, keyTextField.getValue()); checkForDuplicate(entity, keyTextField.getValue());
} catch (final EntityNotFoundException exception) { } catch (final EntityNotFoundException exception) {
@@ -412,7 +416,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
return true; return true;
} }
private String getMetadataCaption(String nameVersionStr) { private String getMetadataCaption(final String nameVersionStr) {
final StringBuilder caption = new StringBuilder(); final StringBuilder caption = new StringBuilder();
caption.append(HawkbitCommonUtil.DIV_DESCRIPTION + i18n.get("caption.metadata.popup") + " " caption.append(HawkbitCommonUtil.DIV_DESCRIPTION + i18n.get("caption.metadata.popup") + " "
+ HawkbitCommonUtil.getBoldHTMLText(nameVersionStr)); + HawkbitCommonUtil.getBoldHTMLText(nameVersionStr));
@@ -425,7 +429,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
keyTextField.clear(); keyTextField.clear();
valueTextArea.clear(); valueTextArea.clear();
} else { } else {
Object itemSelected = metaDataGrid.getSelectedRow(); final Object itemSelected = metaDataGrid.getSelectedRow();
popualateKeyValue(itemSelected); popualateKeyValue(itemSelected);
} }
metadataWindow.setSaveButtonEnabled(false); metadataWindow.setSaveButtonEnabled(false);
@@ -437,7 +441,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
UI.getCurrent().removeWindow(metadataWindow); UI.getCurrent().removeWindow(metadataWindow);
} }
private void onKeyChange(TextChangeEvent event) { private void onKeyChange(final TextChangeEvent event) {
if (hasCreatePermission() || hasUpdatePermission()) { if (hasCreatePermission() || hasUpdatePermission()) {
if (!valueTextArea.getValue().isEmpty() && !event.getText().isEmpty()) { if (!valueTextArea.getValue().isEmpty() && !event.getText().isEmpty()) {
metadataWindow.setSaveButtonEnabled(true); metadataWindow.setSaveButtonEnabled(true);
@@ -449,11 +453,11 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
} }
private void onRowClick(SelectionEvent event) { private void onRowClick(final SelectionEvent event) {
Set<Object> itemsSelected = event.getSelected(); final Set<Object> itemsSelected = event.getSelected();
if (!itemsSelected.isEmpty()) { if (!itemsSelected.isEmpty()) {
Object itemSelected = itemsSelected.stream().findFirst().isPresent() ? itemsSelected.stream().findFirst() final Object itemSelected = itemsSelected.stream().findFirst().isPresent()
.get() : null; ? itemsSelected.stream().findFirst().get() : null;
popualateKeyValue(itemSelected); popualateKeyValue(itemSelected);
addIcon.setEnabled(true); addIcon.setEnabled(true);
} else { } else {
@@ -463,8 +467,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
keyTextField.setEnabled(true); keyTextField.setEnabled(true);
valueTextArea.setEnabled(true); valueTextArea.setEnabled(true);
addIcon.setEnabled(false); addIcon.setEnabled(false);
} } else {
else{
keyTextField.setEnabled(false); keyTextField.setEnabled(false);
valueTextArea.setEnabled(false); valueTextArea.setEnabled(false);
} }
@@ -473,7 +476,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
setDiscardButtonEnabled(false); setDiscardButtonEnabled(false);
} }
private void onValueChange(TextChangeEvent event) { private void onValueChange(final TextChangeEvent event) {
if (hasCreatePermission() || hasUpdatePermission()) { if (hasCreatePermission() || hasUpdatePermission()) {
if (!keyTextField.getValue().isEmpty() && !event.getText().isEmpty()) { if (!keyTextField.getValue().isEmpty() && !event.getText().isEmpty()) {
metadataWindow.setSaveButtonEnabled(true); metadataWindow.setSaveButtonEnabled(true);
@@ -485,7 +488,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
} }
private void onResize(WindowModeChangeEvent event) { private void onResize(final WindowModeChangeEvent event) {
if (event.getWindowMode() == WindowMode.MAXIMIZED) { if (event.getWindowMode() == WindowMode.MAXIMIZED) {
metaDataGrid.getColumn(DELETE_BUTTON).setWidth(70); metaDataGrid.getColumn(DELETE_BUTTON).setWidth(70);
} else { } else {
@@ -493,20 +496,20 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
} }
// Repopulating the grid (forcing for repaint)- workaround as grid size // Repopulating the grid (forcing for repaint)- workaround as grid size
// is not getting adjusted // is not getting adjusted
Map<String, String> keyValueDetails = new LinkedHashMap<>(); final Map<String, String> keyValueDetails = new LinkedHashMap<>();
for (Object key : metaDataGrid.getContainerDataSource().getItemIds()) { for (final Object key : metaDataGrid.getContainerDataSource().getItemIds()) {
Item item = metaDataGrid.getContainerDataSource().getItem(key); final Item item = metaDataGrid.getContainerDataSource().getItem(key);
String value = (String) item.getItemProperty(VALUE).getValue(); final String value = (String) item.getItemProperty(VALUE).getValue();
keyValueDetails.put((String) key, value); keyValueDetails.put((String) key, value);
} }
metaDataGrid.getContainerDataSource().removeAllItems(); metaDataGrid.getContainerDataSource().removeAllItems();
for (Entry<String, String> entry : keyValueDetails.entrySet()) { for (final Entry<String, String> entry : keyValueDetails.entrySet()) {
addItemToGrid(entry.getKey(), entry.getValue()); addItemToGrid(entry.getKey(), entry.getValue());
} }
} }
private Button createDiscardButton() { private Button createDiscardButton() {
Button discardButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON, final Button discardButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.CANCEL_BUTTON,
i18n.get("button.discard"), "", "", true, FontAwesome.UNDO, SPUIButtonStyleBorderWithIcon.class); i18n.get("button.discard"), "", "", true, FontAwesome.UNDO, SPUIButtonStyleBorderWithIcon.class);
discardButton.setSizeUndefined(); discardButton.setSizeUndefined();
discardButton.addStyleName("default-color"); discardButton.addStyleName("default-color");
@@ -544,10 +547,8 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
addIcon.setEnabled(true); addIcon.setEnabled(true);
} }
private void setDiscardButtonEnabled(Boolean enable) { private void setDiscardButtonEnabled(final Boolean enable) {
discardButton.setEnabled(enable); discardButton.setEnabled(enable);
} }
} }

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CustomCommonDialogWindow.java
View File

@@ -10,10 +10,9 @@ package org.eclipse.hawkbit.ui.common;
import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.I18N;
import com.vaadin.event.FieldEvents.BlurListener;
import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.AbstractLayout;
import com.vaadin.ui.Component;
import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
public class CustomCommonDialogWindow extends CommonDialogWindow { public class CustomCommonDialogWindow extends CommonDialogWindow {
private static final long serialVersionUID = -4453608850403359992L; private static final long serialVersionUID = -4453608850403359992L;

4
hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
View File

@@ -56,4 +56,8 @@
.marginTop { .marginTop {
margin-top: 20px !important; margin-top: 20px !important;
} }
.metadata-table-margin {
margin-top:3px;
}
} }