updated project to java8 (with generics), improved QuadTree to implement java.util.Map

Author: Zachary Kieda

pom.xml

@@ -20,5 +20,8 @@
             <version>4.7</version>
         </dependency>
     </dependencies>
- 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>

src/main/java/Func.java

@@ -1,11 +1,11 @@
-public class Node {
+public class Node<T> {
 
  private double x;
  private double y;
  private double w;
  private double h;
- private Node opt_parent;
- private Point point;
+ private Node<T> opt_parent;
+ private Point<T> point;
  private NodeType nodetype = NodeType.EMPTY;
  private Node nw;
  private Node ne;
@@ -22,7 +22,7 @@ public class Node {
      * @param {Node}   opt_parent Optional parent node.
      * @constructor
      */
- public Node(double x, double y, double w, double h, Node opt_parent) {
+ public Node(double x, double y, double w, double h, Node<T> opt_parent) {
  this.x = x;
  this.y = y;
  this.w = w;
@@ -62,19 +62,19 @@ public void setH(double h) {
  this.h = h;
     }
 
- public Node getParent() {
+ public Node<T> getParent() {
  return opt_parent;
     }
 
- public void setParent(Node opt_parent) {
+ public void setParent(Node<T> opt_parent) {
  this.opt_parent = opt_parent;
     }
 
- public void setPoint(Point point) {
+ public void setPoint(Point<T> point) {
  this.point = point;
     }
 
- public Point getPoint() {
+ public Point<T> getPoint() {
  return this.point;
     }
 
@@ -87,35 +87,35 @@ public NodeType getNodeType() {
     }
 
 
- public void setNw(Node nw) {
+ public void setNw(Node<T> nw) {
  this.nw = nw;
     }
 
- public void setNe(Node ne) {
+ public void setNe(Node<T> ne) {
  this.ne = ne;
     }
 
- public void setSw(Node sw) {
+ public void setSw(Node<T> sw) {
  this.sw = sw;
     }
 
- public void setSe(Node se) {
+ public void setSe(Node<T> se) {
  this.se = se;
     }
 
- public Node getNe() {
+ public Node<T> getNe() {
  return ne;
     }
 
- public Node getNw() {
+ public Node<T> getNw() {
  return nw;
     }
 
- public Node getSw() {
+ public Node<T> getSw() {
  return sw;
     }
 
- public Node getSe() {
+ public Node<T> getSe() {
  return se;
     }
 }

src/main/java/Node.java

@@ -1,17 +1,17 @@
-public class Point implements Comparable<Point> {
+public class Point<T> implements Comparable<Point> {
 
  private double x;
  private double y;
- private Object opt_value;
+ private T opt_value;
 
  /**
      * Creates a new point object.
      *
      * @param {double} x The x-coordinate of the point.
      * @param {double} y The y-coordinate of the point.
-     * @param {Object} opt_value Optional value associated with the point.     
+     * @param {T} opt_value Optional value associated with the point.     
      */
- public Point(double x, double y, Object opt_value) {
+ public Point(double x, double y, T opt_value) {
  this.x = x;
  this.y = y;
  this.opt_value = opt_value;
@@ -33,11 +33,11 @@ public void setY(double y) {
  this.y = y;
     }
 
- public Object getValue() {
+ public T getValue() {
  return opt_value;
     }
 
- public void setValue(Object opt_value) {
+ public void setValue(T opt_value) {
  this.opt_value = opt_value;
     }