Convert all abaille forms to intellij gui editor

build.gradle

@@ -102,6 +102,7 @@ spotless {
             exclude '**/JTextAreaAppender.java'
         }
         licenseHeaderFile 'spotless.license.java'
+        toggleOffOn()
 
         // Now using the Google Java style guide
         googleJavaFormat()
@@ -344,11 +345,6 @@ dependencies {
     implementation 'net.sf.ezmorph:ezmorph:1.0.6'
     implementation 'net.sf.json-lib:json-lib:2.4:jdk15'
 
-    // This is just the standard abeille-formsrt but need to rename it so jpackage puts it at the
-    // end of the classpath list becuase it contains an old version of batik which is causing
-    // SVG rendering to fail.
-    implementation 'net.java.abeille:zz-abeille-formsrt:2.0'
-
     implementation 'org.hibernate:antlr:2.7.5H3'
     implementation 'org.reflections:reflections:0.9.11'
     implementation 'org.mozilla:rhino:1.7.12'
@@ -441,13 +437,15 @@ dependencies {
 
     // HTML Parsing
     implementation 'org.jsoup:jsoup:1.14.3'
-
+    // eventbus
     implementation 'com.google.guava:guava:31.0.1-jre'
-
+    // message compression
     implementation 'org.apache.commons:commons-compress:1.22'
     implementation 'org.tukaani:xz:1.9'
     // intellij forms runtime
     implementation 'com.jetbrains.intellij.java:java-gui-forms-rt:223.7571.182'
+    // layout for forms created in code
+    implementation 'com.miglayout:miglayout-swing:11.0'
 }
 
 

src/main/java/net/rptools/maptool/client/AppActions.java

@@ -63,41 +63,41 @@
 import javax.swing.text.BadLocationException;
 import net.rptools.lib.FileUtil;
 import net.rptools.lib.MD5Key;
-import net.rptools.maptool.client.tool.BoardTool;
-import net.rptools.maptool.client.tool.GridTool;
-import net.rptools.maptool.client.ui.AddResourceDialog;
+import net.rptools.maptool.client.tool.boardtool.BoardTool;
+import net.rptools.maptool.client.tool.gridtool.GridTool;
 import net.rptools.maptool.client.ui.AppMenuBar;
-import net.rptools.maptool.client.ui.CampaignExportDialog;
-import net.rptools.maptool.client.ui.ConnectToServerDialog;
-import net.rptools.maptool.client.ui.ConnectToServerDialogPreferences;
-import net.rptools.maptool.client.ui.ConnectionInfoDialog;
 import net.rptools.maptool.client.ui.ConnectionStatusPanel;
-import net.rptools.maptool.client.ui.ExportDialog;
-import net.rptools.maptool.client.ui.MapPropertiesDialog;
 import net.rptools.maptool.client.ui.MapToolFrame;
 import net.rptools.maptool.client.ui.MapToolFrame.MTFrame;
-import net.rptools.maptool.client.ui.PreferencesDialog;
 import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
-import net.rptools.maptool.client.ui.StartServerDialog;
-import net.rptools.maptool.client.ui.StartServerDialogPreferences;
 import net.rptools.maptool.client.ui.StaticMessageDialog;
 import net.rptools.maptool.client.ui.SysInfoDialog;
 import net.rptools.maptool.client.ui.addon.AddOnLibrariesDialog;
+import net.rptools.maptool.client.ui.addresource.AddResourceDialog;
 import net.rptools.maptool.client.ui.assetpanel.AssetPanel;
 import net.rptools.maptool.client.ui.assetpanel.Directory;
+import net.rptools.maptool.client.ui.campaignexportdialog.CampaignExportDialog;
 import net.rptools.maptool.client.ui.campaignproperties.CampaignPropertiesDialog;
+import net.rptools.maptool.client.ui.connectioninfodialog.ConnectionInfoDialog;
 import net.rptools.maptool.client.ui.connections.ClientConnectionPanel;
+import net.rptools.maptool.client.ui.connecttoserverdialog.ConnectToServerDialog;
+import net.rptools.maptool.client.ui.connecttoserverdialog.ConnectToServerDialogPreferences;
+import net.rptools.maptool.client.ui.exportdialog.ExportDialog;
 import net.rptools.maptool.client.ui.htmlframe.HTMLOverlayManager;
 import net.rptools.maptool.client.ui.io.FTPClient;
 import net.rptools.maptool.client.ui.io.FTPTransferObject;
 import net.rptools.maptool.client.ui.io.FTPTransferObject.Direction;
 import net.rptools.maptool.client.ui.io.LoadSaveImpl;
 import net.rptools.maptool.client.ui.io.ProgressBarList;
 import net.rptools.maptool.client.ui.io.UpdateRepoDialog;
+import net.rptools.maptool.client.ui.mappropertiesdialog.MapPropertiesDialog;
 import net.rptools.maptool.client.ui.players.PlayerDatabaseDialog;
+import net.rptools.maptool.client.ui.preferencesdialog.PreferencesDialog;
+import net.rptools.maptool.client.ui.startserverdialog.StartServerDialog;
+import net.rptools.maptool.client.ui.startserverdialog.StartServerDialogPreferences;
 import net.rptools.maptool.client.ui.theme.Icons;
 import net.rptools.maptool.client.ui.theme.RessourceManager;
-import net.rptools.maptool.client.ui.token.TransferProgressDialog;
+import net.rptools.maptool.client.ui.transferprogressdialog.TransferProgressDialog;
 import net.rptools.maptool.client.ui.zone.FogUtil;
 import net.rptools.maptool.client.ui.zone.ZoneRenderer;
 import net.rptools.maptool.client.utilities.DungeonDraftImporter;

src/main/java/net/rptools/maptool/client/MapTool.java

@@ -70,8 +70,8 @@
 import net.rptools.maptool.client.ui.ConnectionStatusPanel;
 import net.rptools.maptool.client.ui.MapToolFrame;
 import net.rptools.maptool.client.ui.OSXAdapter;
-import net.rptools.maptool.client.ui.StartServerDialogPreferences;
 import net.rptools.maptool.client.ui.logger.LogConsoleFrame;
+import net.rptools.maptool.client.ui.startserverdialog.StartServerDialogPreferences;
 import net.rptools.maptool.client.ui.theme.Icons;
 import net.rptools.maptool.client.ui.theme.RessourceManager;
 import net.rptools.maptool.client.ui.theme.ThemeSupport;

src/main/java/net/rptools/maptool/client/swing/AbeillePanel.java

@@ -15,15 +15,15 @@
 package net.rptools.maptool.client.swing;
 
 import com.intellij.uiDesigner.core.GridLayoutManager;
-import com.jeta.forms.components.panel.FormPanel;
-import com.jgoodies.forms.layout.FormLayout;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.HashMap;
 import javax.swing.*;
+import javax.swing.text.JTextComponent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import yasb.Binder;
@@ -35,7 +35,7 @@
 import yasb.swing.BindingResolver;
 
 /**
- * This class acts as a "field binding front-end" for the {@link FormPanel} class.
+ * This class acts as a "field binding front-end" and accessor for the different view classes.
  *
  * <p>After instantiating an object and passing it the name of the Abeille form, call the {@link
  * #bind(Object)} method and pass the data model instance as a parameter. This class will then copy
@@ -81,19 +81,9 @@ public void storeBindingInfo(Component view, BindingInfo info) {}
         });
   }
 
-  public AbeillePanel(String panelForm) {
-    panel = new FormPanel(panelForm);
-    init();
-  }
-
   public AbeillePanel(JComponent mainPanel) {
     panel = mainPanel;
-    init();
-  }
-
-  private void init() {
     setLayout(new BorderLayout());
-    FormPanelI18N.translateComponent(panel);
     add(panel, "Center");
   }
 
@@ -114,31 +104,24 @@ protected void panelInit() {
     }
   }
 
-  protected void replaceComponent(String panelName, String name, Component replacement) {
-    if (panel instanceof FormPanel formPanel) {
-      formPanel.getFormAccessor(panelName).replaceBean(name, replacement);
-      formPanel.reset();
+  public void replaceComponent(String panelName, String name, Component replacement) {
+    var placeHolder = getComponent(name);
+    var container = (JPanel) getComponent(panelName);
+    Object constraints = null;
+    var layout = container.getLayout();
+    if (layout instanceof GridLayoutManager gridLayoutManager) {
+      constraints = gridLayoutManager.getConstraintsForComponent(placeHolder);
     } else {
-      var placeHolder = getComponent(name);
-      var container = (JPanel) getComponent(panelName);
-      Object constraints = null;
-      var layout = container.getLayout();
-      if (layout instanceof FormLayout formLayout) {
-        constraints = formLayout.getConstraints(placeHolder);
-      } else if (layout instanceof GridLayoutManager gridLayoutManager) {
-        constraints = gridLayoutManager.getConstraintsForComponent(placeHolder);
-      } else {
-        throw new RuntimeException(
-            "Replacement of components not implemented for layout: " + layout.getClass().getName());
-      }
-
-      container.remove(placeHolder);
-      container.add(replacement, constraints);
-      container.revalidate();
-      container.repaint();
-      componentMap.remove(name);
-      collectComponents(replacement);
+      throw new RuntimeException(
+          "Replacement of components not implemented for layout: " + layout.getClass().getName());
     }
+
+    container.remove(placeHolder);
+    container.add(replacement, constraints);
+    container.revalidate();
+    container.repaint();
+    componentMap.remove(name);
+    collectComponents(replacement);
   }
 
   private void createComponentMap() {
@@ -160,11 +143,7 @@ private void collectComponents(Component component) {
     }
   }
 
-  protected Component getComponent(String name) {
-    if (panel instanceof FormPanel formPanel) {
-      return formPanel.getComponentByName(name);
-    }
-
+  public Component getComponent(String name) {
     if (componentMap == null) {
       createComponentMap();
     }
@@ -226,6 +205,57 @@ public void unbind() {
     model = null;
   }
 
+  public AbstractButton getButton(String name) {
+    return (AbstractButton) getComponent(name);
+  }
+
+  public JRadioButton getRadioButton(String name) {
+    return (JRadioButton) getComponent(name);
+  }
+
+  public JComboBox getComboBox(String name) {
+    return (JComboBox) getComponent(name);
+  }
+
+  public JLabel getLabel(String name) {
+    return (JLabel) getComponent(name);
+  }
+
+  public JTabbedPane getTabbedPane(String name) {
+    return (JTabbedPane) getComponent(name);
+  }
+
+  public JTextField getTextField(String name) {
+    return (JTextField) getComponent(name);
+  }
+
+  public Collection<Component> getAllCompoments() {
+    if (componentMap == null) {
+      createComponentMap();
+    }
+    return componentMap.values();
+  }
+
+  public JTree getTree(String name) {
+    return (JTree) getComponent(name);
+  }
+
+  public JSpinner getSpinner(String name) {
+    return (JSpinner) getComponent(name);
+  }
+
+  public JList getList(String name) {
+    return (JList) getComponent(name);
+  }
+
+  public JCheckBox getCheckBox(String name) {
+    return (JCheckBox) getComponent(name);
+  }
+
+  public JTextComponent getTextComponent(String name) {
+    return (JTextComponent) getComponent(name);
+  }
+
   public static class RadioButtonAdapter extends AbstractComponentAdapter implements ItemListener {
     private JRadioButton button;
     private Enum selected;