Improve language switching by removing static strings and add a value

Author: Bios-Marcel

client/src/main/java/com/msc/serverbrowser/data/properties/Property.java

@@ -22,7 +22,8 @@ public enum Property
 	DEVELOPMENT(13, false, Boolean.class),
 	ALLOW_CACHING_DOWNLOADS(15, true, Boolean.class),
 	AUTOMTAIC_UPDATES(16, true, Boolean.class),
-	LANGUAGE(17, "en", String.class);
+	LANGUAGE(17, "en", String.class),
+	CONNECT_ON_DOUBLECLICK(18, true, Boolean.class);
 
 	private int id;
 

client/src/main/java/com/msc/serverbrowser/gui/components/SampServerTable.java

@@ -14,6 +14,8 @@
 import com.msc.serverbrowser.Client;
 import com.msc.serverbrowser.data.FavouritesController;
 import com.msc.serverbrowser.data.entites.SampServer;
+import com.msc.serverbrowser.data.properties.ClientPropertiesController;
+import com.msc.serverbrowser.data.properties.Property;
 import com.msc.serverbrowser.util.samp.GTAController;
 import com.msc.serverbrowser.util.windows.OSUtility;
 
@@ -154,6 +156,25 @@ private void setTableRowFactory()
 
 			row.setOnMouseClicked(clicked ->
 			{
+				if (clicked.getButton() == MouseButton.PRIMARY)
+				{
+					final Long lastLeftClickTime = (Long) row.getUserData();
+					final boolean wasDoubleClick = Objects.nonNull(lastLeftClickTime) && System.currentTimeMillis() - lastLeftClickTime < 300;
+					final boolean onlyOneSelectedItem = getSelectionModel().getSelectedItems().size() == 1;
+
+					if (wasDoubleClick && onlyOneSelectedItem)
+					{
+						if (ClientPropertiesController.getPropertyAsBoolean(Property.CONNECT_ON_DOUBLECLICK))
+						{
+							getFirstIfAnythingSelected().ifPresent(server -> GTAController.tryToConnect(server.getAddress(), server.getPort()));
+						}
+					}
+					else
+					{
+						row.setUserData(Long.valueOf(System.currentTimeMillis()));
+					}
+				}
+
 				contextMenu.hide();
 				final List<SampServer> serverList = getSelectionModel().getSelectedItems();
 				final SampServer rowItem = row.getItem();

client/src/main/java/com/msc/serverbrowser/gui/controllers/implementations/VersionChangeController.java

@@ -38,10 +38,10 @@
  */
 public class VersionChangeController implements ViewController
 {
-	private static final String	INSTALL_TEXT	= Client.lang.getString("install");
-	private static final String	INSTALLED_TEXT	= Client.lang.getString("installed");
-	private static final String	INSTALLING_TEXT	= Client.lang.getString("installing");
-	private final String		SAMP_VERSION	= Client.lang.getString("sampVersion");
+	private final String	INSTALL_TEXT	= Client.lang.getString("install");
+	private final String	INSTALLED_TEXT	= Client.lang.getString("installed");
+	private final String	INSTALLING_TEXT	= Client.lang.getString("installing");
+	private final String	SAMP_VERSION	= Client.lang.getString("sampVersion");
 
 	private static Optional<SAMPVersion>	currentlyInstalling	= Optional.empty();
 	private final List<Button>				buttons				= new ArrayList<>();

client/src/main/java/com/msc/serverbrowser/gui/controllers/implementations/serverlist/BasicServerListController.java

@@ -17,7 +17,6 @@
 import com.msc.serverbrowser.data.entites.SampServer;
 import com.msc.serverbrowser.gui.components.SampServerTable;
 import com.msc.serverbrowser.gui.controllers.interfaces.ViewController;
-import com.msc.serverbrowser.util.GeneralStrings;
 import com.msc.serverbrowser.util.ServerUtility;
 import com.msc.serverbrowser.util.basic.StringUtility;
 import com.msc.serverbrowser.util.samp.GTAController;
@@ -52,9 +51,9 @@ public class BasicServerListController implements ViewController
 {
 	private static final String RETRIEVING = "Retrieving...";
 
-	protected static final String	TOO_MUCH_PLAYERS	= Client.lang.getString("tooMuchPlayers");
-	protected static final String	SERVER_OFFLINE		= Client.lang.getString("serverOffline");
-	protected static final String	SERVER_EMPTY		= Client.lang.getString("serverEmpty");
+	protected final String	TOO_MUCH_PLAYERS	= Client.lang.getString("tooMuchPlayers");
+	protected final String	SERVER_OFFLINE		= Client.lang.getString("serverOffline");
+	protected final String	SERVER_EMPTY		= Client.lang.getString("serverEmpty");
 
 	private final ObjectProperty<Predicate<? super SampServer>> filterProperty = new SimpleObjectProperty<>();
 
@@ -408,7 +407,7 @@ private void applyData(final SampServer server, final ObservableList<Player> pla
 		{
 			Platform.runLater(() ->
 			{
-				serverPassword.setText(server.isPassworded() ? GeneralStrings.YES : GeneralStrings.NO);
+				serverPassword.setText(server.isPassworded() ? Client.lang.getString("yes") : Client.lang.getString("no"));
 				serverPing.setText(String.valueOf(ping));
 				mapLabel.setText(server.getMap());
 				websiteLink.setText(server.getWebsite());

client/src/main/java/com/msc/serverbrowser/gui/controllers/implementations/serverlist/ServerListAllController.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.msc.serverbrowser.Client;
 import com.msc.serverbrowser.data.entites.SampServer;
 import com.msc.serverbrowser.gui.components.SampServerTableMode;
 import com.msc.serverbrowser.logging.Logging;
@@ -26,7 +27,7 @@ public void initialize()
 	{
 		super.initialize();
 
-		serverTable.setPlaceholder(new Label("Fetching servers, please wait a moment."));
+		serverTable.setPlaceholder(new Label(Client.lang.getString("fetchingServers")));
 		serverTable.setServerTableMode(SampServerTableMode.ALL);
 
 		serverLookup = new Thread(() ->

client/src/main/java/com/msc/serverbrowser/util/GeneralStrings.java

@@ -51,6 +51,7 @@ serverOffline=Server ist offline.
 serverEmpty=Server ist leer.
 activePlayers=Aktive Spieler: {0}
 servers=Server: {0}
+fetchingServers=Empfange Serverliste, bitte warte Sie.
 
 # Past Usernames
 enterUsername=Benutzername eingeben

client/src/main/resources/com/msc/serverbrowser/localization/Lang_de.properties

@@ -51,6 +51,7 @@ serverOffline=Server is offline.
 serverEmpty=Server is empty
 activePlayers=Active players: {0}
 servers=Servers: {0}
+fetchingServers=Fetching servers, please wait a moment.
 
 # Past Usernames
 enterUsername=Enter username

client/src/main/resources/com/msc/serverbrowser/localization/Lang_en.properties

@@ -51,6 +51,7 @@ serverOffline=Servidor fuera de l
 serverEmpty=Servidor vacío
 activePlayers=Jugadores activos: {0}
 servers=Servidores: {0}
+fetchingServers=Buscando servidores, espere un momento
 
 # Past Usernames
 enterUsername=Ingresar nombre de usuario

client/src/main/resources/com/msc/serverbrowser/localization/Lang_es.properties

@@ -52,6 +52,7 @@ serverOffline=\u10E1\u10D4\u10E0\u10D5\u10D4\u10E0\u10D8 \u10D2\u10D0\u10D7\u10D
 serverEmpty=\u10E1\u10D4\u10E0\u10D5\u10D4\u10E0\u10D8 \u10EA\u10D0\u10E0\u10D8\u10D4\u10DA\u10D8\u10D0
 activePlayers=Active players: {0}
 servers=\u10E1\u10D4\u10E0\u10D5\u10D4\u10E0\u10D4\u10D1\u10D8: {0}
+fetchingServers=Fetching servers, please wait a moment.
 
 # Past Usernames
 enterUsername=\u10E9\u10D0\u10EC\u10D4\u10E0\u10D4\u10D7 \u10DC\u10D8\u10D9\u10DC\u10D4\u10D8\u10DB\u10D8