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

substitute VerticalLayout for FormLayout

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-05-30 12:37:39 +02:00
parent 2d474c17ee
commit 6fd24416ae
1 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.TextArea; import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField; import com.vaadin.ui.TextField;
import com.vaadin.ui.UI; import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window; import com.vaadin.ui.Window;
import com.vaadin.ui.themes.ValoTheme; import com.vaadin.ui.themes.ValoTheme;
@@ -73,8 +72,8 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
private Label madatoryLabel; private Label madatoryLabel;
private boolean editTarget = Boolean.FALSE; private boolean editTarget = Boolean.FALSE;
private String controllerId; private String controllerId;
private VerticalLayout mainLayout; private FormLayout formLayout;
private CommonDialogWindow addTargetWindow; private CommonDialogWindow window;
private String oldTargetName; private String oldTargetName;
private String oldTargetDesc; private String oldTargetDesc;
@@ -89,7 +88,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
buildLayout(); buildLayout();
/* register all listeners related to the Window */ /* register all listeners related to the Window */
addListeners(); addListeners();
setCompositionRoot(mainLayout); setCompositionRoot(formLayout);
} }
private void createRequiredComponents() { private void createRequiredComponents() {
@@ -120,17 +119,12 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
* The main layout of the window contains mandatory info, textboxes * The main layout of the window contains mandatory info, textboxes
* (controller Id, name & description) and action buttons layout * (controller Id, name & description) and action buttons layout
*/ */
mainLayout = new VerticalLayout();
mainLayout.setSpacing(Boolean.TRUE);
mainLayout.addStyleName("lay-color");
mainLayout.setSizeUndefined();
FormLayout formLayout = new FormLayout(); formLayout = new FormLayout();
formLayout.addComponent(madatoryLabel); formLayout.addComponent(madatoryLabel);
formLayout.addComponent(controllerIDTextField); formLayout.addComponent(controllerIDTextField);
formLayout.addComponent(nameTextField); formLayout.addComponent(nameTextField);
formLayout.addComponent(descTextArea); formLayout.addComponent(descTextArea);
mainLayout.addComponent(formLayout);
if (Boolean.TRUE.equals(editTarget)) { if (Boolean.TRUE.equals(editTarget)) {
madatoryLabel.setVisible(Boolean.FALSE); madatoryLabel.setVisible(Boolean.FALSE);
@@ -142,7 +136,6 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
addTargetNameChangeListner(); addTargetNameChangeListner();
addTargetDescChangeListner(); addTargetDescChangeListner();
} }
private void addTargetNameChangeListner() { private void addTargetNameChangeListner() {
@@ -156,9 +149,9 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
@Override @Override
public void textChange(final TextChangeEvent event) { public void textChange(final TextChangeEvent event) {
if (event.getText().equals(oldTargetName) && descTextArea.getValue().equals(oldTargetDesc)) { if (event.getText().equals(oldTargetName) && descTextArea.getValue().equals(oldTargetDesc)) {
addTargetWindow.setSaveButtonEnabled(false); window.setSaveButtonEnabled(false);
} else { } else {
addTargetWindow.setSaveButtonEnabled(true); window.setSaveButtonEnabled(true);
} }
} }
@@ -176,9 +169,9 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
@Override @Override
public void textChange(final TextChangeEvent event) { public void textChange(final TextChangeEvent event) {
if (event.getText().equals(oldTargetDesc) && nameTextField.getValue().equals(oldTargetName)) { if (event.getText().equals(oldTargetDesc) && nameTextField.getValue().equals(oldTargetName)) {
addTargetWindow.setSaveButtonEnabled(false); window.setSaveButtonEnabled(false);
} else { } else {
addTargetWindow.setSaveButtonEnabled(true); window.setSaveButtonEnabled(true);
} }
} }
@@ -246,9 +239,9 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
public Window getWindow() { public Window getWindow() {
eventBus.publish(this, DragEvent.HIDE_DROP_HINT); eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
addTargetWindow = SPUIComponentProvider.getWindow(i18n.get("caption.add.new.target"), null, window = SPUIComponentProvider.getWindow(i18n.get("caption.add.new.target"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveTargetListner(), event -> discardTargetListner(), null); SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveTargetListner(), event -> discardTargetListner(), null);
return addTargetWindow; return window;
} }
/** /**
@@ -267,8 +260,8 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
private void closeThisWindow() { private void closeThisWindow() {
editTarget = Boolean.FALSE; editTarget = Boolean.FALSE;
addTargetWindow.close(); window.close();
UI.getCurrent().removeWindow(addTargetWindow); UI.getCurrent().removeWindow(window);
} }
private void setTargetValues(final Target target, final String name, final String description) { private void setTargetValues(final Target target, final String name, final String description) {
@@ -310,19 +303,11 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
if (target.getDescription() != null) { if (target.getDescription() != null) {
descTextArea.setValue(target.getDescription()); descTextArea.setValue(target.getDescription());
} }
addTargetWindow.setSaveButtonEnabled(Boolean.FALSE); window.setSaveButtonEnabled(Boolean.FALSE);
oldTargetDesc = descTextArea.getValue(); oldTargetDesc = descTextArea.getValue();
oldTargetName = nameTextField.getValue(); oldTargetName = nameTextField.getValue();
addTargetWindow.addStyleName("target-update-window"); window.addStyleName("target-update-window");
}
public VerticalLayout getMainLayout() {
return mainLayout;
}
public void setMainLayout(final VerticalLayout mainLayout) {
this.mainLayout = mainLayout;
} }
} }