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

Add i18n to CommonDialogWindow constructor

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-06-23 11:25:32 +02:00
parent f567461993
commit a9ebb763f6
10 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
View File

@@ -223,7 +223,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
/* add main layout to the window */
window = SPUIComponentProvider.getWindow(i18n.get("upload.caption.add.new.swmodule"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveOrUpdate(), event -> closeThisWindow(), null,
getMandatoryFields(formLayout), null);
getMandatoryFields(formLayout), null, i18n);
window.getButtonsLayout().removeStyleName("actionButtonsMargin");
nameTextField.focus();
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
View File

@@ -133,7 +133,7 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout
reset();
window = SPUIComponentProvider.getWindow(i18n.get("caption.add.type"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, this::save, this::discard, null, getMandatoryFields(),
getEditedFields());
getEditedFields(), i18n);
}
private Map<String, Boolean> getMandatoryFields() {

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
View File

@@ -77,7 +77,7 @@ public class CommonDialogWindow extends Window implements Serializable {
private final Map<String, Boolean> editedFields;
@Autowired
private I18N i18n;
private final I18N i18n;
/**
* Constructor.
@@ -95,7 +95,7 @@ public class CommonDialogWindow extends Window implements Serializable {
*/
public CommonDialogWindow(final String caption, final Component content, final String helpLink,
final ClickListener saveButtonClickListener, final ClickListener cancelButtonClickListener,
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields) {
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields, final I18N i18n) {
checkNotNull(saveButtonClickListener);
checkNotNull(cancelButtonClickListener);
this.caption = caption;
@@ -105,7 +105,7 @@ public class CommonDialogWindow extends Window implements Serializable {
this.cancelButtonClickListener = cancelButtonClickListener;
this.requiredFields = requiredFields;
this.editedFields = editedFields;
this.i18n = i18n;
init();
}
@@ -259,9 +259,7 @@ public class CommonDialogWindow extends Window implements Serializable {
private void createMandatoryLabel() {
if (existsMandatoryFieldsInWindowContent()) {
// final Label madatoryLabel = new
// Label(i18n.get("label.mandatory.field"));
final Label mandatoryLabel = new Label("* Mandatory Field");
final Label mandatoryLabel = new Label(i18n.get("label.mandatory.field"));
mandatoryLabel.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_ERROR + " " + ValoTheme.LABEL_TINY);
if (content instanceof TargetAddUpdateWindowLayout) {

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
View File

@@ -154,9 +154,9 @@ public final class SPUIComponentProvider {
public static CommonDialogWindow getWindow(final String caption, final String id, final String type,
final Component content, final ClickListener saveButtonClickListener,
final ClickListener cancelButtonClickListener, final String helpLink,
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields) {
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields, final I18N i18n) {
return SPUIWindowDecorator.getDeocratedWindow(caption, id, type, content, saveButtonClickListener,
cancelButtonClickListener, helpLink, requiredFields, editedFields);
cancelButtonClickListener, helpLink, requiredFields, editedFields, i18n);
}
/**

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
View File

@@ -11,6 +11,7 @@ package org.eclipse.hawkbit.ui.decorators;
import java.util.Map;
import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
import org.eclipse.hawkbit.ui.utils.I18N;
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
@@ -47,10 +48,10 @@ public final class SPUIWindowDecorator {
public static CommonDialogWindow getDeocratedWindow(final String caption, final String id, final String type,
final Component content, final ClickListener saveButtonClickListener,
final ClickListener cancelButtonClickListener, final String helpLink,
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields) {
final Map<String, Boolean> requiredFields, final Map<String, Boolean> editedFields, final I18N i18n) {
final CommonDialogWindow window = new CommonDialogWindow(caption, content, helpLink, saveButtonClickListener,
cancelButtonClickListener, requiredFields, editedFields);
cancelButtonClickListener, requiredFields, editedFields, i18n);
if (null != id) {
window.setId(id);
}

5
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
View File

@@ -318,7 +318,7 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
for (final Iterator itemIterator = originalSelectedTableContainer.getItemIds().iterator(); itemIterator
.hasNext();) {
final long itemId = (Long) itemIterator.next();
if (!selectedTableContainer.containsId(itemId)) {
if (selectedTableContainer.size() > 0 && !selectedTableContainer.containsId(itemId)) {
return Boolean.TRUE;
}
}
@@ -678,7 +678,7 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
reset();
window = SPUIComponentProvider.getWindow(i18n.get("caption.add.type"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, this::save, this::discard, null, getMandatoryFields(),
getEditedFields());
getEditedFields(), i18n);
}
private Map<String, Boolean> getMandatoryFields() {
@@ -692,7 +692,6 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
}
// Selected SoftwareModulesType
requiredFields.put(selectedTable.getId(), null);
return requiredFields;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
View File

@@ -117,7 +117,7 @@ public abstract class AbstractCreateUpdateTagLayout extends CustomComponent
reset();
setWindow(
SPUIComponentProvider.getWindow(i18n.get("caption.add.tag"), null, SPUIDefinitions.CREATE_UPDATE_WINDOW,
this, this::save, this::discard, null, getMandatoryFields(), getEditedFields()));
this, this::save, this::discard, null, getMandatoryFields(), getEditedFields(), i18n));
}
private Map<String, Boolean> getMandatoryFields() {

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
View File

@@ -523,7 +523,7 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
resetComponents();
window = SPUIComponentProvider.getWindow(i18n.get("caption.add.new.dist"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveDistribution(), event -> discardDistribution(),
null, getMandatoryFields(), null);
null, getMandatoryFields(), null, i18n);
window.getButtonsLayout().removeStyleName("actionButtonsMargin");
return window;
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
View File

@@ -244,7 +244,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
public Window getWindow() {
eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
window = SPUIComponentProvider.getWindow(i18n.get("caption.add.new.target"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveTargetListner(), event -> discardTargetListner(), null, getMandatoryFields(), null);
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveTargetListner(), event -> discardTargetListner(), null, getMandatoryFields(), null, i18n);
return window;
}

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
View File

@@ -176,7 +176,8 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
public CommonDialogWindow getWindow() {
window = SPUIComponentProvider.getWindow(i18n.get("caption.configure.rollout"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> onRolloutSave(), event -> onDiscard(),
uiProperties.getLinks().getDocumentation().getRolloutView(), getMandatoryFields(), getEditedFields());
uiProperties.getLinks().getDocumentation().getRolloutView(), getMandatoryFields(), getEditedFields(),
i18n);
return window;
}