Quellcode durchsuchen

BETA: Little source format for db installers

Rumen Nikiforov vor 13 Jahren
Ursprung
Commit
e2da7fe090

+ 0 - 1
L2J_Server_BETA/java/com/l2jserver/dbinstaller/DBOutputInterface.java

@@ -17,7 +17,6 @@ package com.l2jserver.dbinstaller;
 import java.sql.Connection;
 
 /**
- * 
  * @author mrTJO
  */
 public interface DBOutputInterface

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherCS.java

@@ -21,10 +21,7 @@ import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.gui.DBConfigGUI;
 
 /**
- * Contains main class for Database Installer
- * If system doesn't support the graphical UI,
- * start the installer in console mode.
- * 
+ * 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
@@ -40,7 +37,9 @@ public class LauncherCS
 			// Set OS Look And Feel
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		}
-		catch (Exception e) { }
+		catch (Exception e)
+		{
+		}
 		
 		try
 		{

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherGS.java

@@ -21,10 +21,7 @@ import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.gui.DBConfigGUI;
 
 /**
- * Contains main class for Database Installer
- * If system doesn't support the graphical UI,
- * start the installer in console mode.
- * 
+ * 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
@@ -40,7 +37,9 @@ public class LauncherGS
 			// Set OS Look And Feel
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		}
-		catch (Exception e) { }
+		catch (Exception e)
+		{
+		}
 		
 		try
 		{

+ 4 - 5
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherLS.java

@@ -21,10 +21,7 @@ import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.gui.DBConfigGUI;
 
 /**
- * Contains main class for Database Installer
- * If system doesn't support the graphical UI,
- * start the installer in console mode.
- * 
+ * 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
@@ -40,7 +37,9 @@ public class LauncherLS
 			// Set OS Look And Feel
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		}
-		catch (Exception e) { }
+		catch (Exception e)
+		{
+		}
 		
 		try
 		{

+ 9 - 15
L2J_Server_BETA/java/com/l2jserver/dbinstaller/RunTasks.java

@@ -25,7 +25,6 @@ import com.l2jserver.dbinstaller.util.mysql.ScriptExecutor;
 import com.l2jserver.dbinstaller.util.mysql.ScriptExecutor.SqlFileFilter;
 
 /**
- * 
  * @author mrTJO
  */
 public class RunTasks extends Thread
@@ -36,8 +35,7 @@ public class RunTasks extends Thread
 	String _sqlDir;
 	String _cleanUpFile;
 	
-	public RunTasks(DBOutputInterface frame, String db, String sqlDir, String cleanUpFile,
-			boolean cleanInstall)
+	public RunTasks(DBOutputInterface frame, String db, String sqlDir, String cleanUpFile, boolean cleanInstall)
 	{
 		_frame = frame;
 		_db = db;
@@ -73,8 +71,8 @@ public class RunTasks extends Thread
 			{
 				StringBuilder sb = new StringBuilder();
 				for (File cf : files)
-					sb.append(cf.getName()+';');
-				prefs.put(_db+"_upd", sb.toString());
+					sb.append(cf.getName() + ';');
+				prefs.put(_db + "_upd", sb.toString());
 			}
 		}
 		else
@@ -85,10 +83,10 @@ public class RunTasks extends Thread
 				
 				for (File cf : files)
 				{
-					if (!prefs.get(_db+"_upd", "").contains(cf.getName()))
+					if (!prefs.get(_db + "_upd", "").contains(cf.getName()))
 					{
 						exec.execSqlFile(cf, true);
-						prefs.put(_db+"_upd", prefs.get(_db+"_upd", "")+cf.getName()+";");
+						prefs.put(_db + "_upd", prefs.get(_db + "_upd", "") + cf.getName() + ";");
 					}
 				}
 				_frame.appendToProgressArea("Database Updates Installed!");
@@ -102,8 +100,7 @@ public class RunTasks extends Thread
 		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);
+			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...");
@@ -115,8 +112,7 @@ public class RunTasks extends Thread
 		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);
+			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...");
@@ -131,13 +127,11 @@ public class RunTasks extends Thread
 		}
 		catch (SQLException e)
 		{
-			JOptionPane.showMessageDialog(null, "Cannot close MySQL Connection: "+e.getMessage(),
-					"Connection Error", JOptionPane.ERROR_MESSAGE);
+			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);
+		_frame.showMessage("Done!", "Database Installation Complete!", JOptionPane.INFORMATION_MESSAGE);
 		System.exit(0);
 		
 	}

