Replace deprecated JGoodies API in one dialog

This is a first proof of concept for the replacement of JGoodies
with pure Swing.

Author: Tom Gottfried

src/de/bielefeld/umweltamt/aui/gui/Form.java

@@ -0,0 +1,89 @@
+/**
+ * Copyright 2025, Stadt Bielefeld
+ *
+ * This file is part of AUIK (Anlagen- und Indirekteinleiter-Kataster).
+ *
+ * AUIK is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * AUIK is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with AUIK. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * AUIK has been developed by Stadt Bielefeld and Intevation GmbH.
+ */
+package de.bielefeld.umweltamt.aui.gui;
+
+import java.awt.Component;
+
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.Spring;
+import javax.swing.SpringLayout;
+
+/**
+ * Container for labels and fields.
+ *
+ * Fields and labels are displayed in a two-column grid with labels in the
+ * first column. The column is sized to fit the largest label.
+ */
+public class Form extends JPanel {
+
+    private SpringLayout springLayout = new SpringLayout();
+
+    private static final Spring INIT = Spring.constant(0);
+    private static final Spring PAD = Spring.constant(5);
+
+    public Form() {
+        super();
+        this.setLayout(springLayout);
+    }
+
+    /**
+     * Append label and field to form.
+     * @param label String to put into label
+     * @param field The field to be added to the form
+     */
+    public void appendField(String label, JComponent field) {
+        JLabel jLabel = new JLabel(label, JLabel.TRAILING);
+        jLabel.setLabelFor(field);
+        this.add(jLabel);
+        this.add(field);
+
+        // Calculate grid cell dimensions
+        Spring height = INIT, labelWidth = INIT;
+        for (Component c : this.getComponents()) {
+            height = Spring.max(height, Spring.height(c));
+            if (c instanceof JLabel) {
+                labelWidth = Spring.max(labelWidth, Spring.width(c));
+            }
+        }
+
+        // Position label-field pairs in in two-column grid
+        Spring fieldX = Spring.sum(PAD, labelWidth);
+        Spring y = INIT;
+        Spring yOffset = Spring.sum(height, PAD);
+        for (Component c : this.getComponents()) {
+            SpringLayout.Constraints cons = springLayout.getConstraints(c);
+            cons.setHeight(height);
+            cons.setY(y);
+            if (c instanceof JLabel) {
+                // Set width for label
+                cons.setWidth(labelWidth);
+            } else {
+                // Position field next to label
+                cons.setX(fieldX);
+
+                // Next row
+                y = Spring.sum(y, yOffset);
+            }
+        }
+    }
+}

src/de/bielefeld/umweltamt/aui/gui/PasswordChangeDialog.java

@@ -20,26 +20,17 @@
  */
 package de.bielefeld.umweltamt.aui.gui;
 
-import java.awt.Dimension;
 import java.awt.HeadlessException;
 import java.util.Arrays;
 
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.factories.Paddings;
-import com.jgoodies.forms.layout.CellConstraints;
-import com.jgoodies.forms.layout.FormLayout;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.query.NativeQuery;
-import org.jfree.ui.tabbedui.VerticalLayout;
 
 import de.bielefeld.umweltamt.aui.HauptFrame;
 import de.bielefeld.umweltamt.aui.HibernateSessionFactory;
@@ -54,10 +45,6 @@ public class PasswordChangeDialog extends OkCancelDialog {
     /** Logging */
     private static final AuikLogger log = AuikLogger.getLogger();
 
-    private JLabel currentPasswordLabel;
-    private JLabel newPasswordLabel;
-    private JLabel newPasswordConfirmLabel;
-
     private JPasswordField currentPasswordField;
     private JPasswordField newPasswordField;
     private JPasswordField newPasswordConfirmField;
@@ -74,38 +61,18 @@ public PasswordChangeDialog(HauptFrame owner){
 
     @Override
     protected JComponent buildContentArea() {
-        currentPasswordLabel = new JLabel("Aktuelles Passwort:");
-        newPasswordLabel = new JLabel("Neues Passwort:");
-        newPasswordConfirmLabel = new JLabel("Passwort bestätigen:");
-        currentPasswordField = new JPasswordField();
-        newPasswordField = new JPasswordField();
-        newPasswordConfirmField = new JPasswordField();
-
-        currentPasswordField.setPreferredSize(new Dimension(150, 22));
+        final int nColumns = 24;
+        currentPasswordField = new JPasswordField(nColumns);
+        newPasswordField = new JPasswordField(nColumns);
+        newPasswordConfirmField = new JPasswordField(nColumns);
 
         //Create form
-        FormLayout layout = new FormLayout(
-            "right:pref, 4dlu, pref:grow, 4dlu, pref", // Spalten
-            "pref:grow, 3dlu, pref, 3dlu, pref, 3dlu, p" // Zeilen
-        );
-
-        JPanel contentPanel = new JPanel(new VerticalLayout());
-
-        layout.setRowGroups(new int[][]{{1, 3, 5}});
-
-        PanelBuilder builder = new PanelBuilder(layout);
-        CellConstraints cc = new CellConstraints();
-        builder.add(currentPasswordLabel, cc.xy(1, 1));
-        builder.add(currentPasswordField, cc.xy(3, 1));
-        builder.add(newPasswordLabel, cc.xy(1, 3));
-        builder.add(newPasswordField, cc.xy(3, 3));
-        builder.add(newPasswordConfirmLabel, cc.xy(1, 5));
-        builder.add(newPasswordConfirmField, cc.xy(3, 5));
-        JPanel formPanel = builder.getPanel();
-        formPanel.setBorder(Paddings.DIALOG);
-        contentPanel.add(formPanel);
-
-        return contentPanel;
+        Form formPanel = new Form();
+        formPanel.appendField("Aktuelles Passwort:", currentPasswordField);
+        formPanel.appendField("Neues Passwort:", newPasswordField);
+        formPanel.appendField("Passwort bestätigen:", newPasswordConfirmField);
+
+        return formPanel;
     }
 
     /**