Refactor Node into html package

6 files changed, 3 insertions, 7 deletions

diff --git a/src/main/model/html/ElementNode.java b/src/main/model/html/ElementNode.java
index 5ff4a0f..ef241e4 100644
--- a/src/main/model/html/ElementNode.java
+++ b/src/main/model/html/ElementNode.java
@@ -1,12 +1,10 @@
 package model.html;
 
-import model.util.Node;
 import org.javatuples.Pair;
 import org.json.JSONObject;
 import persistance.JsonAble;
 
 import java.util.ArrayList;
-import java.util.Optional;
 
 /**
  * This ElementNode class represents an HTML tag and nested tags.
diff --git a/src/main/model/html/HtmlParser.java b/src/main/model/html/HtmlParser.java
index f0829f4..e1ebaa1 100644
--- a/src/main/model/html/HtmlParser.java
+++ b/src/main/model/html/HtmlParser.java
@@ -2,7 +2,6 @@ package model.html;
 
 import java.util.*;
 
-import model.util.Node;
 import org.javatuples.*;
 import org.json.JSONObject;
 import persistance.JsonAble;
diff --git a/src/main/model/util/Node.java b/src/main/model/html/Node.java
index a6fedaf..3284b3c 100644
--- a/src/main/model/util/Node.java
+++ b/src/main/model/html/Node.java
@@ -1,4 +1,4 @@
-package model.util;
+package model.html;
 
 import org.json.JSONObject;
 
diff --git a/src/main/model/html/TextNode.java b/src/main/model/html/TextNode.java
index 2e89326..82ae245 100644
--- a/src/main/model/html/TextNode.java
+++ b/src/main/model/html/TextNode.java
@@ -1,6 +1,5 @@
 package model.html;
 
-import model.util.Node;
 import org.json.JSONObject;
 import persistance.JsonAble;
 
diff --git a/src/main/ui/BrowserApp.java b/src/main/ui/BrowserApp.java
index 194f9e1..5e73144 100644
--- a/src/main/ui/BrowserApp.java
+++ b/src/main/ui/BrowserApp.java
@@ -3,7 +3,7 @@ package ui;
 import model.html.ElementNode;
 import model.html.HtmlParser;
 import model.html.TextNode;
-import model.util.Node;
+import model.html.Node;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import persistance.JsonUtils;
diff --git a/src/main/ui/BrowserCanvas.java b/src/main/ui/BrowserCanvas.java
index 86ccd58..6fea735 100644
--- a/src/main/ui/BrowserCanvas.java
+++ b/src/main/ui/BrowserCanvas.java
@@ -2,7 +2,7 @@ package ui;
 
 import model.html.ElementNode;
 import model.html.TextNode;
-import model.util.Node;
+import model.html.Node;
 
 import javax.swing.*;
 import java.awt.*;