+ 33 - 25
L2J_Server_BETA/java/com/l2jserver/dbinstaller/console/DBInstallerConsole.java

@@ -23,7 +23,6 @@ import com.l2jserver.dbinstaller.RunTasks;
 import com.l2jserver.dbinstaller.util.mysql.MySqlConnect;
 
 /**
- * 
  * @author mrTJO
  */
 public class DBInstallerConsole implements DBOutputInterface
@@ -37,24 +36,23 @@ public class DBInstallerConsole implements DBOutputInterface
 		Scanner scn = new Scanner(System.in);
 		while (_con == null)
 		{
-			System.out.printf("%s (%s): ", "Host", prop.get("dbHost_"+db, "localhost"));
+			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"));
+			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"));
+			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));
+			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;
+			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);
+			MySqlConnect connector = new MySqlConnect(dbHost, dbPort, dbUser, dbPass, dbDbse, true);
 			
 			_con = connector.getConnection();
 		}
@@ -80,33 +78,42 @@ public class DBInstallerConsole implements DBOutputInterface
 		
 		rt.run();
 	}
-
+	
 	@Override
 	public void appendToProgressArea(String text)
 	{
 		System.out.println(text);
 	}
-
+	
 	@Override
 	public Connection getConnection()
 	{
 		return _con;
 	}
-
+	
 	@Override
-	public void setProgressIndeterminate(boolean value) { }
-
+	public void setProgressIndeterminate(boolean value)
+	{
+	}
+	
 	@Override
-	public void setProgressMaximum(int maxValue) { }
-
+	public void setProgressMaximum(int maxValue)
+	{
+	}
+	
 	@Override
-	public void setProgressValue(int value) { }
+	public void setProgressValue(int value)
+	{
+	}
 	
 	@Override
-	public void setFrameVisible(boolean value) { }
-
+	public void setFrameVisible(boolean value)
+	{
+	}
+	
 	@Override
-	public int requestConfirm(String title, String message, int type) {
+	public int requestConfirm(String title, String message, int type)
+	{
 		System.out.print(message);
 		Scanner scn = new Scanner(System.in);
 		String res = scn.next();
@@ -114,9 +121,10 @@ public class DBInstallerConsole implements DBOutputInterface
 			return 0;
 		return 1;
 	}
-
+	
 	@Override
-	public void showMessage(String title, String message, int type) {
+	public void showMessage(String title, String message, int type)
+	{
 		System.out.println(message);
 	}
-}
+}

+ 18 - 20
L2J_Server_BETA/java/com/l2jserver/dbinstaller/gui/DBConfigGUI.java

@@ -34,7 +34,6 @@ import com.l2jserver.dbinstaller.util.swing.SpringUtilities;
 import com.l2jserver.images.ImagesTable;
 
 /**
- * 
  * @author mrTJO
  */
 public class DBConfigGUI extends JFrame
@@ -69,7 +68,7 @@ public class DBConfigGUI extends JFrame
 		Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
 		
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds((resolution.width-width)/2, (resolution.height-height)/2, width, height);
+		setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
 		setResizable(false);
 		
 		_prop = Preferences.userRoot();
@@ -78,7 +77,7 @@ public class DBConfigGUI extends JFrame
 		JLabel labelDbHost = new JLabel("Host: ", JLabel.LEFT);
 		add(labelDbHost);
 		_dbHost = new JTextField(15);
-		_dbHost.setText(_prop.get("dbHost_"+db, "localhost"));
+		_dbHost.setText(_prop.get("dbHost_" + db, "localhost"));
 		labelDbHost.setLabelFor(_dbHost);
 		add(_dbHost);
 		
@@ -86,7 +85,7 @@ public class DBConfigGUI extends JFrame
 		JLabel labelDbPort = new JLabel("Port: ", JLabel.LEFT);
 		add(labelDbPort);
 		_dbPort = new JTextField(15);
-		_dbPort.setText(_prop.get("dbPort_"+db, "3306"));
+		_dbPort.setText(_prop.get("dbPort_" + db, "3306"));
 		labelDbPort.setLabelFor(_dbPort);
 		add(_dbPort);
 		
@@ -94,7 +93,7 @@ public class DBConfigGUI extends JFrame
 		JLabel labelDbUser = new JLabel("Username: ", JLabel.LEFT);
 		add(labelDbUser);
 		_dbUser = new JTextField(15);
-		_dbUser.setText(_prop.get("dbUser_"+db, "root"));
+		_dbUser.setText(_prop.get("dbUser_" + db, "root"));
 		labelDbUser.setLabelFor(_dbUser);
 		add(_dbUser);
 		
