0004943: Replaced all instances of setCaption()

JumpMind · Jun 30, 2021 · 21cf8d4 · 21cf8d4
1 parent efdc42c
commit 21cf8d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ConfirmDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ConfirmDialog.java
@@ -31,26 +31,31 @@
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.textfield.TextArea;
-import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 
 public class ConfirmDialog extends Dialog {
 
     private static final long serialVersionUID = 1L;
 
     public ConfirmDialog(String caption, String text, final IConfirmListener confirmListener) {
-        //setCaption(caption);
         setModal(true);
         setResizable(true);
         setWidth("400px");
         setHeight("300px");
         setCloseOnEsc(false);
         setCloseOnOutsideClick(false);
+
+        if (caption != null) {
+            Span header = new Span();
+            header.getElement().setProperty("innerHTML", caption + "<hr>");
+            add(header);
+        }
 
         VerticalLayout layout = new VerticalLayout();
-        layout.setSizeFull();
+        layout.setWidthFull();
+        layout.setHeight("90%");
         layout.setSpacing(true);
-        layout.setMargin(true);
+        layout.setMargin(false);
         add(layout);
 
         if (isNotBlank(text)) {

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/PromptDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/PromptDialog.java
@@ -31,7 +31,6 @@
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.textfield.TextField;
-import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 
 public class PromptDialog extends Dialog {
@@ -44,12 +43,17 @@ public PromptDialog(String caption, String text, final IPromptListener iPromptLi
 
     public PromptDialog(String caption, String text, String defaultValue,
             final IPromptListener promptListener) {
-        //setCaption(caption);
         setModal(true);
         setResizable(false);
         setSizeUndefined();
         setCloseOnEsc(false);
         setCloseOnOutsideClick(false);
+
+        if (caption != null) {
+            Span header = new Span();
+            header.getElement().setProperty("innerHTML", caption + "<hr>");
+            add(header);
+        }
 
         VerticalLayout layout = new VerticalLayout();
         layout.setSpacing(true);
@@ -65,6 +69,7 @@ public PromptDialog(String caption, String text, String defaultValue,
         field.setValue(defaultValue);
         if (defaultValue != null) {
             //field.setSelection(0, defaultValue.length());
+            field.focus();
         }
         layout.add(field);
 

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ResizableDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/ResizableDialog.java
@@ -49,12 +49,18 @@ public ResizableDialog() {
     }
 
     public ResizableDialog(String caption) {
-        //setCaption(caption);
         setModal(true);
         setResizable(true);
 
+        if (caption != null) {
+            Span header = new Span();
+            header.getElement().setProperty("innerHTML", caption + "<hr>");
+            super.add(header);
+        }
+
         content = new VerticalLayout();
-        content.setSizeFull();
+        content.setWidthFull();
+        content.setHeight("94%");
         content.setMargin(false);
         content.setSpacing(false);
         super.add(content);

diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/SqlEntryDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/SqlEntryDialog.java
@@ -30,7 +30,7 @@ public class SqlEntryDialog extends ResizableDialog {
     protected AceEditor editor;
 
     public SqlEntryDialog(String sql) {
-        //setCaption("Edit SQL");
+        super("Edit SQL");
         editor = CommonUiUtils.createAceEditor();
         editor.setMode(AceMode.sql);
         editor.setValue(sql);