trunk/java/com/l2jserver/tools/dbinstaller/DBOutputInterface.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller;
+
+import java.sql.Connection;
+
+/**
+ * @author mrTJO
+ */
+public interface DBOutputInterface
+{
+	public void setProgressIndeterminate(boolean value);
+	
+	public void setProgressMaximum(int maxValue);
+	
+	public void setProgressValue(int value);
+	
+	public void setFrameVisible(boolean value);
+	
+	public void appendToProgressArea(String text);
+	
+	public Connection getConnection();
+	
+	public int requestConfirm(String title, String message, int type);
+	
+	public void showMessage(String title, String message, int type);
+}

trunk/java/com/l2jserver/tools/dbinstaller/LauncherCS.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller;
+
+import java.awt.HeadlessException;
+
+import javax.swing.UIManager;
+
+import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;
+import com.l2jserver.tools.dbinstaller.gui.DBConfigGUI;
+
+/**
+ * Contains main class for Database Installer If system doesn't support the graphical UI, start the installer in console mode.
+ * @author mrTJO
+ */
+public class LauncherCS
+{
+	public static void main(String[] args)
+	{
+		String mode = "l2jcs";
+		String dir = "../sql/community/";
+		String cleanUp = "cs_cleanup.sql";
+		
+		try
+		{
+			// Set OS Look And Feel
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		}
+		catch (Exception e)
+		{
+		}
+		
+		try
+		{
+			new DBConfigGUI(mode, dir, cleanUp);
+		}
+		catch (HeadlessException e)
+		{
+			new DBInstallerConsole(mode, dir, cleanUp);
+		}
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller;
+
+import java.awt.HeadlessException;
+
+import javax.swing.UIManager;
+
+import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;
+import com.l2jserver.tools.dbinstaller.gui.DBConfigGUI;
+
+/**
+ * Contains main class for Database Installer If system doesn't support the graphical UI, start the installer in console mode.
+ * @author mrTJO
+ */
+public class LauncherGS
+{
+	public static void main(String[] args)
+	{
+		String mode = "l2jgs";
+		String dir = "../sql/game/";
+		String cleanUp = "gs_cleanup.sql";
+		
+		try
+		{
+			// Set OS Look And Feel
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		}
+		catch (Exception e)
+		{
+		}
+		
+		try
+		{
+			new DBConfigGUI(mode, dir, cleanUp);
+		}
+		catch (HeadlessException e)
+		{
+			new DBInstallerConsole(mode, dir, cleanUp);
+		}
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller;
+
+import java.awt.HeadlessException;
+
+import javax.swing.UIManager;
+
+import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;
+import com.l2jserver.tools.dbinstaller.gui.DBConfigGUI;
+
+/**
+ * Contains main class for Database Installer If system doesn't support the graphical UI, start the installer in console mode.
+ * @author mrTJO
+ */
+public class LauncherLS
+{
+	public static void main(String[] args)
+	{
+		String mode = "l2jls";
+		String dir = "../sql/login/";
+		String cleanUp = "ls_cleanup.sql";
+		
+		try
+		{
+			// Set OS Look And Feel
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		}
+		catch (Exception e)
+		{
+		}
+		
+		try
+		{
+			new DBConfigGUI(mode, dir, cleanUp);
+		}
+		catch (HeadlessException e)
+		{
+			new DBInstallerConsole(mode, dir, cleanUp);
+		}
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java

@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.util.prefs.Preferences;
+
+import javax.swing.JOptionPane;
+
+import com.l2jserver.tools.dbinstaller.util.mysql.DBDumper;
+import com.l2jserver.tools.dbinstaller.util.mysql.ScriptExecutor;
+import com.l2jserver.util.file.filter.SQLFilter;
+
+/**
+ * @author mrTJO
+ */
+public class RunTasks extends Thread
+{
+	DBOutputInterface _frame;
+	boolean _cleanInstall;
+	String _db;
+	String _sqlDir;
+	String _cleanUpFile;
+	
+	public RunTasks(DBOutputInterface frame, String db, String sqlDir, String cleanUpFile, boolean cleanInstall)
+	{
+		_frame = frame;
+		_db = db;
+		_cleanInstall = cleanInstall;
+		_sqlDir = sqlDir;
+		_cleanUpFile = cleanUpFile;
+	}
+	
+	@Override
+	public void run()
+	{
+		new DBDumper(_frame, _db);
+		ScriptExecutor exec = new ScriptExecutor(_frame);
+		
+		File clnFile = new File(_cleanUpFile);
+		File updDir = new File(_sqlDir, "updates");
+		File[] files = updDir.listFiles(new SQLFilter());
+		
+		Preferences prefs = Preferences.userRoot();
+		
+		if (_cleanInstall)
+		{
+			if (clnFile.exists())
+			{
+				_frame.appendToProgressArea("Cleaning Database...");
+				exec.execSqlFile(clnFile);
+				_frame.appendToProgressArea("Database Cleaned!");
+			}
+			else
+			{
+				_frame.appendToProgressArea("Database Cleaning Script Not Found!");
+			}
+			
+			if (updDir.exists())
+			{
+				StringBuilder sb = new StringBuilder();
+				for (File cf : files)
+				{
+					sb.append(cf.getName() + ';');
+				}
+				prefs.put(_db + "_upd", sb.toString());
+			}
+		}
+		else
+		{
+			if (!_cleanInstall && updDir.exists())
+			{
+				_frame.appendToProgressArea("Installing Updates...");
+				
+				for (File cf : files)
+				{
+					if (!prefs.get(_db + "_upd", "").contains(cf.getName()))
+					{
+						exec.execSqlFile(cf, true);
+						prefs.put(_db + "_upd", prefs.get(_db + "_upd", "") + cf.getName() + ";");
+					}
+				}
+				_frame.appendToProgressArea("Database Updates Installed!");
+			}
+		}
+		
+		_frame.appendToProgressArea("Installing Database Content...");
+		exec.execSqlBatch(new File(_sqlDir));
+		_frame.appendToProgressArea("Database Installation Complete!");
+		
+		File cusDir = new File(_sqlDir, "custom");
+		if (cusDir.exists())
+		{
+			int ch = _frame.requestConfirm("Install Custom", "Do you want to install custom tables?", JOptionPane.YES_NO_OPTION);
+			if (ch == 0)
+			{
+				_frame.appendToProgressArea("Installing Custom Tables...");
+				exec.execSqlBatch(cusDir);
+				_frame.appendToProgressArea("Custom Tables Installed!");
+			}
+		}
+		
+		File modDir = new File(_sqlDir, "mods");
+		if (modDir.exists())
+		{
+			int ch = _frame.requestConfirm("Install Mods", "Do you want to install mod tables?", JOptionPane.YES_NO_OPTION);
+			if (ch == 0)
+			{
+				_frame.appendToProgressArea("Installing Mods Tables...");
+				exec.execSqlBatch(modDir);
+				_frame.appendToProgressArea("Mods Tables Installed!");
+			}
+		}
+		
+		try
+		{
+			_frame.getConnection().close();
+		}
+		catch (SQLException e)
+		{
+			JOptionPane.showMessageDialog(null, "Cannot close MySQL Connection: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
+		}
+		
+		_frame.setFrameVisible(false);
+		_frame.showMessage("Done!", "Database Installation Complete!", JOptionPane.INFORMATION_MESSAGE);
+		System.exit(0);
+		
+	}
+	
+}

trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.console;
+
+import java.sql.Connection;
+import java.util.Scanner;
+import java.util.prefs.Preferences;
+
+import com.l2jserver.tools.dbinstaller.DBOutputInterface;
+import com.l2jserver.tools.dbinstaller.RunTasks;
+import com.l2jserver.tools.dbinstaller.util.mysql.MySqlConnect;
+import com.l2jserver.util.CloseShieldedInputStream;
+
+/**
+ * @author mrTJO
+ */
+public class DBInstallerConsole implements DBOutputInterface
+{
+	Connection _con;
+	
+	public DBInstallerConsole(String db, String dir, String cleanUp)
+	{
+		System.out.println("Welcome to L2J DataBase installer");
+		Preferences prop = Preferences.userRoot();
+		RunTasks rt = null;
+		try (Scanner scn = new Scanner(new CloseShieldedInputStream(System.in)))
+		{
+			while (_con == null)
+			{
+				System.out.printf("%s (%s): ", "Host", prop.get("dbHost_" + db, "localhost"));
+				String dbHost = scn.nextLine();
+				System.out.printf("%s (%s): ", "Port", prop.get("dbPort_" + db, "3306"));
+				String dbPort = scn.nextLine();
+				System.out.printf("%s (%s): ", "Username", prop.get("dbUser_" + db, "root"));
+				String dbUser = scn.nextLine();
+				System.out.printf("%s (%s): ", "Password", "");
+				String dbPass = scn.nextLine();
+				System.out.printf("%s (%s): ", "Database", prop.get("dbDbse_" + db, db));
+				String dbDbse = scn.nextLine();
+				
+				dbHost = dbHost.isEmpty() ? prop.get("dbHost_" + db, "localhost") : dbHost;
+				dbPort = dbPort.isEmpty() ? prop.get("dbPort_" + db, "3306") : dbPort;
+				dbUser = dbUser.isEmpty() ? prop.get("dbUser_" + db, "root") : dbUser;
+				dbDbse = dbDbse.isEmpty() ? prop.get("dbDbse_" + db, db) : dbDbse;
+				
+				MySqlConnect connector = new MySqlConnect(dbHost, dbPort, dbUser, dbPass, dbDbse, true);
+				
+				_con = connector.getConnection();
+			}
+			
+			System.out.print("(C)lean install, (U)pdate or (E)xit? ");
+			String resp = scn.next();
+			if (resp.equalsIgnoreCase("c"))
+			{
+				System.out.print("Do you really want to destroy your db (Y/N)?");
+				if (scn.next().equalsIgnoreCase("y"))
+				{
+					rt = new RunTasks(this, db, dir, cleanUp, true);
+				}
+			}
+			else if (resp.equalsIgnoreCase("u"))
+			{
+				rt = new RunTasks(this, db, dir, cleanUp, false);
+			}
+		}
+		
+		if (rt != null)
+		{
+			rt.run();
+		}
+		else
+		{
+			System.exit(0);
+		}
+	}
+	
+	@Override
+	public void appendToProgressArea(String text)
+	{
+		System.out.println(text);
+	}
+	
+	@Override
+	public Connection getConnection()
+	{
+		return _con;
+	}
+	
+	@Override
+	public void setProgressIndeterminate(boolean value)
+	{
+	}
+	
+	@Override
+	public void setProgressMaximum(int maxValue)
+	{
+	}
+	
+	@Override
+	public void setProgressValue(int value)
+	{
+	}
+	
+	@Override
+	public void setFrameVisible(boolean value)
+	{
+	}
+	
+	@Override
+	public int requestConfirm(String title, String message, int type)
+	{
+		System.out.print(message);
+		String res = "";
+		try (Scanner scn = new Scanner(new CloseShieldedInputStream(System.in)))
+		{
+			res = scn.next();
+		}
+		return res.equalsIgnoreCase("y") ? 0 : 1;
+	}
+	
+	@Override
+	public void showMessage(String title, String message, int type)
+	{
+		System.out.println(message);
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java

@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.gui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionListener;
+import java.util.prefs.Preferences;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPasswordField;
+import javax.swing.JTextField;
+import javax.swing.SpringLayout;
+import javax.swing.SwingConstants;
+
+import com.l2jserver.tools.dbinstaller.RunTasks;
+import com.l2jserver.tools.dbinstaller.util.mysql.MySqlConnect;
+import com.l2jserver.tools.dbinstaller.util.swing.SpringUtilities;
+import com.l2jserver.tools.images.ImagesTable;
+
+/**
+ * @author mrTJO
+ */
+public class DBConfigGUI extends JFrame
+{
+	private static final long serialVersionUID = -8391792251140797076L;
+	
+	JTextField _dbHost;
+	JTextField _dbPort;
+	JTextField _dbUser;
+	JPasswordField _dbPass;
+	JTextField _dbDbse;
+	
+	String _db;
+	String _dir;
+	String _cleanUp;
+	
+	Preferences _prop;
+	
+	public DBConfigGUI(String db, String dir, String cleanUp)
+	{
+		super("L2J Database Installer");
+		setLayout(new SpringLayout());
+		setDefaultLookAndFeelDecorated(true);
+		setIconImage(ImagesTable.getImage("l2j.png").getImage());
+		
+		_db = db;
+		_dir = dir;
+		_cleanUp = cleanUp;
+		
+		int width = 260;
+		int height = 220;
+		Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
+		
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
+		setResizable(false);
+		
+		_prop = Preferences.userRoot();
+		
+		// Host
+		JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT);
+		add(labelDbHost);
+		_dbHost = new JTextField(15);
+		_dbHost.setText(_prop.get("dbHost_" + db, "localhost"));
+		labelDbHost.setLabelFor(_dbHost);
+		add(_dbHost);
+		
+		// Port
+		JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT);
+		add(labelDbPort);
+		_dbPort = new JTextField(15);
+		_dbPort.setText(_prop.get("dbPort_" + db, "3306"));
+		labelDbPort.setLabelFor(_dbPort);
+		add(_dbPort);
+		
+		// Username
+		JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT);
+		add(labelDbUser);
+		_dbUser = new JTextField(15);
+		_dbUser.setText(_prop.get("dbUser_" + db, "root"));
+		labelDbUser.setLabelFor(_dbUser);
+		add(_dbUser);
+		
+		// Password
+		JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT);
+		add(labelDbPass);
+		_dbPass = new JPasswordField(15);
+		_dbPass.setText(_prop.get("dbPass_" + db, ""));
+		labelDbPass.setLabelFor(_dbPass);
+		add(_dbPass);
+		
+		// Database
+		JLabel labelDbDbse = new JLabel("Database: ", SwingConstants.LEFT);
+		add(labelDbDbse);
+		_dbDbse = new JTextField(15);
+		_dbDbse.setText(_prop.get("dbDbse_" + db, db));
+		labelDbDbse.setLabelFor(_dbDbse);
+		add(_dbDbse);
+		
+		ActionListener cancelListener = e -> System.exit(0);
+		
+		// Cancel
+		JButton btnCancel = new JButton("Cancel");
+		btnCancel.addActionListener(cancelListener);
+		add(btnCancel);
+		
+		ActionListener connectListener = e ->
+		{
+			MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
+			
+			if (connector.getConnection() != null)
+			{
+				_prop.put("dbHost_" + _db, _dbHost.getText());
+				_prop.put("dbPort_" + _db, _dbPort.getText());
+				_prop.put("dbUser_" + _db, _dbUser.getText());
+				_prop.put("dbDbse_" + _db, _dbDbse.getText());
+				
+				boolean cleanInstall = false;
+				DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection());
+				setVisible(false);
+				
+				Object[] options =
+				{
+					"Full Install",
+					"Upgrade",
+					"Exit"
+				};
+				int n = JOptionPane.showOptionDialog(null, "Select Installation Type", "Installation Type", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
+				
+				if ((n == 2) || (n == -1))
+				{
+					System.exit(0);
+				}
+				
+				if (n == 0)
+				{
+					int conf = JOptionPane.showConfirmDialog(null, "Do you really want to destroy your db?", "Confirm", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+					
+					if (conf == 1)
+					{
+						System.exit(0);
+					}
+					
+					cleanInstall = true;
+				}
+				
+				dbi.setVisible(true);
+				
+				RunTasks task = new RunTasks(dbi, _db, _dir, _cleanUp, cleanInstall);
+				task.setPriority(Thread.MAX_PRIORITY);
+				task.start();
+			}
+		};
+		
+		// Connect
+		JButton btnConnect = new JButton("Connect");
+		btnConnect.addActionListener(connectListener);
+		add(btnConnect);
+		
+		SpringUtilities.makeCompactGrid(getContentPane(), 6, 2, 5, 5, 5, 5);
+		
+		setVisible(true);
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.gui;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.sql.Connection;
+
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import com.l2jserver.tools.dbinstaller.DBOutputInterface;
+import com.l2jserver.tools.images.ImagesTable;
+
+/**
+ * @author mrTJO
+ */
+public class DBInstallerGUI extends JFrame implements DBOutputInterface
+{
+	private static final long serialVersionUID = -1005504757826370170L;
+	
+	private final JProgressBar _progBar;
+	private final JTextArea _progArea;
+	private final Connection _con;
+	
+	public DBInstallerGUI(Connection con)
+	{
+		super("L2J Database Installer");
+		setLayout(new BorderLayout());
+		setDefaultLookAndFeelDecorated(true);
+		setIconImage(ImagesTable.getImage("l2j.png").getImage());
+		
+		_con = con;
+		
+		int width = 480;
+		int height = 360;
+		Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
+		
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
+		setResizable(false);
+		
+		_progBar = new JProgressBar();
+		_progBar.setIndeterminate(true);
+		add(_progBar, BorderLayout.PAGE_START);
+		
+		_progArea = new JTextArea();
+		JScrollPane scrollPane = new JScrollPane(_progArea);
+		
+		_progArea.setEditable(false);
+		appendToProgressArea("Connected");
+		
+		add(scrollPane, BorderLayout.CENTER);
+	}
+	
+	@Override
+	public void setProgressIndeterminate(boolean value)
+	{
+		_progBar.setIndeterminate(value);
+	}
+	
+	@Override
+	public void setProgressMaximum(int maxValue)
+	{
+		_progBar.setMaximum(maxValue);
+	}
+	
+	@Override
+	public void setProgressValue(int value)
+	{
+		_progBar.setValue(value);
+	}
+	
+	@Override
+	public void appendToProgressArea(String text)
+	{
+		_progArea.append(text + System.getProperty("line.separator"));
+		_progArea.setCaretPosition(_progArea.getDocument().getLength());
+	}
+	
+	@Override
+	public Connection getConnection()
+	{
+		return _con;
+	}
+	
+	@Override
+	public void setFrameVisible(boolean value)
+	{
+		setVisible(value);
+	}
+	
+	@Override
+	public int requestConfirm(String title, String message, int type)
+	{
+		return JOptionPane.showConfirmDialog(null, message, title, type);
+	}
+	
+	@Override
+	public void showMessage(String title, String message, int type)
+	{
+		JOptionPane.showMessageDialog(null, message, title, type);
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/util/FileWriterStdout.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.util;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * @author mrTJO
+ */
+public class FileWriterStdout extends BufferedWriter
+{
+	public FileWriterStdout(FileWriter fileWriter)
+	{
+		super(fileWriter);
+	}
+	
+	public void println() throws IOException
+	{
+		append(System.getProperty("line.separator"));
+	}
+	
+	public void println(String line) throws IOException
+	{
+		append(line + System.getProperty("line.separator"));
+	}
+	
+	public void print(String text) throws IOException
+	{
+		append(text);
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java

@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.util.mysql;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Formatter;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.tools.dbinstaller.DBOutputInterface;
+import com.l2jserver.tools.dbinstaller.util.FileWriterStdout;
+
+/**
+ * @author mrTJO
+ */
+public class DBDumper
+{
+	DBOutputInterface _frame;
+	String _db;
+	
+	public DBDumper(DBOutputInterface frame, String db)
+	{
+		_frame = frame;
+		_db = db;
+		createDump();
+	}
+	
+	public void createDump()
+	{
+		try (Formatter form = new Formatter())
+		{
+			Connection con = _frame.getConnection();
+			try (Statement s = con.createStatement();
+				ResultSet rset = s.executeQuery("SHOW TABLES"))
+			{
+				File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString());
+				new File("dumps").mkdir();
+				dump.createNewFile();
+				
+				_frame.appendToProgressArea("Writing dump " + dump.getName());
+				if (rset.last())
+				{
+					int rows = rset.getRow();
+					rset.beforeFirst();
+					if (rows > 0)
+					{
+						_frame.setProgressIndeterminate(false);
+						_frame.setProgressMaximum(rows);
+					}
+				}
+				
+				try (FileWriter fileWriter = new FileWriter(dump);
+					FileWriterStdout fws = new FileWriterStdout(fileWriter))
+				{
+					while (rset.next())
+					{
+						_frame.setProgressValue(rset.getRow());
+						_frame.appendToProgressArea("Dumping Table " + rset.getString(1));
+						fws.println("CREATE TABLE `" + rset.getString(1) + "`");
+						fws.println("(");
+						try (Statement desc = con.createStatement();
+							ResultSet dset = desc.executeQuery("DESC " + rset.getString(1)))
+						{
+							Map<String, List<String>> keys = new HashMap<>();
+							boolean isFirst = true;
+							while (dset.next())
+							{
+								if (!isFirst)
+								{
+									fws.println(",");
+								}
+								fws.print("\t`" + dset.getString(1) + "`");
+								fws.print(" " + dset.getString(2));
+								if (dset.getString(3).equals("NO"))
+								{
+									fws.print(" NOT NULL");
+								}
+								if (!dset.getString(4).isEmpty())
+								{
+									if (!keys.containsKey(dset.getString(4)))
+									{
+										keys.put(dset.getString(4), new ArrayList<String>());
+									}
+									keys.get(dset.getString(4)).add(dset.getString(1));
+								}
+								if (dset.getString(5) != null)
+								{
+									fws.print(" DEFAULT '" + dset.getString(5) + "'");
+								}
+								if (!dset.getString(6).isEmpty())
+								{
+									fws.print(" " + dset.getString(6));
+								}
+								isFirst = false;
+							}
+							if (keys.containsKey("PRI"))
+							{
+								fws.println(",");
+								fws.print("\tPRIMARY KEY (");
+								isFirst = true;
+								for (String key : keys.get("PRI"))
+								{
+									if (!isFirst)
+									{
+										fws.print(", ");
+									}
+									fws.print("`" + key + "`");
+									isFirst = false;
+								}
+								fws.print(")");
+							}
+							if (keys.containsKey("MUL"))
+							{
+								fws.println(",");
+								isFirst = true;
+								for (String key : keys.get("MUL"))
+								{
+									if (!isFirst)
+									{
+										fws.println(", ");
+									}
+									fws.print("\tKEY `key_" + key + "` (`" + key + "`)");
+									isFirst = false;
+								}
+							}
+							fws.println();
+							fws.println(");");
+							fws.flush();
+						}
+						
+						try (Statement desc = con.createStatement();
+							ResultSet dset = desc.executeQuery("SELECT * FROM " + rset.getString(1)))
+						{
+							boolean isFirst = true;
+							int cnt = 0;
+							while (dset.next())
+							{
+								if ((cnt % 100) == 0)
+								{
+									fws.println("INSERT INTO `" + rset.getString(1) + "` VALUES ");
+								}
+								else
+								{
+									fws.println(",");
+								}
+								
+								fws.print("\t(");
+								boolean isInFirst = true;
+								for (int i = 1; i <= dset.getMetaData().getColumnCount(); i++)
+								{
+									if (!isInFirst)
+									{
+										fws.print(", ");
+									}
+									
+									if (dset.getString(i) == null)
+									{
+										fws.print("NULL");
+									}
+									else
+									{
+										fws.print("'" + dset.getString(i).replace("\'", "\\\'") + "'");
+									}
+									isInFirst = false;
+								}
+								fws.print(")");
+								isFirst = false;
+								
+								if ((cnt % 100) == 99)
+								{
+									fws.println(";");
+								}
+								cnt++;
+							}
+							if (!isFirst && ((cnt % 100) != 0))
+							{
+								fws.println(";");
+							}
+							fws.println();
+							fws.flush();
+						}
+					}
+					fws.flush();
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+		_frame.appendToProgressArea("Dump Complete!");
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/MySqlConnect.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.util.mysql;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Formatter;
+
+import javax.swing.JOptionPane;
+
+/**
+ * @author mrTJO
+ */
+public class MySqlConnect
+{
+	Connection con = null;
+	
+	public MySqlConnect(String host, String port, String user, String password, String db, boolean console)
+	{
+		try (Formatter form = new Formatter())
+		{
+			Class.forName("com.mysql.jdbc.Driver").newInstance();
+			final String formattedText = form.format("jdbc:mysql://%1$s:%2$s", host, port).toString();
+			con = DriverManager.getConnection(formattedText, user, password);
+			
+			try (Statement s = con.createStatement())
+			{
+				s.execute("CREATE DATABASE IF NOT EXISTS `" + db + "`");
+				s.execute("USE `" + db + "`");
+			}
+		}
+		catch (SQLException e)
+		{
+			if (console)
+			{
+				e.printStackTrace();
+			}
+			else
+			{
+				JOptionPane.showMessageDialog(null, "MySQL Error: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
+			}
+		}
+		catch (InstantiationException e)
+		{
+			if (console)
+			{
+				e.printStackTrace();
+			}
+			else
+			{
+				JOptionPane.showMessageDialog(null, "Instantiation Exception: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
+			}
+		}
+		catch (IllegalAccessException e)
+		{
+			if (console)
+			{
+				e.printStackTrace();
+			}
+			else
+			{
+				JOptionPane.showMessageDialog(null, "Illegal Access: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
+			}
+		}
+		catch (ClassNotFoundException e)
+		{
+			if (console)
+			{
+				e.printStackTrace();
+			}
+			else
+			{
+				JOptionPane.showMessageDialog(null, "Cannot find MySQL Connector: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
+			}
+		}
+	}
+	
+	public Connection getConnection()
+	{
+		return con;
+	}
+	
+	public Statement getStatement()
+	{
+		try
+		{
+			return con.createStatement();
+		}
+		catch (SQLException e)
+		{
+			e.printStackTrace();
+			System.out.println("Statement Null");
+			return null;
+		}
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.tools.dbinstaller.util.mysql;
+
+import java.awt.HeadlessException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Scanner;
+
+import javax.swing.JOptionPane;
+
+import com.l2jserver.tools.dbinstaller.DBOutputInterface;
+import com.l2jserver.util.file.filter.SQLFilter;
+
+/**
+ * @author mrTJO
+ */
+public class ScriptExecutor
+{
+	DBOutputInterface _frame;
+	
+	public ScriptExecutor(DBOutputInterface frame)
+	{
+		_frame = frame;
+	}
+	
+	public void execSqlBatch(File dir)
+	{
+		execSqlBatch(dir, false);
+	}
+	
+	public void execSqlBatch(File dir, boolean skipErrors)
+	{
+		File[] file = dir.listFiles(new SQLFilter());
+		Arrays.sort(file);
+		_frame.setProgressIndeterminate(false);
+		_frame.setProgressMaximum(file.length - 1);
+		for (int i = 0; i < file.length; i++)
+		{
+			_frame.setProgressValue(i);
+			execSqlFile(file[i], skipErrors);
+		}
+	}
+	
+	public void execSqlFile(File file)
+	{
+		execSqlFile(file, false);
+	}
+	
+	public void execSqlFile(File file, boolean skipErrors)
+	{
+		_frame.appendToProgressArea("Installing " + file.getName());
+		String line = "";
+		Connection con = _frame.getConnection();
+		try (Statement stmt = con.createStatement();
+			Scanner scn = new Scanner(file))
+		{
+			StringBuilder sb = new StringBuilder();
+			while (scn.hasNextLine())
+			{
+				line = scn.nextLine();
+				if (line.startsWith("--"))
+				{
+					continue;
+				}
+				else if (line.contains("--"))
+				{
+					line = line.split("--")[0];
+				}
+				
+				line = line.trim();
+				if (!line.isEmpty())
+				{
+					sb.append(line + System.getProperty("line.separator"));
+				}
+				
+				if (line.endsWith(";"))
+				{
+					stmt.execute(sb.toString());
+					sb = new StringBuilder();
+				}
+			}
+		}
+		catch (FileNotFoundException e)
+		{
+			JOptionPane.showMessageDialog(null, "File Not Found!: " + e.getMessage(), "Installer Error", JOptionPane.ERROR_MESSAGE);
+		}
+		catch (SQLException e)
+		{
+			if (!skipErrors)
+			{
+				try
+				{
+					Object[] options =
+					{
+						"Continue",
+						"Abort"
+					};
+					
+					int n = JOptionPane.showOptionDialog(null, "MySQL Error: " + e.getMessage(), "Script Error", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+					if (n == 1)
+					{
+						System.exit(0);
+					}
+				}
+				catch (HeadlessException h)
+				{
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+}

trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java

@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Oracle or the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.l2jserver.tools.dbinstaller.util.swing;
+
+import java.awt.Component;
+import java.awt.Container;
+
+import javax.swing.Spring;
+import javax.swing.SpringLayout;
+
+/**
+ * A 1.4 file that provides utility methods for creating form- or grid-style layouts with SpringLayout.<br>
+ * These utilities are used by several programs, such as SpringBox and SpringCompactGrid.
+ */
+public class SpringUtilities
+{
+	/**
+	 * A debugging utility that prints to stdout the component's minimum, preferred, and maximum sizes.
+	 * @param c
+	 */
+	public static void printSizes(Component c)
+	{
+		System.out.println("minimumSize = " + c.getMinimumSize());
+		System.out.println("preferredSize = " + c.getPreferredSize());
+		System.out.println("maximumSize = " + c.getMaximumSize());
+	}
+	
+	/**
+	 * Aligns the first <code>rows</code> * <code>cols</code> components of <code>parent</code> in a grid. Each component is as big as the maximum preferred width and height of the components. The parent is made just big enough to fit them all.
+	 * @param parent
+	 * @param rows number of rows
+	 * @param cols number of columns
+	 * @param initialX x location to start the grid at
+	 * @param initialY y location to start the grid at
+	 * @param xPad x padding between cells
+	 * @param yPad y padding between cells
+	 */
+	public static void makeGrid(Container parent, int rows, int cols, int initialX, int initialY, int xPad, int yPad)
+	{
+		SpringLayout layout;
+		try
+		{
+			layout = (SpringLayout) parent.getLayout();
+		}
+		catch (ClassCastException exc)
+		{
+			System.err.println("The first argument to makeGrid must use SpringLayout.");
+			return;
+		}
+		
+		Spring xPadSpring = Spring.constant(xPad);
+		Spring yPadSpring = Spring.constant(yPad);
+		Spring initialXSpring = Spring.constant(initialX);
+		Spring initialYSpring = Spring.constant(initialY);
+		int max = rows * cols;
+		
+		// Calculate Springs that are the max of the width/height so that all
+		// cells have the same size.
+		Spring maxWidthSpring = layout.getConstraints(parent.getComponent(0)).getWidth();
+		Spring maxHeightSpring = layout.getConstraints(parent.getComponent(0)).getWidth();
+		for (int i = 1; i < max; i++)
+		{
+			SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
+			
+			maxWidthSpring = Spring.max(maxWidthSpring, cons.getWidth());
+			maxHeightSpring = Spring.max(maxHeightSpring, cons.getHeight());
+		}
+		
+		// Apply the new width/height Spring. This forces all the
+		// components to have the same size.
+		for (int i = 0; i < max; i++)
+		{
+			SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
+			
+			cons.setWidth(maxWidthSpring);
+			cons.setHeight(maxHeightSpring);
+		}
+		
+		// Then adjust the x/y constraints of all the cells so that they
+		// are aligned in a grid.
+		SpringLayout.Constraints lastCons = null;
+		SpringLayout.Constraints lastRowCons = null;
+		for (int i = 0; i < max; i++)
+		{
+			SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
+			if ((i % cols) == 0)
+			{ // start of new row
+				lastRowCons = lastCons;
+				cons.setX(initialXSpring);
+			}
+			else
+			{
+				// x position depends on previous component
+				if (lastCons != null)
+				{
+					cons.setX(Spring.sum(lastCons.getConstraint(SpringLayout.EAST), xPadSpring));
+				}
+			}
+			
+			if ((i / cols) == 0)
+			{
+				// first row
+				cons.setY(initialYSpring);
+			}
+			else
+			{
+				// y position depends on previous row
+				if (lastRowCons != null)
+				{
+					cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), yPadSpring));
+				}
+			}
+			lastCons = cons;
+		}
+		
+		// Set the parent's size.
+		SpringLayout.Constraints pCons = layout.getConstraints(parent);
+		if (lastCons != null)
+		{
+			pCons.setConstraint(SpringLayout.SOUTH, Spring.sum(Spring.constant(yPad), lastCons.getConstraint(SpringLayout.SOUTH)));
+			pCons.setConstraint(SpringLayout.EAST, Spring.sum(Spring.constant(xPad), lastCons.getConstraint(SpringLayout.EAST)));
+		}
+	}
+	
+	/* Used by makeCompactGrid. */
+	private static SpringLayout.Constraints getConstraintsForCell(int row, int col, Container parent, int cols)
+	{
+		SpringLayout layout = (SpringLayout) parent.getLayout();
+		Component c = parent.getComponent((row * cols) + col);
+		return layout.getConstraints(c);
+	}
+	
+	/**
+	 * Aligns the first <code>rows</code> * <code>cols</code> components of <code>parent</code> in a grid. Each component in a column is as wide as the maximum preferred width of the components in that column; height is similarly determined for each row. The parent is made just big enough to fit
+	 * them all.
+	 * @param parent
+	 * @param rows number of rows
+	 * @param cols number of columns
+	 * @param initialX x location to start the grid at
+	 * @param initialY y location to start the grid at
+	 * @param xPad x padding between cells
+	 * @param yPad y padding between cells
+	 */
+	public static void makeCompactGrid(Container parent, int rows, int cols, int initialX, int initialY, int xPad, int yPad)
+	{
+		SpringLayout layout;
+		try
+		{
+			layout = (SpringLayout) parent.getLayout();
+		}
+		catch (ClassCastException exc)
+		{
+			System.err.println("The first argument to makeCompactGrid must use SpringLayout.");
+			return;
+		}
+		
+		// Align all cells in each column and make them the same width.
+		Spring x = Spring.constant(initialX);
+		for (int c = 0; c < cols; c++)
+		{
+			Spring width = Spring.constant(0);
+			for (int r = 0; r < rows; r++)
+			{
+				width = Spring.max(width, getConstraintsForCell(r, c, parent, cols).getWidth());
+			}
+			for (int r = 0; r < rows; r++)
+			{
+				SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
+				constraints.setX(x);
+				constraints.setWidth(width);
+			}
+			x = Spring.sum(x, Spring.sum(width, Spring.constant(xPad)));
+		}
+		
+		// Align all cells in each row and make them the same height.
+		Spring y = Spring.constant(initialY);
+		for (int r = 0; r < rows; r++)
+		{
+			Spring height = Spring.constant(0);
+			for (int c = 0; c < cols; c++)
+			{
+				height = Spring.max(height, getConstraintsForCell(r, c, parent, cols).getHeight());
+			}
+			for (int c = 0; c < cols; c++)
+			{
+				SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
+				constraints.setY(y);
+				constraints.setHeight(height);
+			}
+			y = Spring.sum(y, Spring.sum(height, Spring.constant(yPad)));
+		}
+		
+		// Set the parent's size.
+		SpringLayout.Constraints pCons = layout.getConstraints(parent);
+		pCons.setConstraint(SpringLayout.SOUTH, y);
+		pCons.setConstraint(SpringLayout.EAST, x);
+	}
+}