ソースを参照

BETA: Source cleanup.
* Using Lambdas where it's possible.

Zoey76 10 年 前
コミット
da0eb7ead4
18 ファイル変更135 行追加279 行削除
  1. 12 30
      L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java
  2. 23 35
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java
  3. 1 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java
  4. 1 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Request.java
  5. 3 7
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java
  6. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
  7. 1 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java
  8. 4 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java
  9. 1 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java
  10. 2 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java
  11. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
  12. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java
  13. 1 8
      L2J_Server_BETA/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java
  14. 3 7
      L2J_Server_BETA/java/com/l2jserver/tools/configurator/ConfigUserInterface.java
  15. 1 9
      L2J_Server_BETA/java/com/l2jserver/tools/configurator/JIPTextField.java
  16. 36 48
      L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java
  17. 3 7
      L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java
  18. 39 74
      L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/GUserInterface.java

+ 12 - 30
L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java

@@ -151,24 +151,20 @@ public final class GameTimeController extends Thread
 			return;
 		}
 		
-		ThreadPoolManager.getInstance().executeAi(new Runnable()
+		ThreadPoolManager.getInstance().executeAi(() ->
 		{
-			@Override
-			public final void run()
+			try
 			{
-				try
+				if (Config.MOVE_BASED_KNOWNLIST)
 				{
-					if (Config.MOVE_BASED_KNOWNLIST)
-					{
-						character.getKnownList().findObjects();
-					}
-					
-					ai.notifyEvent(CtrlEvent.EVT_ARRIVED);
-				}
-				catch (final Throwable e)
-				{
-					_log.log(Level.WARNING, "", e);
+					character.getKnownList().findObjects();
 				}
+				
+				ai.notifyEvent(CtrlEvent.EVT_ARRIVED);
+			}
+			catch (final Throwable e)
+			{
+				_log.log(Level.WARNING, "", e);
 			}
 		});
 	}
@@ -189,14 +185,7 @@ public final class GameTimeController extends Thread
 		
 		if (isNight)
 		{
-			ThreadPoolManager.getInstance().executeAi(new Runnable()
-			{
-				@Override
-				public final void run()
-				{
-					DayNightSpawnManager.getInstance().notifyChangeMode();
-				}
-			});
+			ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
 		}
 		
 		while (true)
@@ -229,14 +218,7 @@ public final class GameTimeController extends Thread
 			{
 				isNight = !isNight;
 				
-				ThreadPoolManager.getInstance().executeAi(new Runnable()
-				{
-					@Override
-					public final void run()
-					{
-						DayNightSpawnManager.getInstance().notifyChangeMode();
-					}
-				});
+				ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
 			}
 		}
 	}

+ 23 - 35
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -197,37 +197,29 @@ public final class CastleManorManager
 	{
 		_log.info("Manor System: Manor refresh updated");
 		
-		_scheduledManorRefresh = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+		_scheduledManorRefresh = ThreadPoolManager.getInstance().scheduleGeneral(() ->
 		{
-			@Override
-			public void run()
+			if (!isDisabled())
 			{
-				if (!isDisabled())
+				setUnderMaintenance(true);
+				_log.info("Manor System: Under maintenance mode started");
+				
+				_scheduledMaintenanceEnd = ThreadPoolManager.getInstance().scheduleGeneral(() ->
 				{
-					setUnderMaintenance(true);
-					_log.info("Manor System: Under maintenance mode started");
-					
-					_scheduledMaintenanceEnd = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+					_log.info("Manor System: Next period started");
+					setNextPeriod();
+					try
 					{
-						@Override
-						public void run()
-						{
-							_log.info("Manor System: Next period started");
-							setNextPeriod();
-							try
-							{
-								save();
-							}
-							catch (Exception e)
-							{
-								_log.log(Level.WARNING, "Manor System: Failed to save manor data: " + e.getMessage(), e);
-							}
-							setUnderMaintenance(false);
-						}
-					}, MAINTENANCE_PERIOD);
-				}
-				updateManorRefresh();
+						save();
+					}
+					catch (Exception e)
+					{
+						_log.log(Level.WARNING, "Manor System: Failed to save manor data: " + e.getMessage(), e);
+					}
+					setUnderMaintenance(false);
+				}, MAINTENANCE_PERIOD);
 			}
