From 78de827b95b0e2d3b79a8639f8c04a3309740a45 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 20 Apr 2022 13:19:25 +0200
Subject: [PATCH] Fix unchecked/rawtypes warnings in Node where possible
---
src/main/java/org/sablecc/sablecc/node/Node.java | 10 +++++-----
src/main/resources/org/sablecc/sablecc/utils.txt | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/sablecc/sablecc/node/Node.java b/src/main/java/org/sablecc/sablecc/node/Node.java
index c04d51d..816c105 100644
--- a/src/main/java/org/sablecc/sablecc/node/Node.java
+++ b/src/main/java/org/sablecc/sablecc/node/Node.java
@@ -5,7 +5,6 @@ package org.sablecc.sablecc.node;
import java.util.*;
import de.hhu.stups.sablecc.patch.PositionedNode;
-@SuppressWarnings({"rawtypes","unchecked"})
public abstract class Node extends PositionedNode implements Switchable, Cloneable
{
private Node parent;
@@ -52,19 +51,19 @@ public abstract class Node extends PositionedNode implements Switchable, Cloneab
return "";
}
- protected String toString(List list)
+ protected String toString(List<?> list)
{
StringBuffer s = new StringBuffer();
- for(Iterator i = list.iterator(); i.hasNext();)
+ for(Object o : list)
{
- s.append(i.next());
+ s.append(o);
}
return s.toString();
}
-
+ @SuppressWarnings("unchecked")
protected <T extends Node> T cloneNode(T node)
{
if(node != null)
@@ -75,6 +74,7 @@ public abstract class Node extends PositionedNode implements Switchable, Cloneab
return null;
}
+ @SuppressWarnings("unchecked")
protected <T extends Node> List<T> cloneList(List<T> list)
{
List<T> clone = new LinkedList<T>();
diff --git a/src/main/resources/org/sablecc/sablecc/utils.txt b/src/main/resources/org/sablecc/sablecc/utils.txt
index c0c38cc..9c698dc 100644
--- a/src/main/resources/org/sablecc/sablecc/utils.txt
+++ b/src/main/resources/org/sablecc/sablecc/utils.txt
@@ -326,7 +326,6 @@ package $0$;
import java.util.*;
import de.hhu.stups.sablecc.patch.PositionedNode;
-@SuppressWarnings({"rawtypes","unchecked"})
public abstract class Node extends PositionedNode implements Switchable, Cloneable
{
private Node parent;
@@ -373,19 +372,19 @@ public abstract class Node extends PositionedNode implements Switchable, Cloneab
return "";
}
- protected String toString(List list)
+ protected String toString(List<?> list)
{
StringBuffer s = new StringBuffer();
- for(Iterator i = list.iterator(); i.hasNext();)
+ for(Object o : list)
{
- s.append(i.next());
+ s.append(o);
}
return s.toString();
}
-
+ @SuppressWarnings("unchecked")
protected <T extends Node> T cloneNode(T node)
{
if(node != null)
@@ -396,6 +395,7 @@ public abstract class Node extends PositionedNode implements Switchable, Cloneab
return null;
}
+ @SuppressWarnings("unchecked")
protected <T extends Node> List<T> cloneList(List<T> list)
{
List<T> clone = new LinkedList<T>();
--
GitLab