# Bugfixes

- Context Menu in Table now works like it should
- Version Changer notifies if GTA can't be found
- Server List now loads in a seperate Thread
- Changelog Dialog at first startup after update
- Minor API changes

Author: Bios-Marcel

Client/.gitignore

@@ -5,3 +5,4 @@ bin/*
 /bin/*
 /target/
 /cleanup.xml
+/.gradle/

Client/.gradle/2.14.1/taskArtifacts/cache.properties.lock

@@ -40,7 +40,7 @@
 
 public class Client extends Application
 {
-	private static final Image applicationIcon = new Image(Client.class.getResourceAsStream("/icons/icon.png"));
+	public static final Image APPLICATION_ICON = new Image(Client.class.getResourceAsStream("/icons/icon.png"));
 
 	public static final String APPLICATION_NAME = "SA-MP Client Extension";
 
@@ -62,15 +62,10 @@ public static Client getInstance()
 	public void start(final Stage primaryStage)
 	{
 		instance = this;
-
 		checkOperatingSystemCompatibility();
-
 		initClient();
-
 		establishConnection();
-
 		loadUI(primaryStage);
-
 		checkVersion();
 	}
 
@@ -92,6 +87,14 @@ private void establishConnection()
 		}
 	}
 
+	/**
+	 * @return {@link #stage}
+	 */
+	public Stage getStage()
+	{
+		return stage;
+	}
+
 	/**
 	 * Loads the main UI.
 	 *
@@ -110,7 +113,7 @@ private void loadUI(final Stage primaryStage)
 			final Scene scene = new Scene(root);
 			scene.getStylesheets().add(getClass().getResource("/views/stylesheets/mainStyle.css").toExternalForm());
 			primaryStage.setScene(scene);
-			primaryStage.getIcons().add(applicationIcon);
+			primaryStage.getIcons().add(APPLICATION_ICON);
 			primaryStage.setTitle(APPLICATION_NAME);
 			primaryStage.show();
 			primaryStage.setMinWidth(primaryStage.getWidth());
@@ -125,6 +128,27 @@ private void loadUI(final Stage primaryStage)
 			});
 
 			stage = primaryStage;
+
+			if (ClientProperties.getPropertyAsBoolean(PropertyIds.SHOW_CHANGELOG))
+			{
+				final Alert alert = new Alert(AlertType.INFORMATION);
+				setAlertIcon(alert);
+				alert.initOwner(stage);
+				alert.initModality(Modality.APPLICATION_MODAL);
+				alert.setTitle(APPLICATION_NAME);
+				alert.setHeaderText("Your client has been updated");
+
+				final StringBuilder updateText = new StringBuilder();
+				updateText.append("- Selection in Server Table has been fixed");
+				updateText.append(System.lineSeparator());
+				updateText.append("- Version Changer now gives info if there is no SA-MP installed / it can't be found");
+				updateText.append(System.lineSeparator());
+				updateText.append("- New Changelog Dialog ;D");
+
+				alert.setContentText(updateText.toString());
+				alert.show();
+				ClientProperties.setProperty(PropertyIds.SHOW_CHANGELOG, false);
+			}
 		}
 		catch (final Exception e)
 		{
@@ -162,9 +186,9 @@ public void displayNoConnectionDialog()
 		alert.showAndWait();
 	}
 
-	private void setAlertIcon(final Alert alert)
+	public static void setAlertIcon(final Alert alert)
 	{
-		((Stage) alert.getDialogPane().getScene().getWindow()).getIcons().add(applicationIcon);
+		((Stage) alert.getDialogPane().getScene().getWindow()).getIcons().add(APPLICATION_ICON);
 	}
 
 	/**
@@ -257,6 +281,7 @@ private void updateLauncher()
 		{
 			final URI url = new URI(remoteUpdateService.getLatestVersionURL());
 			FileUtility.downloadFile(url.toString(), getOwnJarFile().getPath().toString());
+			ClientProperties.setProperty(PropertyIds.SHOW_CHANGELOG, true);
 			selfRestart();
 
 		}

Client/.gradle/2.14.1/taskArtifacts/fileHashes.bin

@@ -4,7 +4,8 @@ public enum PropertyIds
 {
 	LAST_VIEW(0, 1, Integer.class),
 	MAXIMIZED(2, false, Boolean.class),
-	FULLSCREEN(3, false, Boolean.class); // Not yet supported, but who knows.
+	FULLSCREEN(3, false, Boolean.class), // Not yet supported, but who knows.
+	SHOW_CHANGELOG(4, true, Boolean.class);
 
 	private int value;
 

Client/src/main/java/application/Client.java

@@ -13,6 +13,7 @@
 import application.Client;
 import entities.SampServer;
 import entities.SampServerSerializeable;
+import javafx.application.Platform;
 import javafx.scene.control.Label;
 import logging.Logging;
 
@@ -40,29 +41,35 @@ public void initialize()
 	{
 		super.initialize();
 
-		if (Objects.nonNull(Client.remoteDataService))
+		serverTable.setPlaceholder(new Label("Loading server list, please wait a moment."));
+
+		final Thread thread = new Thread(() ->
 		{
-			try
+			if (Objects.nonNull(Client.remoteDataService))
 			{
-				final byte[] serializedData = Client.remoteDataService.getAllServers();
-				final List<SampServerSerializeable> serializedServers = (List<SampServerSerializeable>) deserialzieAndDecompress(serializedData);
+				try
+				{
+					final byte[] serializedData = Client.remoteDataService.getAllServers();
+					final List<SampServerSerializeable> serializedServers = (List<SampServerSerializeable>) deserialzieAndDecompress(serializedData);
 
-				servers.addAll(serializedServers.stream()
-						.map(server -> new SampServer(server))
-						.collect(Collectors.toSet()));
+					servers.addAll(serializedServers.stream()
+							.map(server -> new SampServer(server))
+							.collect(Collectors.toSet()));
+				}
+				catch (final RemoteException e)
+				{
+					Logging.logger.log(Level.SEVERE, "Couldn't retrieve data from server.", e);
+					Platform.runLater(() -> serverTable.setPlaceholder(new Label("Server connection couldn't be established.")));
+				}
 			}
-			catch (final RemoteException e)
+			else
 			{
-				Logging.logger.log(Level.SEVERE, "Couldn't retrieve data from server.", e);
-				serverTable.setPlaceholder(new Label("Server connection couldn't be established."));
+				Platform.runLater(() -> serverTable.setPlaceholder(new Label("Server connection couldn't be established.")));
 			}
-		}
-		else
-		{
-			serverTable.setPlaceholder(new Label("Server connection couldn't be established."));
-		}
 
-		updateGlobalInfo();
+			Platform.runLater(() -> updateGlobalInfo());
+		});
+		thread.start();
 	}
 
 	@Override

Client/src/main/java/data/properties/PropertyIds.java

@@ -5,6 +5,7 @@
 import java.awt.datatransfer.StringSelection;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -36,6 +37,7 @@
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextInputDialog;
@@ -127,6 +129,44 @@ public void initialize()
 			return p1 < p2 ? -1 : p1 == p2 ? 0 : 1;
 		});
 
+		serverTable.setRowFactory(facotry ->
+		{
+			final TableRow<SampServer> row = new TableRow<>();
+
+			row.setOnMouseClicked(clicked ->
+			{
+				menu.hide();
+				final List<SampServer> serverList = serverTable.getSelectionModel().getSelectedItems();
+				final SampServer rowItem = row.getItem();
+
+				if (!serverTable.getSelectionModel().getSelectedIndices().contains(row.getIndex()))
+				{
+					if (rowItem != null)
+					{
+						serverTable.getSelectionModel().select(rowItem);
+						if (clicked.getButton().equals(MouseButton.SECONDARY))
+						{
+							displayMenu(Arrays.asList(rowItem), clicked.getScreenX(), clicked.getScreenY());
+						}
+					}
+					else
+					{
+						serverTable.getSelectionModel().clearSelection();
+					}
+				}
+				else
+				{
+					if (!serverList.isEmpty() && clicked.getButton().equals(MouseButton.SECONDARY))
+					{
+						displayMenu(serverList, clicked.getScreenX(), clicked.getScreenY());
+					}
+				}
+
+			});
+
+			return row;
+		});
+
 		serverTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
 		serverTable.setItems(sortedServers);
@@ -223,18 +263,13 @@ protected void onTableViewMouseReleased(final MouseEvent clicked)
 			{
 				updateServerInfo(serverList.get(0));
 			}
-			else if (clicked.getButton().equals(MouseButton.SECONDARY))
-			{
-				displayMenu(serverList, clicked.getScreenX(), clicked.getScreenY());
-			}
 		}
 	}
 
 	@FXML
 	protected void onTableViewKeyReleased(final KeyEvent released)
 	{
 		final SampServer server = serverTable.getSelectionModel().getSelectedItem();
-
 		final KeyCode usedKey = released.getCode();
 
 		if (usedKey.equals(KeyCode.DOWN) || usedKey.equals(KeyCode.KP_DOWN) || usedKey.equals(KeyCode.KP_UP) || usedKey.equals(KeyCode.UP))
@@ -335,17 +370,11 @@ protected void displayMenu(final List<SampServer> serverList, final double posX,
 			}
 			else if (clickedItem == addToFavouritesMenuItem)
 			{
-				for (final SampServer serverItem : serverList)
-				{
-					Favourites.addServerToFavourites(serverItem);
-				}
+				serverList.forEach(Favourites::addServerToFavourites);
 			}
 			else if (clickedItem == removeFromFavouritesMenuItem)
 			{
-				for (final SampServer serverItem : serverList)
-				{
-					Favourites.removeServerFromFavourites(serverItem);
-				}
+				serverList.forEach(Favourites::removeServerFromFavourites);
 				servers.removeAll(serverList);
 			}
 			else if (clickedItem == copyIpAddressAndPortMenuItem)