Add a WindowBuilder for the dialogs

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

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

@@ -18,9 +18,9 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.ui.artifacts.event.SoftwareModuleEvent;
 import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
 import org.eclipse.hawkbit.ui.common.SoftwareModuleTypeBeanQuery;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
@@ -181,8 +181,11 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
 
         setCompositionRoot(formLayout);
 
-        window = SPUIWindowDecorator.getWindow(i18n.get("upload.caption.add.new.swmodule"), null,
+        window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW)
-                SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveOrUpdate(), null, null, formLayout, i18n);
+                .caption(i18n.get("upload.caption.add.new.swmodule")).content(this)
+                .saveButtonClickListener(event -> saveOrUpdate()).layout(formLayout).i18n(i18n)
+                .buildCommonDialogWindow();
+
         window.getButtonsLayout().removeStyleName("actionButtonsMargin");
 
         nameTextField.setEnabled(!editSwModule);

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

@@ -16,10 +16,10 @@ import javax.annotation.PostConstruct;
 import org.eclipse.hawkbit.repository.exception.EntityNotFoundException;
 import org.eclipse.hawkbit.repository.model.MetaData;
 import org.eclipse.hawkbit.repository.model.NamedVersionedEntity;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
 import org.eclipse.hawkbit.ui.customrenderers.renderers.HtmlButtonRenderer;
 import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