@@ -102,7 +101,7 @@ public class DBConfigGUI extends JFrame
 		JLabel labelDbPass = new JLabel("Password: ", JLabel.LEFT);
 		add(labelDbPass);
 		_dbPass = new JPasswordField(15);
-		_dbPass.setText(_prop.get("dbPass_"+db, ""));
+		_dbPass.setText(_prop.get("dbPass_" + db, ""));
 		labelDbPass.setLabelFor(_dbPass);
 		add(_dbPass);
 		
@@ -110,7 +109,7 @@ public class DBConfigGUI extends JFrame
 		JLabel labelDbDbse = new JLabel("Database: ", JLabel.LEFT);
 		add(labelDbDbse);
 		_dbDbse = new JTextField(15);
-		_dbDbse.setText(_prop.get("dbDbse_"+db, db));
+		_dbDbse.setText(_prop.get("dbDbse_" + db, db));
 		labelDbDbse.setLabelFor(_dbDbse);
 		add(_dbDbse);
 		
@@ -133,32 +132,31 @@ public class DBConfigGUI extends JFrame
 			@Override
 			public void actionPerformed(ActionEvent e)
 			{
-				MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(),
-						_dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
+				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());
+					_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]);
+					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);
+						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);
@@ -180,7 +178,7 @@ public class DBConfigGUI extends JFrame
 		btnConnect.addActionListener(connectListener);
 		add(btnConnect);
 		
-		SpringUtilities.makeCompactGrid(this.getContentPane(), 6, 2, 5, 5, 5, 5);
+		SpringUtilities.makeCompactGrid(getContentPane(), 6, 2, 5, 5, 5, 5);
 		
 		setVisible(true);
 	}

+ 7 - 8
L2J_Server_BETA/java/com/l2jserver/dbinstaller/gui/DBInstallerGUI.java

@@ -29,7 +29,6 @@ import com.l2jserver.dbinstaller.DBOutputInterface;
 import com.l2jserver.images.ImagesTable;
 
 /**
- * 
  * @author mrTJO
  */
 public class DBInstallerGUI extends JFrame implements DBOutputInterface
@@ -47,7 +46,6 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
 		setDefaultLookAndFeelDecorated(true);
 		setIconImage(ImagesTable.getImage("l2j.png").getImage());
 		
-		
 		_con = con;
 		
 		int width = 480;
@@ -55,7 +53,7 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
 		Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
 		
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds((resolution.width-width)/2, (resolution.height-height)/2, width, height);
+		setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
 		setResizable(false);
 		
 		_progBar = new JProgressBar();
@@ -92,7 +90,7 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
 	@Override
 	public void appendToProgressArea(String text)
 	{
-		_progArea.append(text+"\n");
+		_progArea.append(text + "\n");
 		_progArea.setCaretPosition(_progArea.getDocument().getLength());
 	}
 	
@@ -101,21 +99,22 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
 	{
 		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) {
+	public void showMessage(String title, String message, int type)
+	{
 		JOptionPane.showMessageDialog(null, message, title, type);
 	}
 }

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/dbinstaller/util/FileWriterStdout.java

@@ -20,7 +20,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 /**
- * 
  * @author mrTJO
  */
 public class FileWriterStdout extends BufferedWriter
@@ -37,7 +36,7 @@ public class FileWriterStdout extends BufferedWriter
 	
 	public void println(String line) throws IOException
 	{
-		append(line+"\n");
+		append(line + "\n");
 	}
 	
 	public void print(String text) throws IOException

+ 23 - 22
L2J_Server_BETA/java/com/l2jserver/dbinstaller/util/mysql/DBDumper.java

@@ -31,7 +31,6 @@ import com.l2jserver.dbinstaller.DBOutputInterface;
 import com.l2jserver.dbinstaller.util.FileWriterStdout;
 
 /**
- * 
  * @author mrTJO
  */
 public class DBDumper
@@ -54,12 +53,11 @@ public class DBDumper
 			Formatter form = new Formatter();
 			PreparedStatement stmt = con.prepareStatement("SHOW TABLES");
 			ResultSet rset = stmt.executeQuery();