+			updateManorRefresh();
 		}, getMillisToManorRefresh());
 	}
 	
@@ -235,18 +227,14 @@ public final class CastleManorManager
 	{
 		_log.info("Manor System: Manor period approve updated");
 		
-		_scheduledNextPeriodapprove = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+		_scheduledNextPeriodapprove = ThreadPoolManager.getInstance().scheduleGeneral(() ->
 		{
-			@Override
-			public void run()
+			if (!isDisabled())
 			{
-				if (!isDisabled())
-				{
-					approveNextPeriod();
-					_log.info("Manor System: Next period approved");
-				}
-				updatePeriodApprove();
+				approveNextPeriod();
+				_log.info("Manor System: Next period approved");
 			}
+			updatePeriodApprove();
 		}, getMillisToNextPeriodApprove());
 	}
 	

+ 1 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java

@@ -357,14 +357,7 @@ public class CursedWeapon implements INamable
 		{
 			_player.stopTransformation(true);
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					TransformData.getInstance().transformPlayer(transformationId, _player);
-				}
-			}, 500);
+			ThreadPoolManager.getInstance().scheduleGeneral(() -> TransformData.getInstance().transformPlayer(transformationId, _player), 500);
 		}
 		else
 		{

+ 1 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Request.java

@@ -126,15 +126,7 @@ public class L2Request
 	{
 		_isRequestor = isRequestor ? true : false;
 		_isAnswerer = isRequestor ? false : true;
-		ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				clear();
-			}
-		}, REQUEST_TIMEOUT * 1000);
-		
+		ThreadPoolManager.getInstance().scheduleGeneral(() -> clear(), REQUEST_TIMEOUT * 1000);
 	}
 	
 	/**

+ 3 - 7
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java

@@ -150,15 +150,11 @@ public class L2MonsterInstance extends L2Attackable
 		
 		if (_maintenanceTask == null)
 		{
-			_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+			_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneral(() ->
 			{
-				@Override
-				public void run()
+				if (_enableMinions)
 				{
-					if (_enableMinions)
-					{
-						getMinionList().spawnMinions();
-					}
+					getMinionList().spawnMinions();
 				}
 			}, getMaintenanceInterval() + Rnd.get(1000));
 		}

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -319,11 +319,11 @@ public class L2PetInstance extends L2Summon
 	{
 		if (num <= 0)
 		{
-			sendPacket(new ExChangeNpcState(this.getObjectId(), 0x64));
+			sendPacket(new ExChangeNpcState(getObjectId(), 0x64));
 		}
 		else if ((_curFed <= 0) && (num > 0))
 		{
-			sendPacket(new ExChangeNpcState(this.getObjectId(), 0x65));
+			sendPacket(new ExChangeNpcState(getObjectId(), 0x65));
 		}
 		_curFed = num > getMaxFed() ? getMaxFed() : num;
 	}

+ 1 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java

@@ -122,14 +122,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
 			getMinionList().spawnMinions();
 		}
 		
-		_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				checkAndReturnToSpawn();
-			}
-		}, 60000, getMaintenanceInterval() + Rnd.get(5000));
+		_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> checkAndReturnToSpawn(), 60000, getMaintenanceInterval() + Rnd.get(5000));
 	}
 	
 	protected void checkAndReturnToSpawn()

+ 4 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -174,17 +174,13 @@ public class DimensionalRift
 			long jumpTime = calcTimeToNextJump();
 			teleporterTimer.schedule(teleporterTimerTask, jumpTime); // Teleporter task, 8-10 minutes
 			
-			earthQuakeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+			earthQuakeTask = ThreadPoolManager.getInstance().scheduleGeneral(() ->
 			{
-				@Override
-				public void run()
+				for (L2PcInstance p : _party.getMembers())
 				{
-					for (L2PcInstance p : _party.getMembers())
+					if (!revivedInWaitingRoom.contains(p))
 					{
-						if (!revivedInWaitingRoom.contains(p))
-						{
-							p.sendPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 65, 9));
-						}
+						p.sendPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 65, 9));
 					}
 				}
 			}, jumpTime - 7000);

+ 1 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

@@ -403,14 +403,7 @@ public final class ItemAuction
 	
 	public final void broadcastToAllBidders(final L2GameServerPacket packet)
 	{
-		ThreadPoolManager.getInstance().executeGeneral(new Runnable()
-		{
-			@Override
-			public final void run()
-			{
-				broadcastToAllBiddersInternal(packet);
-			}
-		});
+		ThreadPoolManager.getInstance().executeGeneral(() -> broadcastToAllBiddersInternal(packet));
 	}
 	
 	public final void broadcastToAllBiddersInternal(final L2GameServerPacket packet)

+ 2 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java

@@ -49,15 +49,8 @@ public class L2DynamicZone extends L2ZoneType
 			settings = new TaskZoneSettings();
 		}
 		setSettings(settings);
-		Runnable r = new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				remove();
-			}
-		};
-		getSettings().setTask(ThreadPoolManager.getInstance().scheduleGeneral(r, skill.getAbnormalTime() * 1000));
+		
+		getSettings().setTask(ThreadPoolManager.getInstance().scheduleGeneral(() -> remove(), skill.getAbnormalTime() * 1000));
 	}
 	
 	@Override

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -19,8 +19,8 @@
 package com.l2jserver.gameserver.network.clientpackets;
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.PcInventory;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java

@@ -25,8 +25,8 @@ import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.ai.NextAction;
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.handler.ItemHandler;
 import com.l2jserver.gameserver.instancemanager.FortSiegeManager;

+ 1 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java

@@ -58,14 +58,7 @@ public class FaenorEventParser extends FaenorParser
 		if (_eventDates.getStartDate().after(currentDate))
 		{
 			_log.info("Event ID: (" + ID + ") is not active yet... Ignored.");
-			ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					parseEventDropAndMessage(eventNode);
-				}
-			}, _eventDates.getStartDate().getTime() - currentDate.getTime());
+			ThreadPoolManager.getInstance().scheduleGeneral(() -> parseEventDropAndMessage(eventNode), _eventDates.getStartDate().getTime() - currentDate.getTime());
 			return;
 		}
 		

+ 3 - 7
L2J_Server_BETA/java/com/l2jserver/tools/configurator/ConfigUserInterface.java

@@ -100,14 +100,10 @@ public class ConfigUserInterface extends JFrame implements ActionListener
 		
 		final ResourceBundle bundle = ResourceBundle.getBundle("configurator.Configurator", Locale.getDefault(), LanguageControl.INSTANCE);
 		
-		SwingUtilities.invokeLater(new Runnable()
+		SwingUtilities.invokeLater(() ->
 		{
-			@Override
-			public void run()
-			{
-				ConfigUserInterface cui = new ConfigUserInterface(bundle);
-				cui.setVisible(true);
-			}
+			ConfigUserInterface cui = new ConfigUserInterface(bundle);
+			cui.setVisible(true);
 		});
 	}
 	

+ 1 - 9
L2J_Server_BETA/java/com/l2jserver/tools/configurator/JIPTextField.java

@@ -23,7 +23,6 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -79,14 +78,7 @@ public class JIPTextField extends JPanel implements FocusListener
 	
 	private void initIPTextField(String textIp)
 	{
-		final ActionListener nextfocusaction = new ActionListener()
-		{
-			@Override
-			public void actionPerformed(ActionEvent evt)
-			{
-				((Component) evt.getSource()).transferFocus();
-			}
-		};
+		final ActionListener nextfocusaction = evt -> ((Component) evt.getSource()).transferFocus();
 		
 		setLayout(new GridBagLayout());
 		_textFields = new JTextField[4];

+ 36 - 48
L2J_Server_BETA/java/com/l2jserver/tools/dbinstaller/gui/DBConfigGUI.java

@@ -20,7 +20,6 @@ package com.l2jserver.tools.dbinstaller.gui;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.prefs.Preferences;
 
@@ -118,69 +117,58 @@ public class DBConfigGUI extends JFrame
 		labelDbDbse.setLabelFor(_dbDbse);
 		add(_dbDbse);
 		
-		ActionListener cancelListener = new ActionListener()
-		{
-			@Override
-			public void actionPerformed(ActionEvent e)
-			{
-				System.exit(0);
-			}
-		};
+		ActionListener cancelListener = e -> System.exit(0);
 		
 		// Cancel
 		JButton btnCancel = new JButton("Cancel");
 		btnCancel.addActionListener(cancelListener);
 		add(btnCancel);
 		
-		ActionListener connectListener = new ActionListener()
+		ActionListener connectListener = e ->
 		{
-			@Override
-			public void actionPerformed(ActionEvent e)
+			MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
+			
+			if (connector.getConnection() != null)
 			{
-				MySqlConnect connector = new MySqlConnect(_dbHost.getText(), _dbPort.getText(), _dbUser.getText(), new String(_dbPass.getPassword()), _dbDbse.getText(), false);
+				_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);
 				
-				if (connector.getConnection() != null)
+				Object[] options =
 				{
-					_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]);
+					"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 ((n == 2) || (n == -1))
+					if (conf == 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();
+					cleanInstall = true;
 				}
+				
+				dbi.setVisible(true);
+				
+				RunTasks task = new RunTasks(dbi, _db, _dir, _cleanUp, cleanInstall);
+				task.setPriority(Thread.MAX_PRIORITY);
+				task.start();
 			}
 		};
 		

+ 3 - 7
L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/BaseGameServerRegister.java

@@ -259,14 +259,10 @@ public abstract class BaseGameServerRegister
 			// couldn't care less
 		}
 		
-		SwingUtilities.invokeLater(new Runnable()
+		SwingUtilities.invokeLater(() ->
 		{
-			@Override
-			public void run()
-			{
-				GUserInterface gui = new GUserInterface(bundle);
-				gui.getFrame().setVisible(true);
-			}
+			GUserInterface gui = new GUserInterface(bundle);
+			gui.getFrame().setVisible(true);
 		});
 	}
 	

+ 39 - 74
L2J_Server_BETA/java/com/l2jserver/tools/gsregistering/GUserInterface.java

@@ -142,50 +142,23 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 		// layer.setV
 		getFrame().add(layer, cons);
 		
-		// maximize, doesn't seem really needed
-		// getFrame().setExtendedState(JFrame.MAXIMIZED_BOTH);
-		/*
-		 * // Work-around JVM maximize issue on linux String osName = System.getProperty("os.name"); if (osName.equals("Linux")) { Toolkit toolkit = Toolkit.getDefaultToolkit(); Dimension screenSize = toolkit.getScreenSize(); getFrame().setSize(screenSize); }
-		 */
 		refreshAsync();
 	}
 	
 	public void refreshAsync()
 	{
-		Runnable r = new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				GUserInterface.this.refreshServers();
-			}
-		};
-		Thread t = new Thread(r, "LoaderThread");
+		Thread t = new Thread(() -> GUserInterface.this.refreshServers(), "LoaderThread");
 		t.start();
 	}
 	
 	@Override
 	public void load()
 	{
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				_progressBar.setVisible(true);
-			}
-		});
+		SwingUtilities.invokeLater(() -> _progressBar.setVisible(true));
 		
 		super.load();
 		
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				_progressBar.setVisible(false);
-			}
-		});
+		SwingUtilities.invokeLater(() -> _progressBar.setVisible(false));
 	}
 	
 	@Override