@@ -115,9 +115,11 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
     public CommonDialogWindow getWindow(final E entity, final M metaData) {
         selectedEntity = entity;
         final String nameVersion = HawkbitCommonUtil.getFormattedNameVersion(entity.getName(), entity.getVersion());
-        metadataWindow = SPUIWindowDecorator.getWindow(getMetadataCaption(nameVersion), null,
+
-                SPUIDefinitions.CUSTOM_METADATA_WINDOW, this, event -> onSave(), event -> onCancel(), null, mainLayout,
+        metadataWindow = new WindowBuilder(SPUIDefinitions.CUSTOM_METADATA_WINDOW)
-                i18n);
+                .caption(getMetadataCaption(nameVersion)).content(this).saveButtonClickListener(event -> onSave())
+                .cancelButtonClickListener(event -> onCancel()).layout(mainLayout).i18n(i18n).buildCommonDialogWindow();
+
         metadataWindow.setId(SPUIComponentIdProvider.METADATA_POPUP_ID);
         metadataWindow.setHeight(550, Unit.PIXELS);
         metadataWindow.setWidth(800, Unit.PIXELS);

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

@@ -10,7 +10,6 @@ package org.eclipse.hawkbit.ui.common;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -70,7 +69,7 @@ import com.vaadin.ui.themes.ValoTheme;
  * corner and a save and cancel button at the bottom. Is not intended to reuse.
  * 
  */
-public class CommonDialogWindow extends Window implements Serializable {
+public class CommonDialogWindow extends Window {
 
     private static final long serialVersionUID = 1L;
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/footer/AbstractDeleteActionsLayout.java

@@ -12,6 +12,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.eclipse.hawkbit.repository.SpPermissionChecker;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
 import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmall;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
@@ -215,11 +216,10 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
         if (!hasUnsavedActions()) {
             return;
         }
-        unsavedActionsWindow = SPUIComponentProvider.getWindow(getUnsavedActionsWindowCaption(),
+        unsavedActionsWindow = new WindowBuilder(SPUIDefinitions.CONFIRMATION_WINDOW)
-                SPUIComponentIdProvider.SAVE_ACTIONS_POPUP, SPUIDefinitions.CONFIRMATION_WINDOW);
+                .caption(getUnsavedActionsWindowCaption()).id(SPUIComponentIdProvider.CONFIRMATION_POPUP_ID)
+                .content(getUnsavedActionsWindowContent()).buildWindow();
         unsavedActionsWindow.addCloseListener(event -> unsavedActionsWindowClosed());
-        unsavedActionsWindow.setContent(getUnsavedActionsWindowContent());
-        unsavedActionsWindow.setId(SPUIComponentIdProvider.CONFIRMATION_POPUP_ID);
         UI.getCurrent().addWindow(unsavedActionsWindow);
     }
 

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

@@ -21,7 +21,6 @@ import org.eclipse.hawkbit.ui.decorators.SPUIComboBoxDecorator;
 import org.eclipse.hawkbit.ui.decorators.SPUILabelDecorator;
 import org.eclipse.hawkbit.ui.decorators.SPUITextAreaDecorator;
 import org.eclipse.hawkbit.ui.decorators.SPUITextFieldDecorator;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
 import org.slf4j.Logger;
@@ -42,7 +41,6 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
@@ -134,21 +132,6 @@ public final class SPUIComponentProvider {
         return SPUILabelDecorator.getDeocratedLabel(name, type);
     }
 
-    /**
-     * Get window component.
-     *
-     * @param caption
-     *            window caption
-     * @param id
-     *            window id
-     * @param type
-     *            type of window
-     * @return Window
-     */
-    public static Window getWindow(final String caption, final String id, final String type) {
-        return SPUIWindowDecorator.getDeocratedWindow(caption, id, type);
-    }
-
     /**
      * Get Label UI component.
      *

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

@@ -1,107 +0,0 @@
-/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.hawkbit.ui.decorators;
-
-import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
-import org.eclipse.hawkbit.ui.common.CustomCommonDialogWindow;
-import org.eclipse.hawkbit.ui.utils.I18N;
-import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
-import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
-
-import com.vaadin.ui.AbstractLayout;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.Window;
-
-/**
- * Decorator for Window.
- */
-public final class SPUIWindowDecorator {
-
-    /**
-     * Private Constructor.
-     */
-    private SPUIWindowDecorator() {
-
-    }
-
-    /**
-     * Decorates window based on type.
-     *
-     * @param caption
-     *            window caption
-     * @param id
-     *            window id
-     * @param type
-     *            window type
-     * @return Window
-     */
-    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 AbstractLayout layout,
-            final I18N i18n) {
-
-        CommonDialogWindow window;
-
-        if (SPUIDefinitions.CUSTOM_METADATA_WINDOW.equals(type)) {
-            window = new CustomCommonDialogWindow(caption, content, helpLink, saveButtonClickListener,
-                    cancelButtonClickListener, layout, i18n);
-            window.setDraggable(true);
-            window.setClosable(true);
-        } else {
-            window = new CommonDialogWindow(caption, content, helpLink, saveButtonClickListener,
-                    cancelButtonClickListener, layout, i18n);
-            if (null != id) {
-                window.setId(id);
-            }
-            if (SPUIDefinitions.CONFIRMATION_WINDOW.equals(type)) {
-                window.setDraggable(false);
-                window.setClosable(true);
-                window.addStyleName(SPUIStyleDefinitions.CONFIRMATION_WINDOW_CAPTION);
-
-            } else if (SPUIDefinitions.CREATE_UPDATE_WINDOW.equals(type)) {
-                window.setDraggable(true);
-                window.setClosable(true);
-            }
-        }
-
-        return window;
-    }
-
-    /**
-     * Decorates window based on type.
-     *
-     * @param caption
-     *            window caption
-     * @param id
-     *            window id
-     * @param type
-     *            window type
-     * @return Window
-     */
-    public static Window getDeocratedWindow(final String caption, final String id, final String type) {
-        final Window window = new Window(caption);
-        window.setSizeUndefined();
-        window.setModal(true);
-        window.setResizable(false);
-        if (null != id) {
-            window.setId(id);
-        }
-        if (SPUIDefinitions.CONFIRMATION_WINDOW.equals(type)) {
-            window.setDraggable(false);
-            window.setClosable(true);
-            window.addStyleName(SPUIStyleDefinitions.CONFIRMATION_WINDOW_CAPTION);
-
-        } else if (SPUIDefinitions.CREATE_UPDATE_WINDOW.equals(type)) {
-            window.setDraggable(true);
-            window.setClosable(false);
-        }
-        return window;
-    }
-}

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

@@ -19,8 +19,8 @@ import org.eclipse.hawkbit.ui.colorpicker.ColorPickerConstants;
 import org.eclipse.hawkbit.ui.colorpicker.ColorPickerHelper;
 import org.eclipse.hawkbit.ui.colorpicker.ColorPickerLayout;
 import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
@@ -460,8 +460,10 @@ public abstract class AbstractCreateUpdateTagLayout extends CustomComponent
 
     public CommonDialogWindow getWindow() {
         reset();
-        window = SPUIWindowDecorator.getWindow(getWindowCaption(), null, SPUIDefinitions.CREATE_UPDATE_WINDOW, this,
+        window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(getWindowCaption()).content(this)
-                this::save, cancleEvent -> discard(), null, mainLayout, i18n);
+                .saveButtonClickListener(this::save).cancelButtonClickListener(event -> discard()).layout(mainLayout)
+                .i18n(i18n).buildCommonDialogWindow();
+
         return window;
     }
 

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

@@ -22,9 +22,9 @@ import org.eclipse.hawkbit.repository.model.DistributionSetType;
 import org.eclipse.hawkbit.repository.model.TenantMetaData;
 import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
 import org.eclipse.hawkbit.ui.common.DistributionSetTypeBeanQuery;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.management.event.DistributionTableEvent;
 import org.eclipse.hawkbit.ui.management.event.DragEvent;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
@@ -325,8 +325,11 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
         resetComponents();
         populateDistSetTypeNameCombo();
         populateValuesOfDistribution(editDistId);
-        window = SPUIWindowDecorator.getWindow(i18n.get("caption.add.new.dist"), null,
+
-                SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveDistribution(), null, null, formLayout, i18n);
+        window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(i18n.get("caption.add.new.dist"))
+                .content(this).saveButtonClickListener(event -> saveDistribution()).layout(formLayout).i18n(i18n)
+                .buildCommonDialogWindow();
+
         window.getButtonsLayout().removeStyleName("actionButtonsMargin");
         return window;
     }

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

