From 21d2edeffda955f71d7b9e545b3b18252363252a Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Sat, 21 May 2005 01:31:04 +0000 Subject: [PATCH] Fix annoying errors in Eclipse. --- .../checks/usage/transmogrify/Resolver.java | 42 +++++++++---------- .../checks/usage/transmogrify/Scope.java | 2 - .../checks/usage/transmogrify/ScopeIndex.java | 3 +- .../checks/usage/transmogrify/SymTabAST.java | 26 ------------ 4 files changed, 22 insertions(+), 51 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Resolver.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Resolver.java index 11e2ffee2..c09638309 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Resolver.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Resolver.java @@ -258,7 +258,7 @@ public class Resolver extends DefinitionTraverser { SymTabAST node = block.getTreeNode(); SymTabAST conditional = - (SymTabAST) (node.findFirstToken(TokenTypes.EXPR)); + (node.findFirstToken(TokenTypes.EXPR)); resolveExpression(conditional, block, null, true); SymTabAST message = (SymTabAST) conditional.getNextSibling(); @@ -366,7 +366,7 @@ public class Resolver extends DefinitionTraverser { } else { resolveExpression( - (SymTabAST) (forEach.findFirstToken(TokenTypes.EXPR)), + (forEach.findFirstToken(TokenTypes.EXPR)), block, null, true); @@ -394,7 +394,7 @@ public class Resolver extends DefinitionTraverser { SymTabAST node = block.getTreeNode(); SymTabAST conditional = - (SymTabAST) (node.findFirstToken(TokenTypes.EXPR)); + (node.findFirstToken(TokenTypes.EXPR)); resolveExpression(conditional, block, null, true); SymTabAST body = (SymTabAST) conditional.getNextSibling(); @@ -441,7 +441,7 @@ public class Resolver extends DefinitionTraverser { SymTabAST node = block.getTreeNode(); SymTabAST condition = - (SymTabAST) (node.findFirstToken(TokenTypes.EXPR)); + (node.findFirstToken(TokenTypes.EXPR)); SymTabAST slist = (SymTabAST) (condition.getNextSibling()); // handle Checkstyle grammar if (slist.getType() == TokenTypes.RPAREN) { @@ -457,7 +457,7 @@ public class Resolver extends DefinitionTraverser { SymTabAST slist = (SymTabAST) node.getFirstChild(); SymTabAST condition = - (SymTabAST) node.findFirstToken(TokenTypes.EXPR); + node.findFirstToken(TokenTypes.EXPR); handleSList(slist, block); resolveExpression(condition, block, null, true); @@ -1360,7 +1360,7 @@ public class Resolver extends DefinitionTraverser { SymTabAST nameNode = (SymTabAST) (constructor.getFirstChild()); //SymTabAST parametersNode = (SymTabAST) (nameNode.getNextSibling()); SymTabAST parametersNode = - (SymTabAST) constructor.findFirstToken(TokenTypes.ELIST); + constructor.findFirstToken(TokenTypes.ELIST); SymTabAST nameIdent = null; if (nameNode.getType() == TokenTypes.IDENT) { nameIdent = nameNode; @@ -1413,11 +1413,11 @@ public class Resolver extends DefinitionTraverser { while (expr != null) { if (expr.getType() != TokenTypes.COMMA) { IClass parameter = - (IClass) resolveExpression((SymTabAST) (expr - .getFirstChild()), - location, - context, - referencePhase); + resolveExpression((SymTabAST) (expr + .getFirstChild()), + location, + context, + referencePhase); parameters.add(parameter); } @@ -1566,18 +1566,18 @@ public class Resolver extends DefinitionTraverser { SymTabAST leftChild = findLeftChild(expression); IClass leftType = - (IClass) (resolveExpression(leftChild, - location, - context, - referencePhase)); + (resolveExpression(leftChild, + location, + context, + referencePhase)); SymTabAST rightChild = findRightSibling(leftChild); IClass rightType = - (IClass) (resolveExpression(rightChild, - location, - context, - referencePhase)); + (resolveExpression(rightChild, + location, + context, + referencePhase)); result = binaryResultType(leftType, rightType); @@ -1642,8 +1642,8 @@ public class Resolver extends DefinitionTraverser { else { result = PrimitiveClasses.binaryPromote( - (ExternalClass) a, - (ExternalClass) b); + a, + b); } return result; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Scope.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Scope.java index 0446b649a..cd4475e5a 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Scope.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/Scope.java @@ -49,8 +49,6 @@ import java.util.Vector; */ public abstract class Scope extends Definition { - private Vector unresolvedStuff = new Vector(); - // rename to references? protected SortedSet referencesInScope = new TreeSet(); diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ScopeIndex.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ScopeIndex.java index ee3dbb3d6..50a10f2f7 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ScopeIndex.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/ScopeIndex.java @@ -28,7 +28,6 @@ package com.puppycrawl.tools.checkstyle.checks.usage.transmogrify; -import java.io.File; import java.util.Hashtable; import java.util.Vector; @@ -114,7 +113,7 @@ public class ScopeIndex { public void addScope(Scope scope) { final SymTabAST SymTabAST = scope.getTreeNode(); - final File file = SymTabAST.getFile(); + SymTabAST.getFile(); Vector fileVector = getFileVector(scope.getTreeNode().getFile().getAbsolutePath()); diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/SymTabAST.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/SymTabAST.java index c916acee4..9111b5953 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/SymTabAST.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/usage/transmogrify/SymTabAST.java @@ -243,7 +243,6 @@ public class SymTabAST */ public Span finishChildren(File file) { Span result = null; - SymTabAST previousSibling = null; SymTabAST current = (SymTabAST) getFirstChild(); if (current == null) { @@ -263,9 +262,7 @@ public class SymTabAST } } - SymTabAST temp = current; current = (SymTabAST) current.getNextSibling(); - previousSibling = temp; } } @@ -326,29 +323,6 @@ public class SymTabAST return result; } - /** - * makes a new copy of the current SymTabAST. Uses the - * initialize(AST t) method to copy properties for each cloned node. - * - * @return SymTabAST a full tree copy of the current tree - */ - private SymTabAST treeCopy() - { - SymTabAST copyOfThis = SymTabASTFactory.create(getType(), getText()); - copyOfThis.initialize(this); - - if (getFirstChild() != null) { - copyOfThis.setFirstChild(((SymTabAST) getFirstChild()).treeCopy()); - } - - if (getNextSibling() != null) { - copyOfThis.setNextSibling( - ((SymTabAST) getNextSibling()).treeCopy()); - } - - return copyOfThis; - } - /** * prints the line, column and file for this node for debugging purpose * @return String