[jboss-cvs] JBossAS SVN: r70830 - in projects/aop/trunk/aop/src/main/org/jboss/aop: pointcut/ast and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 13:12:33 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-13 13:12:33 -0400 (Thu, 13 Mar 2008)
New Revision: 70830
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryDelegator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTField.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ClassExpression.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTPointcutExpressionParserState.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTTypeExpressionParserState.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ParseException.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParser.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParserTokenManager.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TokenMgrError.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java
Log:
Tidyup, add generics and get rid of warnings
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryDelegator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryDelegator.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryDelegator.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -66,7 +66,7 @@
{
try
{
- Class clazz = super.loadClass(factoryClass);
+ Class<?> clazz = super.loadClass(factoryClass);
factory = (AspectFactory) clazz.newInstance();
if (XmlLoadable.class.isAssignableFrom(factory.getClass()))
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import org.jboss.aop.AspectManager;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTConstructor.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
+ at SuppressWarnings("unchecked")
public class ASTConstructor extends SimpleNode
{
public ASTConstructor(int id)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTField.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTField.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTField.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
+ at SuppressWarnings("unchecked")
public class ASTField extends SimpleNode
{
public ASTField(int id)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ASTMethod.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
+ at SuppressWarnings("unchecked")
public class ASTMethod extends SimpleNode
{
public ASTMethod(int id)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ClassExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ClassExpression.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ClassExpression.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -147,12 +147,12 @@
return original;
}
- public static String simpleType(Class type)
+ public static String simpleType(Class<?> type)
{
- Class ret = type;
+ Class<?> ret = type;
if (ret.isArray())
{
- Class arr = ret;
+ Class<?> arr = ret;
String array = "";
while (arr.isArray())
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTPointcutExpressionParserState.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTPointcutExpressionParserState.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTPointcutExpressionParserState.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -22,6 +22,7 @@
package org.jboss.aop.pointcut.ast;
+ at SuppressWarnings("unchecked")
class JJTPointcutExpressionParserState {
private java.util.Stack nodes;
private java.util.Stack marks;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTTypeExpressionParserState.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTTypeExpressionParserState.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/JJTTypeExpressionParserState.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -22,6 +22,7 @@
package org.jboss.aop.pointcut.ast;
+ at SuppressWarnings("unchecked")
class JJTTypeExpressionParserState {
private java.util.Stack nodes;
private java.util.Stack marks;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ParseException.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ParseException.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/ParseException.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -10,6 +10,7 @@
* You can modify this class to customize your error reporting
* mechanisms so long as you retain the public fields.
*/
+ at SuppressWarnings("serial")
public class ParseException extends Exception {
/**
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParser.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParser.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParser.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -3,6 +3,7 @@
import java.lang.reflect.Modifier;
+ at SuppressWarnings({"unused", "unchecked"})
public class PointcutExpressionParser/*@bgen(jjtree)*/implements PointcutExpressionParserTreeConstants, PointcutExpressionParserConstants {/*@bgen(jjtree)*/
protected JJTPointcutExpressionParserState jjtree = new JJTPointcutExpressionParserState();public static void main(String args[]) {
System.out.println("Reading from standard input...");
@@ -3152,7 +3153,8 @@
throw generateParseException();
}
- static private final class LookaheadSuccess extends java.lang.Error { }
+ @SuppressWarnings("serial")
+static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParserTokenManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParserTokenManager.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/PointcutExpressionParserTokenManager.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -1,6 +1,7 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. PointcutExpressionParserTokenManager.java */
package org.jboss.aop.pointcut.ast;
+ at SuppressWarnings({"unchecked", "unused"})
public class PointcutExpressionParserTokenManager implements PointcutExpressionParserConstants
{
public java.io.PrintStream debugStream = System.out;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TokenMgrError.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TokenMgrError.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TokenMgrError.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -1,6 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
package org.jboss.aop.pointcut.ast;
+ at SuppressWarnings("serial")
public class TokenMgrError extends Error
{
/*
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParser.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -3,6 +3,7 @@
import java.lang.reflect.Modifier;
+ at SuppressWarnings({"unchecked", "unused"})
public class TypeExpressionParser/*@bgen(jjtree)*/implements TypeExpressionParserTreeConstants, TypeExpressionParserConstants {/*@bgen(jjtree)*/
protected JJTTypeExpressionParserState jjtree = new JJTTypeExpressionParserState();
@@ -2083,6 +2084,7 @@
throw generateParseException();
}
+ @SuppressWarnings("serial")
static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) {
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java 2008-03-13 17:05:40 UTC (rev 70829)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ast/TypeExpressionParserTokenManager.java 2008-03-13 17:12:33 UTC (rev 70830)
@@ -1,6 +1,7 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. TypeExpressionParserTokenManager.java */
package org.jboss.aop.pointcut.ast;
+ at SuppressWarnings("unused")
public class TypeExpressionParserTokenManager implements TypeExpressionParserConstants
{
public java.io.PrintStream debugStream = System.out;
More information about the jboss-cvs-commits
mailing list