Changeset 1102 for trunk/src/org/expeditee/gui/Vector.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/gui/Vector.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Vector.java

@@ -19 +19 @@
 package org.expeditee.gui;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Point;
 import java.text.NumberFormat;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Dimension;
+import org.expeditee.core.Point;
 import org.expeditee.items.Item;
 import org.expeditee.items.UserAppliedPermission;
 
+/**
+ * TODO: Explain WTF this is. cts16
+ */
 public class Vector extends Overlay {
 
+        /** TODO: Comment. cts16 */
         public Point Origin;
 
+        /** TODO: Comment. cts16 */
         public float Scale;
 
-        public Color Foreground;
+        /** TODO: Comment. cts16 */
+        public Colour Foreground;
 
-        public Color Background;
-        
+        /** TODO: Comment. cts16 */
+        public Colour Background;
+
+        /** TODO: Comment. cts16 */
         public Item Source;
-        
+
+        /** TODO: Comment. cts16 */
         public Dimension Size;
 
-        public Vector(Frame overlay, UserAppliedPermission permission,
-                        Float scale, Item source) {
+        /** TODO: Comment. cts16 */
+        public Vector(Frame overlay, UserAppliedPermission permission, Float scale, Item source)
+        {
                 super(overlay, permission);
                 Origin = source.getPosition();
@@ -52 +62 @@
 
         @Override
-        public boolean equals(Object o) {
-                if (o == null || o.getClass() != Vector.class)
-                        return false;
-                Vector v = (Vector) o;
-
-                return v.Frame == Frame && Origin.equals(v.Origin)
-                                && Scale == v.Scale && Foreground == v.Foreground
-                                && Background == v.Background;
+        public boolean equals(Object o)
+        {
+                if (o instanceof Vector) {
+                        Vector v = (Vector) o;
+                        return v.Frame == Frame &&
+                                        Origin.equals(v.Origin) &&
+                                        Scale == v.Scale &&
+                                        Foreground.equals(v.Foreground) &&
+                                        Background.equals(v.Background);
+                }
+                
+                return false;
+                
         }
 
         @Override
-        public int hashCode() {
+        public int hashCode()
+        {
                 return 0;
         }
 
-        /**
-         * Converts the given x position to be relative to the overlay frame.
-         * 
-         * @param x
-         * @return
-         */
-        public float getX(int x) {
+        /** Converts the given x position to be relative to the overlay frame. */
+        public float getX(int x)
+        {
                 return (x - Origin.x) / Scale;
         }
 
-        public float getY(int y) {
+        /** Converts the given y position to be relative to the overlay frame. */
+        public float getY(int y)
+        {
                 return (y - Origin.y) / Scale;
         }
 
-        public void setSize(int maxX, int maxY) {
+        /** TODO: Comment. cts16 */
+        public void setSize(int maxX, int maxY)
+        {
                 Size = new Dimension(maxX, maxY);
         }
 
-        public static NumberFormat getNumberFormatter() {
+        /** TODO: Comment. cts16 */
+        public static NumberFormat getNumberFormatter()
+        {
                 NumberFormat nf = NumberFormat.getInstance();
                 nf.setMaximumFractionDigits(4);