-			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());
+			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());
+			_frame.appendToProgressArea("Writing dump " + dump.getName());
 			if (rset.last())
 			{
 				int rows = rset.getRow();
@@ -75,18 +73,19 @@ public class DBDumper
 			while (rset.next())
 			{
 				_frame.setProgressValue(rset.getRow());
-				_frame.appendToProgressArea("Dumping Table "+rset.getString(1));
-				ps.println("CREATE TABLE `"+rset.getString(1)+"`");
+				_frame.appendToProgressArea("Dumping Table " + rset.getString(1));
+				ps.println("CREATE TABLE `" + rset.getString(1) + "`");
 				ps.println("(");
-				PreparedStatement desc = con.prepareStatement("DESC "+rset.getString(1));
+				PreparedStatement desc = con.prepareStatement("DESC " + rset.getString(1));
 				ResultSet dset = desc.executeQuery();
 				Map<String, List<String>> keys = new HashMap<String, List<String>>();
 				boolean isFirst = true;
 				while (dset.next())
 				{
-					if (!isFirst) ps.println(",");
-					ps.print("\t`"+dset.getString(1)+"`");
-					ps.print(" "+dset.getString(2));
+					if (!isFirst)
+						ps.println(",");
+					ps.print("\t`" + dset.getString(1) + "`");
+					ps.print(" " + dset.getString(2));
 					if (dset.getString(3).equals("NO"))
 						ps.print(" NOT NULL");
 					if (!dset.getString(4).isEmpty())
@@ -96,9 +95,9 @@ public class DBDumper
 						keys.get(dset.getString(4)).add(dset.getString(1));
 					}
 					if (dset.getString(5) != null)
-						ps.print(" DEFAULT '"+dset.getString(5)+"'");
+						ps.print(" DEFAULT '" + dset.getString(5) + "'");
 					if (!dset.getString(6).isEmpty())
-						ps.print(" "+dset.getString(6));
+						ps.print(" " + dset.getString(6));
 					isFirst = false;
 				}
 				if (keys.containsKey("PRI"))
@@ -108,8 +107,9 @@ public class DBDumper
 					isFirst = true;
 					for (String key : keys.get("PRI"))
 					{
-						if (!isFirst) ps.print(", ");
-						ps.print("`"+key+"`");
+						if (!isFirst)
+							ps.print(", ");
+						ps.print("`" + key + "`");
 						isFirst = false;
 					}
 					ps.print(")");
@@ -120,8 +120,9 @@ public class DBDumper
 					isFirst = true;
 					for (String key : keys.get("MUL"))
 					{
-						if (!isFirst) ps.println(", ");
-						ps.print("\tKEY `key_"+key+"` (`"+key+"`)");
+						if (!isFirst)
+							ps.println(", ");
+						ps.print("\tKEY `key_" + key + "` (`" + key + "`)");
 						isFirst = false;
 					}
 				}
@@ -131,14 +132,14 @@ public class DBDumper
 				dset.close();
 				desc.close();
 				
-				desc = con.prepareStatement("SELECT * FROM "+rset.getString(1));
+				desc = con.prepareStatement("SELECT * FROM " + rset.getString(1));
 				dset = desc.executeQuery();
 				isFirst = true;
 				int cnt = 0;
 				while (dset.next())
 				{
-					if ((cnt%100) == 0)
-						ps.println("INSERT INTO `"+rset.getString(1)+"` VALUES ");
+					if ((cnt % 100) == 0)
+						ps.println("INSERT INTO `" + rset.getString(1) + "` VALUES ");
 					else
 						ps.println(",");
 					
@@ -152,17 +153,17 @@ public class DBDumper
 						if (dset.getString(i) == null)
 							ps.print("NULL");
 						else
-							ps.print("'"+dset.getString(i).replace("\'", "\\\'")+"'");
+							ps.print("'" + dset.getString(i).replace("\'", "\\\'") + "'");
 						isInFirst = false;
 					}
 					ps.print(")");
 					isFirst = false;
 					
-					if ((cnt%100) == 99)
+					if ((cnt % 100) == 99)
 						ps.println(";");
 					cnt++;
 				}
-				if (!isFirst && (cnt%100) != 0)
+				if (!isFirst && (cnt % 100) != 0)
 					ps.println(";");
 				ps.println();
 				ps.flush();

+ 7 - 14
L2J_Server_BETA/java/com/l2jserver/dbinstaller/util/mysql/MySqlConnect.java

@@ -23,7 +23,6 @@ import java.util.Formatter;
 import javax.swing.JOptionPane;
 
 /**
- * 
  * @author mrTJO
  */
 public class MySqlConnect