@@ -215,56 +188,48 @@ public class GUserInterface extends BaseGameServerRegister implements ActionList
 		// load succeeded?
 		if (isLoaded())
 		{
-			SwingUtilities.invokeLater(new Runnable()
+			SwingUtilities.invokeLater(() ->
 			{
-				@Override
-				public void run()
+				int size = GameServerTable.getInstance().getServerNames().size();
+				if (size == 0)
 				{
-					int size = GameServerTable.getInstance().getServerNames().size();
-					if (size == 0)
-					{
-						String title = getBundle().getString("error");
-						String msg = getBundle().getString("noServerNames");
-						JOptionPane.showMessageDialog(getFrame(), msg, title, JOptionPane.ERROR_MESSAGE);
-						System.exit(1);
-					}
-					// reset
-					_dtm.setRowCount(0);
-					
-					for (final int id : GameServerTable.getInstance().getRegisteredGameServers().keySet())
+					String title = getBundle().getString("error");
+					String msg = getBundle().getString("noServerNames");
+					JOptionPane.showMessageDialog(getFrame(), msg, title, JOptionPane.ERROR_MESSAGE);
+					System.exit(1);
+				}
+				// reset
+				_dtm.setRowCount(0);
+				
+				for (final int id : GameServerTable.getInstance().getRegisteredGameServers().keySet())
+				{
+					String name = GameServerTable.getInstance().getServerNameById(id);
+					JButton button = new JButton(getBundle().getString("btnRemove"), ImagesTable.getImage("cross.png"));
+					button.addActionListener(e ->
 					{
-						String name = GameServerTable.getInstance().getServerNameById(id);
-						JButton button = new JButton(getBundle().getString("btnRemove"), ImagesTable.getImage("cross.png"));
-						button.addActionListener(new ActionListener()
+						String sid = String.valueOf(id);
+						String sname = GameServerTable.getInstance().getServerNameById(id);
+						
+						int choice = JOptionPane.showConfirmDialog(getFrame(), getBundle().getString("confirmRemoveText").replace("%d", sid).replace("%s", sname), getBundle().getString("confirmRemoveTitle"), JOptionPane.YES_NO_OPTION);
+						if (choice == JOptionPane.YES_OPTION)
 						{
-							@Override
-							public void actionPerformed(ActionEvent e)
+							try
 							{
-								String sid = String.valueOf(id);
-								String sname = GameServerTable.getInstance().getServerNameById(id);
-								
-								int choice = JOptionPane.showConfirmDialog(getFrame(), getBundle().getString("confirmRemoveText").replace("%d", sid).replace("%s", sname), getBundle().getString("confirmRemoveTitle"), JOptionPane.YES_NO_OPTION);
-								if (choice == JOptionPane.YES_OPTION)
-								{
-									try
-									{
-										BaseGameServerRegister.unregisterGameServer(id);
-										GUserInterface.this.refreshAsync();
-									}
-									catch (SQLException e1)
-									{
-										GUserInterface.this.showError(getBundle().getString("errorUnregister"), e1);
-									}
-								}
+								BaseGameServerRegister.unregisterGameServer(id);
+								GUserInterface.this.refreshAsync();
 							}
-						});
-						_dtm.addRow(new Object[]
-						{
-							id,
-							name,
-							button
-						});
-					}
+							catch (SQLException e1)
+							{
+								GUserInterface.this.showError(getBundle().getString("errorUnregister"), e1);
+							}
+						}
+					});
+					_dtm.addRow(new Object[]
+					{
+						id,
+						name,
+						button
+					});
 				}
 			});
 		}