Merge pull request #5873 from kwvanderlinde/refactor/3777-tools

Move tools to a subproject

Author: cwisniew

settings.gradle

@@ -16,5 +16,4 @@ include 'services:webservice'
 */
 
 rootProject.name = 'MapTool'
-include 'common', 'dicelib', 'messages', ':clientserver'
-
+include 'common', 'dicelib', 'messages', ':clientserver', 'tools'

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

@@ -20,9 +20,6 @@
 import java.awt.LayoutManager2;
 import java.util.HashMap;
 import java.util.Map;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
 
 /** */
 public class PositionalLayout implements LayoutManager2 {
@@ -169,33 +166,4 @@ public void removeLayoutComponent(Component comp) {
 
     compPositionMap.remove(comp);
   }
-
-  public static void main(String[] args) {
-
-    JFrame frame = new JFrame();
-    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    JPanel panel = new PositionalPanel();
-
-    panel.add(createButton("NW"), Position.NW);
-    panel.add(createButton("N"), Position.N);
-    panel.add(createButton("NE"), Position.NE);
-    panel.add(createButton("W"), Position.W);
-    panel.add(createButton("E"), Position.E);
-    panel.add(createButton("SW"), Position.SW);
-    panel.add(createButton("S"), Position.S);
-    panel.add(createButton("SE"), Position.SE);
-    panel.add(createButton("CENTER"), Position.CENTER);
-
-    frame.setContentPane(panel);
-
-    frame.setSize(200, 200);
-    frame.setVisible(true);
-  }
-
-  private static JButton createButton(String label) {
-    JButton button = new JButton(label);
-    button.setSize(button.getMinimumSize());
-
-    return button;
-  }
 }

src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogOld.java

@@ -298,11 +298,4 @@ private void viewReadMeFile(LibraryInfo libInfo) {
                         a.ifPresent(
                             asset -> new ViewAssetDialog(asset, "License", 640, 480).showModal())));
   }
-
-  public static void main(String[] args) {
-    AddOnLibrariesDialogView dialog = new AddOnLibrariesDialogView();
-    dialog.pack();
-    dialog.setVisible(true);
-    System.exit(0);
-  }
 }

src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.java

@@ -17,9 +17,6 @@
 /**
  * @author crash
  */
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.GridLayout;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,11 +29,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import net.rptools.maptool.client.ui.io.FTPTransferObject.Direction;
@@ -336,30 +329,4 @@ protected void doit(FTPTransferObject data) {
       uploadDone(data, false);
     }
   }
-
-  public static void main(String args[]) {
-    JFrame frame = new JFrame("FTP Test");
-    frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-    frame.setLayout(new BorderLayout());
-    JLabel progress = new JLabel();
-    frame.add(progress, BorderLayout.SOUTH);
-
-    JPanel panel = new JPanel();
-    panel.setLayout(new GridLayout(0, 1, 5, 5));
-    frame.add(panel, BorderLayout.CENTER);
-    frame.setSize(new Dimension(400, 200));
-    frame.setVisible(true);
-
-    String[] uploadList =
-        new String[] {
-          "campaignItemList.xml", "mockup.jfpr", "standard.mtprops", "updateRepoDialog.xml",
-        };
-    FTPClient ftp = new FTPClient("www.eeconsulting.net", "username", "password");
-    File dir = new File("testdir");
-    for (String s : uploadList) {
-      FTPTransferObject fto = new FTPTransferObject(Direction.FTP_PUT, s, dir, s);
-      ftp.addToQueue(fto);
-    }
-    // Need to listen for all progress bars to finish and count down using 'progress'.
-  }
 }

src/main/java/net/rptools/maptool/client/ui/io/FTPClient.java

@@ -18,7 +18,6 @@
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.TreeSet;
 import javax.swing.*;
 import net.rptools.lib.image.ImageUtil;
 import net.rptools.maptool.client.AppPreferences;
@@ -599,24 +598,4 @@ private static <KEY, CACHEKEY, RESULT> RESULT getFromHashMapsAndCache(
     cache.put(cachekey, ressourceObject);
     return ressourceObject;
   }
-
-  public static void main(String[] args) {
-    checkMissingIcons(classicIcons, rodIcons);
-  }
-
-  private static void checkMissingIcons(
-      HashMap<Icons, String> classicIcons, HashMap<Icons, String> rodIcons) {
-    var missing = new TreeSet<Icons>();
-    for (var key : classicIcons.keySet()) {
-      if (rodIcons.containsKey(key)) {
-        continue;
-      }
-      missing.add(key);
-    }
-
-    System.out.println("Missing icons:");
-    for (var key : missing) {
-      System.out.println(key + " classic: " + classicIcons.get(key));
-    }
-  }
 }