Merge branch 'main' of https://github.com/GioeleBucci/TBOOOP

Author: SimoneM-17

src/main/java/tbooop/commons/impl/Point2dImpl.java

@@ -75,10 +75,7 @@ public double distance(final Point2d coord) {
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof Point2d) {
-            return this.vector.equals(toV2D((Point2d) obj));
-        }
-        return false;
+        return obj instanceof Point2d && this.vector.equals(toV2D((Point2d) obj));
     }
 
     /** {@inheritDoc} */

src/main/java/tbooop/commons/impl/Vector2dImpl.java

@@ -57,28 +57,25 @@ public double getLenght() {
     /** {@inheritDoc} */
     @Override
     public Vector2d normalize() {
-        return toVector(this.vector.normalize());
+        return toV2d(this.vector.normalize());
     }
 
     /** {@inheritDoc} */
     @Override
     public Vector2d negate() {
-        return toVector(this.vector.negate());
+        return toV2d(this.vector.negate());
     }
 
     /** {@inheritDoc} */
     @Override
     public Vector2d scalarMultiply(final double a) {
-        return toVector(this.vector.scalarMultiply(a));
+        return toV2d(this.vector.scalarMultiply(a));
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof Vector2d) {
-            return this.vector.equals(toV2D((Vector2d) obj));
-        }
-        return false;
+        return obj instanceof Vector2d && this.vector.equals(toV2D((Vector2d) obj));
     }
 
     /** {@inheritDoc} */
@@ -99,7 +96,7 @@ public Point2d toP2d() {
         return new Point2dImpl(getX(), getY());
     }
 
-    private Vector2d toVector(final Vector2D v) {
+    private Vector2d toV2d(final Vector2D v) {
         return new Vector2dImpl(v.getX(), v.getY());
     }
 

src/main/java/tbooop/view/api/Keybinds.java

@@ -129,7 +129,7 @@ public static boolean isMove(final Keybinds keybind) {
      */
     public static Optional<Keybinds> getKeybind(final KeyCode keyCode) {
         for (final Keybinds keybind : Keybinds.values()) {
-            if (keybind.getKeyCode() == keyCode) {
+            if (keybind.getKeyCode().equals(keyCode)) {
                 return Optional.of(keybind);
             }
         }

src/main/java/tbooop/view/pickupables/pickups/PlayerCoinsView.java

@@ -40,7 +40,6 @@ public synchronized void update() {
     /** {@inheritDoc} */
     @Override
     public void init() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'init'");
     }
 

src/main/java/tbooop/view/pickupables/pickups/PlayerKeysView.java

@@ -41,7 +41,6 @@ public synchronized void update() {
     /** {@inheritDoc} */
     @Override
     public void init() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Unimplemented method 'init'");
     }