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

Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit/ into fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Browse Source
This commit is contained in:
Gaurav
2016-08-19 17:25:50 +02:00
parent f7f73ae12c 4c143cf9d2
commit 6babfe3603
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,10 +63,8 @@ import com.vaadin.ui.Window;
import com.vaadin.ui.themes.ValoTheme;
/**
*
* Table pop-up-windows including a minimize and close icon in the upper right
* corner and a save and cancel button at the bottom. Is not intended to reuse.
*
*/
public class CommonDialogWindow extends Window {
@@ -109,8 +107,6 @@ public class CommonDialogWindow extends Window {
* the content
* @param helpLink
* the helpLinks
* @param saveButtonClickListener
* the saveButtonClickListener
* @param cancelButtonClickListener
* the cancelButtonClickListener
* @param layout
@@ -130,6 +126,11 @@ public class CommonDialogWindow extends Window {
init();
}
/**
* Sets the close Listener
*
* @param closeListener
*/
public void setSaveDialogCloseListener(final SaveDialogCloseListener closeListener) {
this.closeListener = closeListener;
}

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

@@ -39,7 +39,6 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
import com.vaadin.ui.Window;
/**
@@ -161,7 +160,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
if (editTarget) {
updateTarget();
} else {
UI.getCurrent().access(() -> addNewTarget());
addNewTarget();
}
}