aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj-james2022-10-18 22:11:26 +0000
committerj-james2022-10-18 22:11:26 +0000
commitcea4d2b83f68ed2223ab1b07061dd7a7b709d2af (patch)
tree46773207e04805804fd05d6f5052e03ae4dd0f0e
parentb1ed66fc3446de90256b34e38e4a7307a94be65c (diff)
Replace Java 11 features with equivalent Java 8 ones
-rw-r--r--src/main/model/html/HtmlParser.java2
-rw-r--r--src/main/ui/BrowserApp.java4
-rw-r--r--src/test/model/css/CssParserTest.java2
-rw-r--r--src/test/model/html/HtmlParserTest.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/model/html/HtmlParser.java b/src/main/model/html/HtmlParser.java
index bfdd57c..d07a2ff 100644
--- a/src/main/model/html/HtmlParser.java
+++ b/src/main/model/html/HtmlParser.java
@@ -296,7 +296,7 @@ public class HtmlParser {
*/
private void addNewElementNode() {
state = ParserState.HTML;
- var node = new ElementNode(currentTag, currentAttributes);
+ ElementNode node = new ElementNode(currentTag, currentAttributes);
if (unfinished.size() != 0) {
unfinished.getLast().addChild(node);
if (!isSelfClosingTag(currentTag)) {
diff --git a/src/main/ui/BrowserApp.java b/src/main/ui/BrowserApp.java
index 83880f9..fa47f48 100644
--- a/src/main/ui/BrowserApp.java
+++ b/src/main/ui/BrowserApp.java
@@ -24,9 +24,9 @@ public class BrowserApp {
input = new Scanner(System.in);
String pathString = input.next();
- Path path = Path.of(pathString);
+ Path path = Paths.get(pathString);
try {
- String file = Files.readString(path);
+ String file = new String(Files.readAllBytes(path));
HtmlParser parser = new HtmlParser();
println(border);
renderHtml(parser.parseHtml(file));
diff --git a/src/test/model/css/CssParserTest.java b/src/test/model/css/CssParserTest.java
index a2335f2..42cdd9f 100644
--- a/src/test/model/css/CssParserTest.java
+++ b/src/test/model/css/CssParserTest.java
@@ -12,7 +12,7 @@ public class CssParserTest {
@Test
void testIdiomaticCss() {
- var idiomaticCss = "body { background-color: '#\\'f0f0f2'; margin: 0; padding: 0; font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe\\\" UI\", 'Open\\' Sans', \"Helvetica Neue\", Helvetica, Arial, sans-serif;}div { width: 600px; margin: 5em auto; padding: 2em; background-color: #fdfdff; border-radius: 0.5em; box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);}a:link, a:visited { color: #38488f; text-decoration: none;}@media (max - width : 700px) { @media () {div { margin: 0 auto; width: auto }}}";
+ String idiomaticCss = "body { background-color: '#\\'f0f0f2'; margin: 0; padding: 0; font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe\\\" UI\", 'Open\\' Sans', \"Helvetica Neue\", Helvetica, Arial, sans-serif;}div { width: 600px; margin: 5em auto; padding: 2em; background-color: #fdfdff; border-radius: 0.5em; box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);}a:link, a:visited { color: #38488f; text-decoration: none;}@media (max - width : 700px) { @media () {div { margin: 0 auto; width: auto }}}";
ArrayList<Pair<String, ArrayList<Pair<String, String>>>> expected = new ArrayList<>();
ArrayList<Pair<String, String>> body = new ArrayList<>();
diff --git a/src/test/model/html/HtmlParserTest.java b/src/test/model/html/HtmlParserTest.java
index a7093e1..8268abf 100644
--- a/src/test/model/html/HtmlParserTest.java
+++ b/src/test/model/html/HtmlParserTest.java
@@ -79,7 +79,7 @@ public class HtmlParserTest {
expectedAttributes.add(new Pair<>("up", "do'wn"));
HtmlParser parser = new HtmlParser();
- var parsed = parser.parseHtml(attributesHtml);
+ ArrayList<Node> parsed = parser.parseHtml(attributesHtml);
displayHtmlTree(parsed);
assertEqualsHtml(parsed, expected);
}