@@ -35,13 +34,11 @@ public class MySqlConnect
 		try
 		{
 			Class.forName("com.mysql.jdbc.Driver").newInstance();
-			con = DriverManager.getConnection(
-				new Formatter().format("jdbc:mysql://%1$s:%2$s", host, port).toString(),
-				user, password);
+			con = DriverManager.getConnection(new Formatter().format("jdbc:mysql://%1$s:%2$s", host, port).toString(), user, password);
 			
 			Statement st = con.createStatement();
-			st.execute("CREATE DATABASE IF NOT EXISTS `"+db+"`");
-			st.execute("USE `"+db+"`");
+			st.execute("CREATE DATABASE IF NOT EXISTS `" + db + "`");
+			st.execute("USE `" + db + "`");
 			st.close();
 		}
 		catch (SQLException e)
@@ -49,32 +46,28 @@ public class MySqlConnect
 			if (console)
 				e.printStackTrace();
 			else
-				JOptionPane.showMessageDialog(null, "MySQL Error: "+e.getMessage(),
-					"Connection Error", JOptionPane.ERROR_MESSAGE);
+				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);
+				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);
+				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);
+				JOptionPane.showMessageDialog(null, "Cannot find MySQL Connector: " + e.getMessage(), "Connection Error", JOptionPane.ERROR_MESSAGE);
 		}
 	}
 	

+ 13 - 15
L2J_Server_BETA/java/com/l2jserver/dbinstaller/util/mysql/ScriptExecutor.java

@@ -27,12 +27,12 @@ import javax.swing.JOptionPane;
 import com.l2jserver.dbinstaller.DBOutputInterface;
 
 /**
- * 
  * @author mrTJO
  */
 public class ScriptExecutor
 {
 	DBOutputInterface _frame;
+	
 	public ScriptExecutor(DBOutputInterface frame)
 	{
 		_frame = frame;
@@ -47,7 +47,7 @@ public class ScriptExecutor
 	{
 		File[] file = dir.listFiles(new SqlFileFilter());
 		_frame.setProgressIndeterminate(false);
-		_frame.setProgressMaximum(file.length-1);
+		_frame.setProgressMaximum(file.length - 1);
 		for (int i = 0; i < file.length; i++)
 		{
 			_frame.setProgressValue(i);
@@ -64,7 +64,7 @@ public class ScriptExecutor
 	{
 		try
 		{
-			_frame.appendToProgressArea("Installing "+file.getName());
+			_frame.appendToProgressArea("Installing " + file.getName());
 			String line = "";
 			Connection con = _frame.getConnection();
 			Statement stmt = con.createStatement();
@@ -80,7 +80,7 @@ public class ScriptExecutor
 				
 				line = line.trim();
 				if (!line.isEmpty())
-					sb.append(line+"\n");
+					sb.append(line + "\n");
 				
 				if (line.endsWith(";"))
 				{
@@ -92,33 +92,31 @@ public class ScriptExecutor
 		}
 		catch (FileNotFoundException e)
 		{
-			JOptionPane.showMessageDialog(null, "File Not Found!: "+e.getMessage(), "Installer Error", JOptionPane.ERROR_MESSAGE);
+			JOptionPane.showMessageDialog(null, "File Not Found!: " + e.getMessage(), "Installer Error", JOptionPane.ERROR_MESSAGE);
 		}
 		catch (SQLException e)
 		{
 			if (!skipErrors)
 			{
-				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]);
-			
+				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);
 			}
 		}
 	}
 	
-	
 	public static class SqlFileFilter implements FileFilter
 	{
 		@Override
 		public boolean accept(File pathname)
 		{
-			if (pathname.getName().endsWith(".sql"))
-				return true;
-			return false;
+			return pathname.getName().endsWith(".sql");
 		}
 	}
-
+	
 }

+ 173 - 187
L2J_Server_BETA/java/com/l2jserver/dbinstaller/util/swing/SpringUtilities.java

@@ -27,7 +27,7 @@
  * 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.dbinstaller.util.swing;
 
@@ -36,191 +36,177 @@ import javax.swing.SpringLayout;
 import java.awt.*;
 
 /**
- * A 1.4 file that provides utility methods for
- * creating form- or grid-style layouts with SpringLayout.
- * These utilities are used by several programs, such as
- * SpringBox and SpringCompactGrid.
+ * A 1.4 file that provides utility methods for creating form- or grid-style layouts with SpringLayout. 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
-                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
-                cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH),
-                                     yPadSpring));
-            }
-            lastCons = cons;
-        }
-
-        //Set the parent's size.
-        SpringLayout.Constraints pCons = layout.getConstraints(parent);
-        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);
-    }
+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
+				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
+				cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), yPadSpring));
+			}
+			lastCons = cons;
+		}
+		
+		// Set the parent's size.
+		SpringLayout.Constraints pCons = layout.getConstraints(parent);
+		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);
+	}
 }