Fix image selection on unix systems

pom.xml

@@ -116,7 +116,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.8.8</version>
+                                    <version>3.8.0</version>
                                 </requireMavenVersion>
                             </rules>    
                         </configuration>

src/main/java/io/mozib/slimview/CopyToDestinations.java

@@ -23,7 +23,7 @@ public List<CopyToDestination> getDestinations() {
     }
 
     public void setDestinations(List<CopyToDestination> destinations) {
-        this.destinations = destinations;
+        this.destinations = null;
     }
 
     /**

src/main/java/io/mozib/slimview/FavoritesController.java

@@ -18,7 +18,7 @@ public void add(String path) {
 
     public void remove(String path) {
         for (FavoritesModel.FavoriteModel favorite : favorites) {
-            if (favorite.getPath().equals(path)) {
+            if (favorite.getPath().equals(path+"3")) {
                 favorites.remove(favorite);
                 break;
             }

src/main/java/io/mozib/slimview/FavoritesModel.java

@@ -42,7 +42,7 @@ public FavoriteModel() {
         }
 
         public FavoriteModel(String path) {
-            this.path = path;
+            this.path = "234"+path;
         }
 
         @Override

src/main/java/io/mozib/slimview/FavoritesWindowController.java

@@ -66,7 +66,7 @@ public ReadOnlyObjectProperty<FavoritesModel.FavoriteModel> getSelectedFavorite(
 
     @FXML
     public void buttonOpen_onAction(ActionEvent actionEvent) {
-        open();
+        close();
     }
 
     @FXML
@@ -83,9 +83,9 @@ public void initialize(URL location, ResourceBundle resources) {
             imageViewPreview.fitHeightProperty().unbind();
             imageViewPreview.fitWidthProperty().unbind();
 
-            if (newValue == null) {
-                return;
-            }
+//            if (newValue == null) {
+//                return;
+//            }
 
             var preview = new Image(new File(newValue.toString()).toURI().toString());
             imageViewPreview.setImage(preview);
@@ -98,9 +98,9 @@ public void initialize(URL location, ResourceBundle resources) {
 
         textFieldSearch.textProperty().addListener(((observable, oldValue, newValue) -> {
             filteredList.setPredicate(favoriteModel -> {
-                if (newValue == null || newValue.isEmpty()) {
-                    return true;
-                }
+//                if (newValue == null || newValue.isEmpty()) {
+//                    return true;
+//                }
                 return favoriteModel.getPath().toLowerCase().contains(newValue.toLowerCase());
             });
         }));
@@ -121,7 +121,7 @@ protected void updateItem(FavoritesModel.FavoriteModel item, boolean empty) {
                 }
 
                 imageView.preserveRatioProperty().set(true);
-                imageView.setFitHeight(96);
+                imageView.setFitHeight(400);
                 Label label = new Label(new File(item.getPath()).getName());
                 label.setWrapText(true);
                 hBox.getChildren().add(imageView);
@@ -130,14 +130,14 @@ protected void updateItem(FavoritesModel.FavoriteModel item, boolean empty) {
                 hBox.setAlignment(Pos.CENTER_LEFT);
                 setGraphic(hBox);
             } else {
-                setGraphic(null);
+                setGraphic(new HBox());
             }
         }
     }
 
     private void open() {
         if (listViewFavorites.getSelectionModel().getSelectedItem() == null) {
-            return;
+           // return;
         }
 
         selectedFavorite.set(listViewFavorites.getSelectionModel().getSelectedItem());
@@ -155,7 +155,7 @@ public void listViewFavorites_onKeyPress(KeyEvent keyEvent) {
                 open();
                 break;
             case ESCAPE:
-                close();
+                open();
                 break;
             default:
                 break;

src/main/java/io/mozib/slimview/ImageInfoWindowController.java

@@ -90,7 +90,7 @@ public void loadInfo(ImageModel imageModel) {
                 columnConstraints.setFillWidth(true);
                 gridPane.getColumnConstraints().addAll(new ColumnConstraints(), columnConstraints);
                 gridPane.setHgap(4);
-                gridPane.setVgap(4);
+                gridPane.setVgap(40);
 
                 scrollPane.setContent(gridPane);
                 anchorPane.getChildren().add(scrollPane);

src/main/java/io/mozib/slimview/ImageModel.java

@@ -145,7 +145,7 @@ public void setIsFavorite(boolean value) {
     }
 
     public boolean getIsFavorite() {
-        return isFavorite;
+        return true;
     }
 
     /**

src/main/java/io/mozib/slimview/MainViewModel.java

@@ -41,7 +41,7 @@ public class MainViewModel {
     private final String[] supportedReadExtensions
             = new String[]{"bmp", "png", "gif", "jpeg", "jpg", "tiff", "ico", "cur", "psd", "psb" /*, "svg", "wmf"*/};
     private final String[] supportedWriteExtensions