@@ -16,9 +16,9 @@ import org.eclipse.hawkbit.repository.TargetManagement;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TargetIdName;
 import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.management.event.DragEvent;
 import org.eclipse.hawkbit.ui.management.event.TargetTableEvent;
 import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
@@ -166,8 +166,10 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
 
     public Window getWindow() {
         eventBus.publish(this, DragEvent.HIDE_DROP_HINT);
-        window = SPUIWindowDecorator.getWindow(i18n.get("caption.add.new.target"), null,
+        window = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(i18n.get("caption.add.new.target"))
-                SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> saveTargetListner(), null, null, formLayout, i18n);
+                .content(this).saveButtonClickListener(event -> saveTargetListner()).layout(formLayout).i18n(i18n)
+                .buildCommonDialogWindow();
+
         return window;
     }
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java

@@ -19,6 +19,7 @@ import org.eclipse.hawkbit.repository.DeploymentManagement;
 import org.eclipse.hawkbit.repository.TargetManagement;
 import org.eclipse.hawkbit.ui.UiProperties;
 import org.eclipse.hawkbit.ui.common.DistributionSetIdName;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
 import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder;
 import org.eclipse.hawkbit.ui.management.dstable.DistributionBeanQuery;
@@ -357,10 +358,11 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
      */
     public Window getWindow() {
         managementUIState.setBulkUploadWindowMinimised(false);
-        bulkUploadWindow = SPUIComponentProvider.getWindow("", null, SPUIDefinitions.CREATE_UPDATE_WINDOW);
+
+        bulkUploadWindow = new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption("").content(this)
+                .buildWindow();
         bulkUploadWindow.addStyleName("bulk-upload-window");
         bulkUploadWindow.setImmediate(true);
-        bulkUploadWindow.setContent(this);
         if (isNoBulkUploadInProgress()) {
             bulkUploader.getUpload().setEnabled(true);
         }

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

@@ -30,8 +30,8 @@ import org.eclipse.hawkbit.repository.model.RolloutGroupConditions;
 import org.eclipse.hawkbit.ui.UiProperties;
 import org.eclipse.hawkbit.ui.common.CommonDialogWindow;
 import org.eclipse.hawkbit.ui.common.DistributionSetIdName;
+import org.eclipse.hawkbit.ui.common.builder.WindowBuilder;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
-import org.eclipse.hawkbit.ui.decorators.SPUIWindowDecorator;
 import org.eclipse.hawkbit.ui.filtermanagement.TargetFilterBeanQuery;
 import org.eclipse.hawkbit.ui.management.footer.ActionTypeOptionGroupLayout;
 import org.eclipse.hawkbit.ui.management.footer.ActionTypeOptionGroupLayout.ActionTypeOption;
@@ -165,9 +165,9 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
 
     public CommonDialogWindow getWindow() {
         resetComponents();
-        return SPUIWindowDecorator.getWindow(i18n.get("caption.configure.rollout"), null,
+        return new WindowBuilder(SPUIDefinitions.CREATE_UPDATE_WINDOW).caption(i18n.get("caption.configure.rollout"))
-                SPUIDefinitions.CREATE_UPDATE_WINDOW, this, event -> onRolloutSave(), null,
+                .content(this).saveButtonClickListener(event -> onRolloutSave()).layout(this).i18n(i18n)
-                uiProperties.getLinks().getDocumentation().getRolloutView(), this, i18n);
+                .helpLink(uiProperties.getLinks().getDocumentation().getRolloutView()).buildCommonDialogWindow();
     }
 
     /**