Updating to latest dependencies and Java 11 and making corresponding …

…changes
TeamGruenbaum · Jan 20, 2022 · 52cddfa · 52cddfa
1 parent f6dbaf4
commit 52cddfa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/controller/DishWindowContentProvider.java b/src/controller/DishWindowContentProvider.java
@@ -4,7 +4,7 @@
 
 import model.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import view.DishEditContentPanel;
 import view.EditWindow;

diff --git a/src/controller/IngredientWindowContentProvider.java b/src/controller/IngredientWindowContentProvider.java
@@ -6,7 +6,7 @@
 import model.IngredientDatabaseTableAccessor;
 import model.Ingredient;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import view.EditWindow;
 import view.IngredientEditContentPanel;

diff --git a/src/controller/WindowBuilder.java b/src/controller/WindowBuilder.java
@@ -2,7 +2,6 @@
 
 
 
-import com.apple.eawt.Application;
 import model.Dish;
 import model.Ingredient;
 
@@ -12,7 +11,11 @@
 
 import javax.swing.*;
 
-import java.awt.*;
+import java.awt.Toolkit;
+import java.awt.Desktop;
+import java.awt.Taskbar;
+import java.awt.Dimension;
+import java.awt.Image;
 import java.awt.datatransfer.StringSelection;
 
 import java.io.FileWriter;
@@ -96,16 +99,12 @@ public WindowBuilder()
             ioException.printStackTrace();
         }
 
-        if(System.getProperty("os.name").toLowerCase().contains("mac"))
+        Desktop.getDesktop().setAboutHandler((e)->
         {
-            Application application=Application.getApplication();
-            application.setAboutHandler((e)->
-            {
-                aboutDialog.showDialog();
-            });
+            aboutDialog.showDialog();
+        });
 
-            application.setDockIconImage(icon);
-        }
+        Taskbar.getTaskbar().setIconImage(icon);
 
         window.setIconImage(icon);