0004943: Cleaned up v- classes

JumpMind · Sep 15, 2021 · 237553b · 237553b
1 parent 5c80160
commit 237553b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 25 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbExportDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbExportDialog.java
@@ -54,7 +54,9 @@
 import com.vaadin.flow.component.textfield.TextArea;
 import com.vaadin.flow.server.StreamResource;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller.ScrollDirection;
 
 public class DbExportDialog extends ResizableDialog {
 
@@ -110,7 +112,7 @@ enum DbExportFormat {
 
     private TableSelectionLayout tableSelectionLayout;
 
-    private VerticalLayout optionLayout;
+    private Scroller optionLayout;
 
     private HorizontalLayout buttonFooter;
 
@@ -193,16 +195,15 @@ protected void addButtons() {
     }
 
     protected void createOptionLayout() {
-        optionLayout = new VerticalLayout();
-        optionLayout.addClassName("v-scrollable");
-        optionLayout.setMargin(false);
-        optionLayout.setSpacing(true);
-        optionLayout.setSizeFull();
-        optionLayout.add(new Span("Please choose from the following options"));
+        VerticalLayout optionContent = new VerticalLayout();
+        optionContent.setMargin(false);
+        optionContent.setSpacing(true);
+        optionContent.setSizeFull();
+        optionContent.add(new Span("Please choose from the following options"));
 
         FormLayout formLayout = new FormLayout();
         formLayout.setSizeFull();
-        optionLayout.addAndExpand(formLayout);
+        optionContent.addAndExpand(formLayout);
 
         formatSelect = new ComboBox<DbExportFormat>("Format", Arrays.asList(DbExportFormat.values()));
         formatSelect.setValue(DbExportFormat.SQL);
@@ -279,6 +280,9 @@ protected void createOptionLayout() {
         exportFormatOptionGroup.addValueChangeListener(event -> setExportButtonsEnabled());
         formLayout.add(exportFormatOptionGroup);
 
+        optionLayout = new Scroller(optionContent);
+        optionLayout.setScrollDirection(ScrollDirection.VERTICAL);
+        optionLayout.setSizeFull();
     }
 
     protected void setDefaultCompatibility() {

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbFillDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbFillDialog.java
@@ -42,7 +42,9 @@
 import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.data.value.ValueChangeMode;
+import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller.ScrollDirection;
 
 public class DbFillDialog extends ResizableDialog {
 
@@ -64,7 +66,7 @@ public class DbFillDialog extends ResizableDialog {
 
     private TableSelectionLayout tableSelectionLayout;
 
-    private VerticalLayout optionLayout;
+    private Scroller optionLayout;
 
     private Checkbox continueBox;
 
@@ -172,16 +174,15 @@ protected void addButtons() {
     }
 
     protected void createOptionLayout() {
-        optionLayout = new VerticalLayout();
-        optionLayout.addClassName("v-scrollable");
-        optionLayout.setMargin(false);
-        optionLayout.setSpacing(true);
-        optionLayout.setSizeFull();
-        optionLayout.add(new Span("Please choose from the following options"));
+        VerticalLayout optionContent = new VerticalLayout();
+        optionContent.setMargin(false);
+        optionContent.setSpacing(true);
+        optionContent.setSizeFull();
+        optionContent.add(new Span("Please choose from the following options"));
 
         FormLayout formLayout = new FormLayout();
         formLayout.setSizeFull();
-        optionLayout.addAndExpand(formLayout);
+        optionContent.addAndExpand(formLayout);
 
         countField = new TextField("Count (# of rows to fill)");
         countField.setValue("1");
@@ -237,7 +238,10 @@ protected void createOptionLayout() {
         oGroup.setItems("Fill Table(s)", "Send to Sql Editor");
         oGroup.setValue("Fill Table(s)");
         formLayout.add(oGroup);
-
+
+        optionLayout = new Scroller(optionContent);
+        optionLayout.setScrollDirection(ScrollDirection.VERTICAL);
+        optionLayout.setSizeFull();
     }
 
     protected void confirm() {

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbImportDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbImportDialog.java
@@ -56,7 +56,9 @@
 import com.vaadin.flow.component.upload.Upload;
 import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.orderedlayout.Scroller.ScrollDirection;
 
 public class DbImportDialog extends ResizableDialog {
 
@@ -72,7 +74,7 @@ enum DbImportFormat {
 
     private Table selectedTable;
 
-    private VerticalLayout importLayout;
+    private Scroller importLayout;
 
     private ComboBox<DbImportFormat> formatSelect;
 
@@ -124,17 +126,16 @@ public DbImportDialog(IDatabasePlatform databasePlatform, Set<Table> selectedTab
     }
 
     protected void createImportLayout() {
-        importLayout = new VerticalLayout();
-        importLayout.setSizeFull();
-        importLayout.addClassName("v-scrollable");
-        importLayout.setMargin(false);
-        importLayout.setSpacing(true);
+        VerticalLayout importContent = new VerticalLayout();
+        importContent.setSizeFull();
+        importContent.setMargin(false);
+        importContent.setSpacing(true);
 
-        importLayout.add(new Label("Please select from the following options"));
+        importContent.add(new Label("Please select from the following options"));
 
         FormLayout formLayout = new FormLayout();
         formLayout.setSizeFull();
-        importLayout.addAndExpand(formLayout);
+        importContent.addAndExpand(formLayout);
 
         formatSelect = new ComboBox<>("Format");
         formatSelect.setItems( DbImportFormat.values());
@@ -271,6 +272,10 @@ public OutputStream receiveUpload(String filename, String mimeType) {
         upload.setUploadButton(uploadButton);
         formLayout.add(upload);
 
+        importLayout = new Scroller(importContent);
+        importLayout.setScrollDirection(ScrollDirection.VERTICAL);
+        importLayout.setSizeFull();
+
         cancelButton = new Button("Cancel", event -> close());
         add(importLayout, 1);
         HorizontalLayout buttonLayout = buildButtonFooter(cancelButton);