PG source viewer UI fix

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/ActionUtils.java

@@ -51,12 +51,12 @@ public class ActionUtils
 {
     private static final Log log = Log.getLog(ActionUtils.class);
 
-    public static CommandContributionItem makeCommandContribution(IServiceLocator serviceLocator, String commandId)
+    public static CommandContributionItem makeCommandContribution(@NotNull IServiceLocator serviceLocator, @NotNull String commandId)
     {
         return makeCommandContribution(serviceLocator, commandId, CommandContributionItem.STYLE_PUSH);
     }
 
-    public static CommandContributionItem makeCommandContribution(IServiceLocator serviceLocator, String commandId, int style)
+    public static CommandContributionItem makeCommandContribution(@NotNull IServiceLocator serviceLocator, @NotNull String commandId, int style)
     {
         return new CommandContributionItem(new CommandContributionItemParameter(
             serviceLocator,
@@ -65,7 +65,7 @@ public class ActionUtils
             style));
     }
 
-    public static CommandContributionItem makeCommandContribution(IServiceLocator serviceLocator, String commandId, int style, DBPImage icon)
+    public static CommandContributionItem makeCommandContribution(@NotNull IServiceLocator serviceLocator, @NotNull String commandId, int style, @Nullable  DBPImage icon)
     {
         CommandContributionItemParameter parameters = new CommandContributionItemParameter(
             serviceLocator,
@@ -82,7 +82,7 @@ public class ActionUtils
     }
 
     public static ContributionItem makeActionContribution(
-        IAction action,
+        @NotNull IAction action,
         boolean showText)
     {
         ActionContributionItem item = new ActionContributionItem(action);
@@ -93,9 +93,9 @@ public class ActionUtils
     }
 
     public static CommandContributionItem makeCommandContribution(
-        IServiceLocator serviceLocator,
-        String commandId,
-        String name,
+        @NotNull IServiceLocator serviceLocator,
+        @NotNull String commandId,
+        @Nullable String name,
         @Nullable DBPImage image,
         @Nullable String toolTip,
         boolean showText)

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/ui/editors/PostgreSourceViewEditor.java

@@ -125,7 +125,8 @@ public class PostgreSourceViewEditor extends SQLSourceViewer<PostgreScriptObject
             contributionManager.add(new ControlContribution("ProcedureDebugSource") {
                 @Override
                 protected Control createControl(Composite parent) {
-                    omitHeaderCheck = UIUtils.createCheckbox(parent, "Omit procedure header", "Show only procedure body without auto-generated header", false, 0);
+                    Composite ph = UIUtils.createPlaceholder(parent, 1, 0);
+                    omitHeaderCheck = UIUtils.createCheckbox(ph, "Omit procedure header", "Show only procedure body without auto-generated header", false, 0);
                     Object omitValue = getEditorInput().getAttribute(DBPScriptObject.OPTION_DEBUGGER_SOURCE);
                     boolean omitHeader = Boolean.parseBoolean(String.valueOf(omitValue));
                     omitHeaderCheck.setSelection(omitHeader);
@@ -137,16 +138,16 @@ public class PostgreSourceViewEditor extends SQLSourceViewer<PostgreScriptObject
                             refreshPart(PostgreSourceViewEditor.this, true);
                         }
                     });
-                    return omitHeaderCheck;
+                    return ph;
                 }
             });
         }
         if (sourceObject instanceof PostgrePermissionsOwner) {
-            contributionManager.add(new Separator());
             contributionManager.add(new ControlContribution("PGDDLShowPermissions") {
                 @Override
                 protected Control createControl(Composite parent) {
-                    Button showPermissionsCheck = UIUtils.createCheckbox(parent, "Show permissions", "Show permission grants", getShowPermissions(), 0);
+                    Composite ph = UIUtils.createPlaceholder(parent, 1, 0);
+                    Button showPermissionsCheck = UIUtils.createCheckbox(ph, "Show permissions", "Show permission grants", getShowPermissions(), 0);
                     showPermissionsCheck.addSelectionListener(new SelectionAdapter() {
                         @Override
                         public void widgetSelected(SelectionEvent e) {
@@ -154,7 +155,7 @@ public class PostgreSourceViewEditor extends SQLSourceViewer<PostgreScriptObject
                             refreshPart(PostgreSourceViewEditor.this, true);
                         }
                     });
-                    return showPermissionsCheck;
+                    return ph;
                 }
             });
         }