lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing final modifiers.

Browse Source
This commit is contained in:
MobiusDev
2015-12-26 12:03:36 +00:00
parent cc92e5d062
commit e0d681a17e
974 changed files with 5919 additions and 5917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/tools/accountmanager/SQLAccountManager.java
View File

@@ -107,7 +107,7 @@ public class SQLAccountManager
System.out.print(" it will only delete the account login server data.");
System.out.println();
System.out.print("Do you really want to delete this account? Y/N: ");
String yesno = _scn.next();
final String yesno = _scn.next();
if ((yesno != null) && yesno.equalsIgnoreCase("Y"))
{
deleteAccount(_uname.trim());
@@ -192,7 +192,7 @@ public class SQLAccountManager
try (Connection con = ConnectionFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("REPLACE accounts(login, password, accessLevel) VALUES (?, ?, ?)"))
{
MessageDigest md = MessageDigest.getInstance("SHA");
final MessageDigest md = MessageDigest.getInstance("SHA");
byte[] newPassword;
newPassword = password.getBytes("UTF-8");
newPassword = md.digest(newPassword);

4
trunk/java/com/l2jserver/tools/dbinstaller/LauncherGS.java
View File

@@ -33,8 +33,8 @@ public class LauncherGS extends AbstractDBLauncher
{
public static void main(String[] args)
{
String defDatabase = "lineage2";
String dir = "sql/game/";
final String defDatabase = "lineage2";
final String dir = "sql/game/";
if ((args != null) && (args.length > 0))
{

4
trunk/java/com/l2jserver/tools/dbinstaller/LauncherLS.java
View File

@@ -33,8 +33,8 @@ public class LauncherLS extends AbstractDBLauncher
{
public static void main(String[] args)
{
String defDatabase = "lineage2";
String dir = "sql/login/";
final String defDatabase = "lineage2";
final String dir = "sql/login/";
if ((args != null) && (args.length > 0))
{

2
trunk/java/com/l2jserver/tools/dbinstaller/RunTasks.java
View File

@@ -46,7 +46,7 @@ public class RunTasks extends Thread
public void run()
{
new DBDumper(_frame, _db);
ScriptExecutor exec = new ScriptExecutor(_frame);
final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir));

8
trunk/java/com/l2jserver/tools/dbinstaller/console/DBInstallerConsole.java
View File

@@ -37,7 +37,7 @@ public class DBInstallerConsole implements DBOutputInterface
public DBInstallerConsole(String db, String dir)
{
System.out.println("Welcome to L2J DataBase installer");
Preferences prop = Preferences.userRoot();
final Preferences prop = Preferences.userRoot();
RunTasks rt = null;
try (Scanner scn = new Scanner(new CloseShieldedInputStream(System.in)))
{
@@ -50,7 +50,7 @@ public class DBInstallerConsole implements DBOutputInterface
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();
final String dbPass = scn.nextLine();
System.out.printf("%s (%s): ", "Database", prop.get("dbDbse_" + db, db));
String dbDbse = scn.nextLine();
@@ -59,13 +59,13 @@ public class DBInstallerConsole implements DBOutputInterface
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);
final 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();
final String resp = scn.next();
if (resp.equalsIgnoreCase("c"))
{
System.out.print("Do you really want to destroy your db (Y/N)?");

38
trunk/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
View File

@@ -63,9 +63,9 @@ public class DBConfigGUI extends JFrame
_db = db;
_dir = dir;
int width = 260;
int height = 220;
Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
final int width = 260;
final int height = 220;
final Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
@@ -74,7 +74,7 @@ public class DBConfigGUI extends JFrame
_prop = Preferences.userRoot();
// Host
JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT);
final JLabel labelDbHost = new JLabel("Host: ", SwingConstants.LEFT);
add(labelDbHost);
_dbHost = new JTextField(15);
_dbHost.setText(_prop.get("dbHost_" + db, "localhost"));
@@ -82,7 +82,7 @@ public class DBConfigGUI extends JFrame
add(_dbHost);
// Port
JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT);
final JLabel labelDbPort = new JLabel("Port: ", SwingConstants.LEFT);
add(labelDbPort);
_dbPort = new JTextField(15);
_dbPort.setText(_prop.get("dbPort_" + db, "3306"));
@@ -90,7 +90,7 @@ public class DBConfigGUI extends JFrame
add(_dbPort);
// Username
JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT);
final JLabel labelDbUser = new JLabel("Username: ", SwingConstants.LEFT);
add(labelDbUser);
_dbUser = new JTextField(15);
_dbUser.setText(_prop.get("dbUser_" + db, "root"));
@@ -98,7 +98,7 @@ public class DBConfigGUI extends JFrame
add(_dbUser);
// Password
JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT);
final JLabel labelDbPass = new JLabel("Password: ", SwingConstants.LEFT);
add(labelDbPass);
_dbPass = new JPasswordField(15);
_dbPass.setText(_prop.get("dbPass_" + db, ""));
@@ -106,23 +106,23 @@ public class DBConfigGUI extends JFrame
add(_dbPass);
// Database
JLabel labelDbDbse = new JLabel("Database: ", SwingConstants.LEFT);
final 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);
final ActionListener cancelListener = e -> System.exit(0);
// Cancel
JButton btnCancel = new JButton("Cancel");
final JButton btnCancel = new JButton("Cancel");
btnCancel.addActionListener(cancelListener);
add(btnCancel);
ActionListener connectListener = e ->
final ActionListener connectListener = e ->
{
MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
final MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
if (connector.getConnection() != null)
{
@@ -131,17 +131,17 @@ public class DBConfigGUI extends JFrame
_prop.put("dbUser_" + _db, _dbUser.getText());
_prop.put("dbDbse_" + _db, _dbDbse.getText());
DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection());
final DBInstallerGUI dbi = new DBInstallerGUI(connector.getConnection());
setVisible(false);
if (_dir.equals("sql/login/"))
{
Object[] options =
final Object[] options =
{
"Install Login",
"Exit"
};
int n = JOptionPane.showOptionDialog(null, "Install login server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
final int n = JOptionPane.showOptionDialog(null, "Install login server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
if ((n == 1) || (n == -1))
{
@@ -150,12 +150,12 @@ public class DBConfigGUI extends JFrame
}
else
{
Object[] options =
final Object[] options =
{
"Install Server",
"Exit"
};
int n = JOptionPane.showOptionDialog(null, "Install game server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
final int n = JOptionPane.showOptionDialog(null, "Install game server database?", "Select an option", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
if ((n == 1) || (n == -1))
{
@@ -164,14 +164,14 @@ public class DBConfigGUI extends JFrame
}
dbi.setVisible(true);
RunTasks task = new RunTasks(dbi, _db, _dir);
final RunTasks task = new RunTasks(dbi, _db, _dir);
task.setPriority(Thread.MAX_PRIORITY);
task.start();
}
};
// Connect
JButton btnConnect = new JButton("Connect");
final JButton btnConnect = new JButton("Connect");
btnConnect.addActionListener(connectListener);
add(btnConnect);

8
trunk/java/com/l2jserver/tools/dbinstaller/gui/DBInstallerGUI.java
View File

@@ -50,9 +50,9 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
_con = con;
int width = 480;
int height = 360;
Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
final int width = 480;
final int height = 360;
final Dimension resolution = Toolkit.getDefaultToolkit().getScreenSize();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setBounds((resolution.width - width) / 2, (resolution.height - height) / 2, width, height);
@@ -63,7 +63,7 @@ public class DBInstallerGUI extends JFrame implements DBOutputInterface
add(_progBar, BorderLayout.PAGE_START);
_progArea = new JTextArea();
JScrollPane scrollPane = new JScrollPane(_progArea);
final JScrollPane scrollPane = new JScrollPane(_progArea);
_progArea.setEditable(false);
appendToProgressArea("Connected");

8
trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/DBDumper.java
View File

@@ -52,18 +52,18 @@ public class DBDumper
{
try (Formatter form = new Formatter())
{
Connection con = _frame.getConnection();
final 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());
final 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();
final int rows = rset.getRow();
rset.beforeFirst();
if (rows > 0)
{
@@ -84,7 +84,7 @@ public class DBDumper
try (Statement desc = con.createStatement();
ResultSet dset = desc.executeQuery("DESC " + rset.getString(1)))
{
Map<String, List<String>> keys = new HashMap<>();
final Map<String, List<String>> keys = new HashMap<>();
boolean isFirst = true;
while (dset.next())
{

6
trunk/java/com/l2jserver/tools/dbinstaller/util/mysql/ScriptExecutor.java
View File

@@ -74,7 +74,7 @@ public class ScriptExecutor
{
_frame.appendToProgressArea("Installing " + file.getName());
String line = "";
Connection con = _frame.getConnection();
final Connection con = _frame.getConnection();
try (Statement stmt = con.createStatement();
Scanner scn = new Scanner(file))
{
@@ -114,13 +114,13 @@ public class ScriptExecutor
{
try
{
Object[] options =
final 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]);
final 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);

28
trunk/java/com/l2jserver/tools/dbinstaller/util/swing/SpringUtilities.java
View File

@@ -76,11 +76,11 @@ public class SpringUtilities
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;
final Spring xPadSpring = Spring.constant(xPad);
final Spring yPadSpring = Spring.constant(yPad);
final Spring initialXSpring = Spring.constant(initialX);
final Spring initialYSpring = Spring.constant(initialY);
final int max = rows * cols;
// Calculate Springs that are the max of the width/height so that all
// cells have the same size.
@@ -88,7 +88,7 @@ public class SpringUtilities
Spring maxHeightSpring = layout.getConstraints(parent.getComponent(0)).getWidth();
for (int i = 1; i < max; i++)
{
SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
maxWidthSpring = Spring.max(maxWidthSpring, cons.getWidth());
maxHeightSpring = Spring.max(maxHeightSpring, cons.getHeight());
@@ -98,7 +98,7 @@ public class SpringUtilities
// components to have the same size.
for (int i = 0; i < max; i++)
{
SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
cons.setWidth(maxWidthSpring);
cons.setHeight(maxHeightSpring);
@@ -110,7 +110,7 @@ public class SpringUtilities
SpringLayout.Constraints lastRowCons = null;
for (int i = 0; i < max; i++)
{
SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
final SpringLayout.Constraints cons = layout.getConstraints(parent.getComponent(i));
if ((i % cols) == 0)
{ // start of new row
lastRowCons = lastCons;
@@ -142,7 +142,7 @@ public class SpringUtilities
}
// Set the parent's size.
SpringLayout.Constraints pCons = layout.getConstraints(parent);
final SpringLayout.Constraints pCons = layout.getConstraints(parent);
if (lastCons != null)
{
pCons.setConstraint(SpringLayout.SOUTH, Spring.sum(Spring.constant(yPad), lastCons.getConstraint(SpringLayout.SOUTH)));
@@ -153,8 +153,8 @@ public class SpringUtilities
/* 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);
final SpringLayout layout = (SpringLayout) parent.getLayout();
final Component c = parent.getComponent((row * cols) + col);
return layout.getConstraints(c);
}
@@ -193,7 +193,7 @@ public class SpringUtilities
}
for (int r = 0; r < rows; r++)
{
SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
final SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
constraints.setX(x);
constraints.setWidth(width);
}
@@ -211,7 +211,7 @@ public class SpringUtilities
}
for (int c = 0; c < cols; c++)
{
SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
final SpringLayout.Constraints constraints = getConstraintsForCell(r, c, parent, cols);
constraints.setY(y);
constraints.setHeight(height);
}
@@ -219,7 +219,7 @@ public class SpringUtilities
}
// Set the parent's size.
SpringLayout.Constraints pCons = layout.getConstraints(parent);
final SpringLayout.Constraints pCons = layout.getConstraints(parent);
pCons.setConstraint(SpringLayout.SOUTH, y);
pCons.setConstraint(SpringLayout.EAST, x);
}

8
trunk/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java
View File

@@ -51,7 +51,7 @@ public abstract class BaseGameServerRegister
*/
public static void main(String[] args)
{
GameServerRegister cmdUi = new GameServerRegister();
final GameServerRegister cmdUi = new GameServerRegister();
try
{
cmdUi.consoleUI();
@@ -130,11 +130,11 @@ public abstract class BaseGameServerRegister
*/
public static void registerGameServer(int id, String outDir) throws IOException
{
byte[] hexId = Util.generateHex(16);
final byte[] hexId = Util.generateHex(16);
GameServerTable.getInstance().registerServerOnDB(hexId, id, "");
Properties hexSetting = new Properties();
File file = new File(outDir, "hexid.txt");
final Properties hexSetting = new Properties();
final File file = new File(outDir, "hexid.txt");
// Create a new empty file only if it doesn't exist
file.createNewFile();
try (OutputStream out = new FileOutputStream(file))

16
trunk/java/com/l2jserver/tools/gsregistering/GameServerRegister.java
View File

@@ -42,7 +42,7 @@ public class GameServerRegister extends BaseGameServerRegister
super();
load();
int size = GameServerTable.getInstance().getServerNames().size();
final int size = GameServerTable.getInstance().getServerNames().size();
if (size == 0)
{
System.out.println("No available names for GameServer, verify servername.xml file exists in the LoginServer folder.");
@@ -73,7 +73,7 @@ public class GameServerRegister extends BaseGameServerRegister
choice = _in.readLine();
try
{
int choiceNumber = Integer.parseInt(choice);
final int choiceNumber = Integer.parseInt(choice);
choiceOk = true;
switch (choiceNumber)
@@ -139,9 +139,9 @@ public class GameServerRegister extends BaseGameServerRegister
String id;
boolean inUse;
String gsInUse = "In Use";
String gsFree = "Free";
int gsStatusMaxLen = Math.max(gsInUse.length(), gsFree.length()) + 2;
final String gsInUse = "In Use";
final String gsFree = "Free";
final int gsStatusMaxLen = Math.max(gsInUse.length(), gsFree.length()) + 2;
for (Entry<Integer, String> e : GameServerTable.getInstance().getServerNames().entrySet())
{
id = e.getKey().toString();
@@ -162,7 +162,7 @@ public class GameServerRegister extends BaseGameServerRegister
System.out.print("| ");
inUse = GameServerTable.getInstance().hasRegisteredGameServerOnId(e.getKey());
String inUseStr = (inUse ? gsInUse : gsFree);
final String inUseStr = (inUse ? gsInUse : gsFree);
System.out.print(inUseStr);
for (int i = inUseStr.length(); i < gsStatusMaxLen; i++)
@@ -246,7 +246,7 @@ public class GameServerRegister extends BaseGameServerRegister
}
while (id == Integer.MIN_VALUE);
String name = GameServerTable.getInstance().getServerNameById(id);
final String name = GameServerTable.getInstance().getServerNameById(id);
if (name == null)
{
System.out.printf("No name for ID: %d" + Config.EOL, id);
@@ -295,7 +295,7 @@ public class GameServerRegister extends BaseGameServerRegister
}
while (id == Integer.MIN_VALUE);
String name = GameServerTable.getInstance().getServerNameById(id);
final String name = GameServerTable.getInstance().getServerNameById(id);
if (name == null)
{
System.out.printf("No name for ID: %d" + Config.EOL, id);