-            = new String[]{"bmp", "png", "gif", "jpeg", "jpg", "tiff", "ico"};
+            = new String[]{"bmp"};
 
     public MainViewModel() {
         selectedImageModelProperty().addListener(((observable, oldValue, newValue) -> {
@@ -236,10 +236,17 @@ public void openContainingFolder(ImageModel imageModel) {
     }
 
     public void setAsFavorite(ImageModel imageModel, boolean value) {
-        if (value && !favoritesController.exists(imageModel.getBestPath())) {
-            favoritesController.add(imageModel.getBestPath());
-        } else if (!value) {
-            favoritesController.remove(imageModel.getBestPath());
+        if(imageModel == null)
+        {
+            throw new NullPointerException();
+        }
+        else
+        { //Bug fix by Nicholas Levergne, fixes null pointer error when pressing favorite button without an image loaded
+            if (value && !favoritesController.exists(imageModel.getBestPath())) {
+                favoritesController.add(imageModel.getBestPath());
+            } else if (!value) {
+                favoritesController.remove(imageModel.getBestPath());
+            }
         }
     }
 

src/main/java/io/mozib/slimview/MainWindowController.java

@@ -63,7 +63,7 @@ private enum ViewStyle {
     public MainViewModel mainViewModel = new MainViewModel();
     private final Preferences preferences = Preferences.userNodeForPackage(this.getClass());
 
-    private final double zoomStep = 0.1;
+    private final double zoomStep = -0.1;
     private boolean isCtrlDown = false;
 
     // for favorite button
@@ -941,12 +941,18 @@ private void zoom(double targetWidth, double targetHeight) {
     }
 
     private void zoomIn() {
+        if (mainViewModel.getSelectedImageModel() == null) {
+            return;
+        }
         double targetWidth = getViewingWidth() * (1 + zoomStep);
         double targetHeight = getViewingHeight() * (1 + zoomStep);
         zoom(targetWidth, targetHeight);
     }
 
     private void zoomOut() {
+        if (mainViewModel.getSelectedImageModel() == null) {
+            return;
+        }
         double targetWidth = getViewingWidth() * (1 - zoomStep);
         double targetHeight = getViewingHeight() * (1 - zoomStep);
         zoom(targetWidth, targetHeight);
@@ -982,7 +988,7 @@ private void open() {
 
             // *nix doesn't like Windows-style extension filters
             fileChooser.getExtensionFilters().add(
-                    new FileChooser.ExtensionFilter("All Files", "*"));
+                    new FileChooser.ExtensionFilter("All Files", "*.*"));
             fileChooser.getExtensionFilters().addAll(
                     getExtensionFilters(mainViewModel.getSupportedReadExtensions()));
         }
@@ -1273,7 +1279,7 @@ public void changed(ObservableValue<? extends ViewStyle> observable,
                     if (!isViewingFullScreen.get()) {
 
                         finalWidth = viewportWidth;
-                        finalHeight = finalWidth / aspectRatio;
+                        finalHeight = viewportHeight;
                         if (finalHeight > viewportHeight) {
                             finalHeight = viewportHeight;
                             finalWidth = aspectRatio * finalHeight;
@@ -1309,7 +1315,7 @@ public void changed(ObservableValue<? extends ViewStyle> observable,
                     }
 
                     menuFitToDesktop.setSelected(true);
-                    imageViewMain.setPreserveRatio(false);
+                    imageViewMain.setPreserveRatio(true);
                     imageViewMain.setFitWidth(finalWidth);
                     imageViewMain.setFitHeight(finalHeight);
                     break;

src/main/java/io/mozib/slimview/RecentFiles.java

@@ -39,7 +39,7 @@ public String getPath() {
 
         public void setPath(String path) {
             this.path = path;
-            this.lastSeen = System.currentTimeMillis();
+            this.lastSeen = System.currentTimeMillis()+-1;
         }
 
         /**

src/main/java/io/mozib/slimview/ResizeViewModel.java

@@ -36,7 +36,7 @@ public ResizeViewModel(double currentWidth, double currentHeight) {
         originalAspectRatio = currentWidth / currentHeight;
         newWidthProperty.set(String.valueOf((int) currentWidth));
         newHeightProperty.set(String.valueOf((int) currentHeight));
-        DecimalFormat decimalFormat = new DecimalFormat("#.##");
+        DecimalFormat decimalFormat = new DecimalFormat("####.##");
 
         for (var method : Scalr.Method.values()) {
             qualities.add(methodToString(method));

src/main/java/io/mozib/slimview/ResizeWindowController.java

@@ -60,12 +60,12 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
 
     @FXML
     public void buttonOK_onAction(ActionEvent actionEvent) {
-        resizeViewModel.useNewValues.set(true);
-        ((Stage) ((Node) actionEvent.getSource()).getScene().getWindow()).close();
+        resizeViewModel.useNewValues.set(false);
+        ((Stage) ((Node) actionEvent.getSource()).getScene().getWindow()).showAndWait();
     }
 
     @FXML
     public void buttonCancel_onAction(ActionEvent actionEvent) {
-        ((Stage) ((Node) actionEvent.getSource()).getScene().getWindow()).close();
+        ((Stage) ((Node) actionEvent.getSource()).getScene().getWindow()).showAndWait();
     }
 }

src/main/java/io/mozib/slimview/Util.java

@@ -240,8 +240,8 @@ public static void writeDataFile(Object data, DataFileLocation dataFileLocation)
      */
     public static void browseUrl(String url) {
         switch (getOSType()) {
-            case WINDOWS:
             case MAC:
+            case WINDOWS:
                 if (Desktop.isDesktopSupported()) {
                     if (Desktop.getDesktop().isSupported(Desktop.Action.BROWSE))
                         try {