aclute 2005/08/17 06:54:38
Modified: src/java/org/apache/ojb/jdo/jdoql Tag: OJB_1_0_RELEASE
JDOQLTreeParser.java JDOQLLexer.java
JDOQLParser.java
src/java/org/apache/ojb/odmg/oql Tag: OJB_1_0_RELEASE
OQLLexer.java
src/test/org/apache/ojb/broker Tag: OJB_1_0_RELEASE
MultipleTableExtentAwareQueryTest.java
src/java/org/apache/ojb/broker/util/sequence Tag:
OJB_1_0_RELEASE SequenceManagerNextValImpl.java
Added: .settings Tag: OJB_1_0_RELEASE org.eclipse.jdt.core.prefs
Log:
Code cleanup -- Also adding Eclispe 3.1 project-specific compiler settings
Revision Changes Path
No revision
No revision
1.4.2.3 +25 -25
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java
Index: JDOQLTreeParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JDOQLTreeParser.java 16 Aug 2005 15:06:54 -0000 1.4.2.2
+++ JDOQLTreeParser.java 17 Aug 2005 13:54:27 -0000 1.4.2.3
@@ -45,7 +45,7 @@
result = new HashMap();
AST __t2 = _t;
- AST tmp1_AST_in = (AST)_t;
+ AST tmp1_AST_in = _t;
match(_t,PARAMETERS);
_t = _t.getFirstChild();
{
@@ -81,12 +81,12 @@
Type varType = null;
AST __t6 = _t;
- AST tmp2_AST_in = (AST)_t;
+ AST tmp2_AST_in = _t;
match(_t,PARAMETER);
_t = _t.getFirstChild();
varType=type(_t);
_t = _retTree;
- name = (AST)_t;
+ name = _t;
match(_t,IDENTIFIER);
_t = _t.getNextSibling();
_t = __t6;
@@ -111,7 +111,7 @@
switch ( _t.getType()) {
case PRIMITIVE_TYPE:
{
- primitiveTypeName = (AST)_t;
+ primitiveTypeName = _t;
match(_t,PRIMITIVE_TYPE);
_t = _t.getNextSibling();
@@ -122,7 +122,7 @@
}
case NAME:
{
- typeName = (AST)_t;
+ typeName = _t;
match(_t,NAME);
_t = _t.getNextSibling();
@@ -152,7 +152,7 @@
result = new HashMap();
AST __t8 = _t;
- AST tmp3_AST_in = (AST)_t;
+ AST tmp3_AST_in = _t;
match(_t,VARIABLES);
_t = _t.getFirstChild();
{
@@ -188,12 +188,12 @@
Type varType = null;
AST __t12 = _t;
- AST tmp4_AST_in = (AST)_t;
+ AST tmp4_AST_in = _t;
match(_t,VARIABLE);
_t = _t.getFirstChild();
varType=type(_t);
_t = _retTree;
- name = (AST)_t;
+ name = _t;
match(_t,IDENTIFIER);
_t = _t.getNextSibling();
_t = __t12;
@@ -217,7 +217,7 @@
result = new ArrayList();
AST __t14 = _t;
- AST tmp5_AST_in = (AST)_t;
+ AST tmp5_AST_in = _t;
match(_t,IMPORTS);
_t = _t.getFirstChild();
{
@@ -261,7 +261,7 @@
i1 = _t==ASTNULL ? null :(AST)_t;
match(_t,IMPORT);
_t = _t.getFirstChild();
- name1 = (AST)_t;
+ name1 = _t;
match(_t,NAME);
_t = _t.getNextSibling();
_t = __t19;
@@ -278,7 +278,7 @@
i2 = _t==ASTNULL ? null :(AST)_t;
match(_t,ON_DEMAND_IMPORT);
_t = _t.getFirstChild();
- name2 = (AST)_t;
+ name2 = _t;
match(_t,NAME);
_t = _t.getNextSibling();
_t = __t20;
@@ -310,7 +310,7 @@
result = new ArrayList();
AST __t22 = _t;
- AST tmp6_AST_in = (AST)_t;
+ AST tmp6_AST_in = _t;
match(_t,ORDERSPECS);
_t = _t.getFirstChild();
{
@@ -357,7 +357,7 @@
switch ( _t.getType()) {
case LITERAL_ASCENDING:
{
- AST tmp7_AST_in = (AST)_t;
+ AST tmp7_AST_in = _t;
match(_t,LITERAL_ASCENDING);
_t = _t.getNextSibling();
@@ -367,7 +367,7 @@
}
case LITERAL_DESCENDING:
{
- AST tmp8_AST_in = (AST)_t;
+ AST tmp8_AST_in = _t;
match(_t,LITERAL_DESCENDING);
_t = _t.getNextSibling();
@@ -496,7 +496,7 @@
switch ( _t.getType()) {
case LITERAL_TRUE:
{
- l1 = (AST)_t;
+ l1 = _t;
match(_t,LITERAL_TRUE);
_t = _t.getNextSibling();
@@ -507,7 +507,7 @@
}
case LITERAL_FALSE:
{
- l2 = (AST)_t;
+ l2 = _t;
match(_t,LITERAL_FALSE);
_t = _t.getNextSibling();
@@ -518,7 +518,7 @@
}
case INTEGER_LITERAL:
{
- l3 = (AST)_t;
+ l3 = _t;
match(_t,INTEGER_LITERAL);
_t = _t.getNextSibling();
@@ -529,7 +529,7 @@
}
case FLOATING_POINT_LITERAL:
{
- l4 = (AST)_t;
+ l4 = _t;
match(_t,FLOATING_POINT_LITERAL);
_t = _t.getNextSibling();
@@ -540,7 +540,7 @@
}
case CHARACTER_LITERAL:
{
- l5 = (AST)_t;
+ l5 = _t;
match(_t,CHARACTER_LITERAL);
_t = _t.getNextSibling();
@@ -551,7 +551,7 @@
}
case STRING_LITERAL:
{
- l6 = (AST)_t;
+ l6 = _t;
match(_t,STRING_LITERAL);
_t = _t.getNextSibling();
@@ -576,7 +576,7 @@
AST nullLiteral_AST_in = (_t == ASTNULL) ? null : (AST)_t;
AST l = null;
- l = (AST)_t;
+ l = _t;
match(_t,LITERAL_NULL);
_t = _t.getNextSibling();
@@ -593,7 +593,7 @@
AST thisExpression_AST_in = (_t == ASTNULL) ? null : (AST)_t;
AST l = null;
- l = (AST)_t;
+ l = _t;
match(_t,LITERAL_THIS);
_t = _t.getNextSibling();
@@ -1051,7 +1051,7 @@
AST nameExpression_AST_in = (_t == ASTNULL) ? null : (AST)_t;
AST expr = null;
- expr = (AST)_t;
+ expr = _t;
match(_t,NAME_EXPRESSION);
_t = _t.getNextSibling();
@@ -1072,7 +1072,7 @@
PostfixExpression trailingExpr = null;
AST __t42 = _t;
- AST tmp9_AST_in = (AST)_t;
+ AST tmp9_AST_in = _t;
match(_t,SEP_DOT);
_t = _t.getFirstChild();
baseExpr=expression(_t);
@@ -1119,7 +1119,7 @@
args = new ArrayList();
AST __t37 = _t;
- AST tmp10_AST_in = (AST)_t;
+ AST tmp10_AST_in = _t;
match(_t,ARG_LIST);
_t = _t.getFirstChild();
{
1.4.2.3 +25 -25 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java
Index: JDOQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- JDOQLLexer.java 16 Aug 2005 15:06:54 -0000 1.4.2.2
+++ JDOQLLexer.java 17 Aug 2005 13:54:28 -0000 1.4.2.3
@@ -210,7 +210,7 @@
}
else {
if (LA(1)==EOF_CHAR) {uponEOF();
_returnToken = makeToken(Token.EOF_TYPE);}
- else {throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ else {throw new
NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
}
if ( _returnToken==null ) continue tryAgain; //
found SKIP token
@@ -528,7 +528,7 @@
}
default:
{
- if ( _cnt24>=1 ) { break _loop24; } else {throw
new NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ if ( _cnt24>=1 ) { break _loop24; } else {throw
new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
}
_cnt24++;
@@ -563,7 +563,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -2345,7 +2345,7 @@
matchRange('\ufe76','\ufefc');
}
else {
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3031,13 +3031,13 @@
}
default:
{
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
}
else {
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
@@ -3065,7 +3065,7 @@
mESCAPE_SEQUENCE(false);
}
else {
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
@@ -3131,7 +3131,7 @@
}
default:
{
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3144,7 +3144,7 @@
mOCTAL_ESCAPE(false);
}
else {
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
@@ -3222,7 +3222,7 @@
}
default:
{
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new
NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
}
}
@@ -3234,7 +3234,7 @@
mHEX_DIGIT(false);
}
else {
- if ( _cnt40>=1 ) { break
_loop40; } else {throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());}
+ if ( _cnt40>=1 ) { break
_loop40; } else {throw new NoViableAltForCharException(LA(1), getFilename(),
getLine(), getColumn());}
}
_cnt40++;
@@ -3347,7 +3347,7 @@
}
}
else {
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new
NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
}
}
@@ -3369,7 +3369,7 @@
mDIGIT(false);
}
else {
- if ( _cnt53>=1 ) { break
_loop53; } else {throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());}
+ if ( _cnt53>=1 ) { break
_loop53; } else {throw new NoViableAltForCharException(LA(1), getFilename(),
getLine(), getColumn());}
}
_cnt53++;
@@ -3497,7 +3497,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3536,7 +3536,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3566,7 +3566,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3619,7 +3619,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3662,7 +3662,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3686,7 +3686,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -3698,7 +3698,7 @@
mDIGIT(false);
}
else {
- if ( _cnt86>=1 ) { break _loop86; } else {throw
new NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ if ( _cnt86>=1 ) { break _loop86; } else {throw
new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
_cnt86++;
@@ -3725,7 +3725,7 @@
match('u');
}
else {
- if ( _cnt72>=1 ) { break _loop72; } else {throw
new NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ if ( _cnt72>=1 ) { break _loop72; } else {throw
new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
_cnt72++;
@@ -3763,7 +3763,7 @@
else if ((_tokenSet_8.member(LA(1))) && (true))
{
}
else {
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new
NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
}
@@ -3771,7 +3771,7 @@
else if ((_tokenSet_8.member(LA(1))) && (true)) {
}
else {
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
@@ -3787,7 +3787,7 @@
else if ((_tokenSet_8.member(LA(1))) && (true)) {
}
else {
- throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
@@ -3795,7 +3795,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
1.5.2.3 +63 -63 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java
Index: JDOQLParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- JDOQLParser.java 16 Aug 2005 15:06:54 -0000 1.5.2.2
+++ JDOQLParser.java 17 Aug 2005 13:54:29 -0000 1.5.2.3
@@ -102,14 +102,14 @@
}
}
if ( inputState.guessing==0 ) {
- declareParameters_AST = (AST)currentAST.root;
- declareParameters_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(PARAMETERS,"PARAMETERS")).add(declareParameters_AST));
+ declareParameters_AST = currentAST.root;
+ declareParameters_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(PARAMETERS,"PARAMETERS")).add(declareParameters_AST));
currentAST.root = declareParameters_AST;
currentAST.child = declareParameters_AST!=null
&&declareParameters_AST.getFirstChild()!=null ?
declareParameters_AST.getFirstChild() :
declareParameters_AST;
currentAST.advanceChildToEnd();
}
- declareParameters_AST = (AST)currentAST.root;
+ declareParameters_AST = currentAST.root;
returnAST = declareParameters_AST;
}
@@ -124,14 +124,14 @@
identifier();
astFactory.addASTChild(currentAST, returnAST);
if ( inputState.guessing==0 ) {
- parameter_AST = (AST)currentAST.root;
- parameter_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(PARAMETER,"PARAMETER")).add(parameter_AST));
+ parameter_AST = currentAST.root;
+ parameter_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(PARAMETER,"PARAMETER")).add(parameter_AST));
currentAST.root = parameter_AST;
currentAST.child = parameter_AST!=null
&¶meter_AST.getFirstChild()!=null ?
parameter_AST.getFirstChild() : parameter_AST;
currentAST.advanceChildToEnd();
}
- parameter_AST = (AST)currentAST.root;
+ parameter_AST = currentAST.root;
returnAST = parameter_AST;
}
@@ -153,14 +153,14 @@
{
primitiveType();
astFactory.addASTChild(currentAST, returnAST);
- type_AST = (AST)currentAST.root;
+ type_AST = currentAST.root;
break;
}
case IDENTIFIER:
{
name();
astFactory.addASTChild(currentAST, returnAST);
- type_AST = (AST)currentAST.root;
+ type_AST = currentAST.root;
break;
}
default:
@@ -181,7 +181,7 @@
tmp3_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp3_AST);
match(IDENTIFIER);
- identifier_AST = (AST)currentAST.root;
+ identifier_AST = currentAST.root;
returnAST = identifier_AST;
}
@@ -225,14 +225,14 @@
}
}
if ( inputState.guessing==0 ) {
- declareVariables_AST = (AST)currentAST.root;
- declareVariables_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(VARIABLES,"VARIABLES")).add(declareVariables_AST));
+ declareVariables_AST = currentAST.root;
+ declareVariables_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(VARIABLES,"VARIABLES")).add(declareVariables_AST));
currentAST.root = declareVariables_AST;
currentAST.child = declareVariables_AST!=null
&&declareVariables_AST.getFirstChild()!=null ?
declareVariables_AST.getFirstChild() :
declareVariables_AST;
currentAST.advanceChildToEnd();
}
- declareVariables_AST = (AST)currentAST.root;
+ declareVariables_AST = currentAST.root;
returnAST = declareVariables_AST;
}
@@ -247,14 +247,14 @@
identifier();
astFactory.addASTChild(currentAST, returnAST);
if ( inputState.guessing==0 ) {
- variable_AST = (AST)currentAST.root;
- variable_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(VARIABLE,"VARIABLE")).add(variable_AST));
+ variable_AST = currentAST.root;
+ variable_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(VARIABLE,"VARIABLE")).add(variable_AST));
currentAST.root = variable_AST;
currentAST.child = variable_AST!=null
&&variable_AST.getFirstChild()!=null ?
variable_AST.getFirstChild() : variable_AST;
currentAST.advanceChildToEnd();
}
- variable_AST = (AST)currentAST.root;
+ variable_AST = currentAST.root;
returnAST = variable_AST;
}
@@ -298,14 +298,14 @@
}
}
if ( inputState.guessing==0 ) {
- declareImports_AST = (AST)currentAST.root;
- declareImports_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(IMPORTS,"IMPORTS")).add(declareImports_AST));
+ declareImports_AST = currentAST.root;
+ declareImports_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(IMPORTS,"IMPORTS")).add(declareImports_AST));
currentAST.root = declareImports_AST;
currentAST.child = declareImports_AST!=null
&&declareImports_AST.getFirstChild()!=null ?
declareImports_AST.getFirstChild() :
declareImports_AST;
currentAST.advanceChildToEnd();
}
- declareImports_AST = (AST)currentAST.root;
+ declareImports_AST = currentAST.root;
returnAST = declareImports_AST;
}
@@ -348,7 +348,7 @@
}
}
}
- importDeclaration_AST = (AST)currentAST.root;
+ importDeclaration_AST = currentAST.root;
returnAST = importDeclaration_AST;
}
@@ -371,9 +371,9 @@
dot_AST = astFactory.create(dot);
match(SEP_DOT);
identifier();
- i_AST = (AST)returnAST;
+ i_AST = returnAST;
if ( inputState.guessing==0 ) {
- name_AST = (AST)currentAST.root;
+ name_AST = currentAST.root;
name_AST.setText(name_AST.getText() + dot_AST.getText() + i_AST.getText());
@@ -386,10 +386,10 @@
} while (true);
}
if ( inputState.guessing==0 ) {
- name_AST = (AST)currentAST.root;
+ name_AST = currentAST.root;
name_AST.setType(NAME);
}
- name_AST = (AST)currentAST.root;
+ name_AST = currentAST.root;
returnAST = name_AST;
}
@@ -433,14 +433,14 @@
}
}
if ( inputState.guessing==0 ) {
- setOrdering_AST = (AST)currentAST.root;
- setOrdering_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(ORDERSPECS,"ORDERSPECS")).add(setOrdering_AST));
+ setOrdering_AST = currentAST.root;
+ setOrdering_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(ORDERSPECS,"ORDERSPECS")).add(setOrdering_AST));
currentAST.root = setOrdering_AST;
currentAST.child = setOrdering_AST!=null
&&setOrdering_AST.getFirstChild()!=null ?
setOrdering_AST.getFirstChild() :
setOrdering_AST;
currentAST.advanceChildToEnd();
}
- setOrdering_AST = (AST)currentAST.root;
+ setOrdering_AST = currentAST.root;
returnAST = setOrdering_AST;
}
@@ -477,14 +477,14 @@
}
}
if ( inputState.guessing==0 ) {
- orderSpecification_AST = (AST)currentAST.root;
- orderSpecification_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(ORDERSPEC,"ORDERSPEC")).add(orderSpecification_AST));
+ orderSpecification_AST = currentAST.root;
+ orderSpecification_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(ORDERSPEC,"ORDERSPEC")).add(orderSpecification_AST));
currentAST.root = orderSpecification_AST;
currentAST.child = orderSpecification_AST!=null
&&orderSpecification_AST.getFirstChild()!=null ?
orderSpecification_AST.getFirstChild() :
orderSpecification_AST;
currentAST.advanceChildToEnd();
}
- orderSpecification_AST = (AST)currentAST.root;
+ orderSpecification_AST = currentAST.root;
returnAST = orderSpecification_AST;
}
@@ -496,7 +496,7 @@
conditionalOrExpression();
astFactory.addASTChild(currentAST, returnAST);
- expression_AST = (AST)currentAST.root;
+ expression_AST = currentAST.root;
returnAST = expression_AST;
}
@@ -548,7 +548,7 @@
}
}
}
- primary_AST = (AST)currentAST.root;
+ primary_AST = currentAST.root;
returnAST = primary_AST;
}
@@ -565,7 +565,7 @@
tmp17_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp17_AST);
match(LITERAL_TRUE);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case LITERAL_FALSE:
@@ -574,7 +574,7 @@
tmp18_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp18_AST);
match(LITERAL_FALSE);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case LITERAL_NULL:
@@ -583,7 +583,7 @@
tmp19_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp19_AST);
match(LITERAL_NULL);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case INTEGER_LITERAL:
@@ -592,7 +592,7 @@
tmp20_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp20_AST);
match(INTEGER_LITERAL);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case FLOATING_POINT_LITERAL:
@@ -601,7 +601,7 @@
tmp21_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp21_AST);
match(FLOATING_POINT_LITERAL);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case CHARACTER_LITERAL:
@@ -610,7 +610,7 @@
tmp22_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp22_AST);
match(CHARACTER_LITERAL);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
case STRING_LITERAL:
@@ -619,7 +619,7 @@
tmp23_AST = astFactory.create(LT(1));
astFactory.addASTChild(currentAST, tmp23_AST);
match(STRING_LITERAL);
- literal_AST = (AST)currentAST.root;
+ literal_AST = currentAST.root;
break;
}
default:
@@ -651,7 +651,7 @@
astFactory.addASTChild(currentAST, returnAST);
match(SEP_CLOSING_PARENTHESIS);
if ( inputState.guessing==0 ) {
- directAccess_AST = (AST)currentAST.root;
+ directAccess_AST = currentAST.root;
directAccess_AST.setType(METHOD_INVOCATION);
}
break;
@@ -679,7 +679,7 @@
case OP_DIVIDE:
{
if ( inputState.guessing==0 ) {
- directAccess_AST = (AST)currentAST.root;
+ directAccess_AST = currentAST.root;
directAccess_AST.setType(NAME_EXPRESSION);
}
break;
@@ -690,7 +690,7 @@
}
}
}
- directAccess_AST = (AST)currentAST.root;
+ directAccess_AST = currentAST.root;
returnAST = directAccess_AST;
}
@@ -734,8 +734,8 @@
} while (true);
}
if ( inputState.guessing==0 ) {
- argList_AST = (AST)currentAST.root;
- argList_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(ARG_LIST,"ARG_LIST")).add(argList_AST));
+ argList_AST = currentAST.root;
+ argList_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(ARG_LIST,"ARG_LIST")).add(argList_AST));
currentAST.root = argList_AST;
currentAST.child = argList_AST!=null
&&argList_AST.getFirstChild()!=null ?
argList_AST.getFirstChild() :
argList_AST;
@@ -746,7 +746,7 @@
case SEP_CLOSING_PARENTHESIS:
{
if ( inputState.guessing==0 ) {
- argList_AST = (AST)currentAST.root;
+ argList_AST = currentAST.root;
argList_AST =
astFactory.create(ARG_LIST,"ARG_LIST");
currentAST.root = argList_AST;
currentAST.child = argList_AST!=null
&&argList_AST.getFirstChild()!=null ?
@@ -761,7 +761,7 @@
}
}
}
- argList_AST = (AST)currentAST.root;
+ argList_AST = currentAST.root;
returnAST = argList_AST;
}
@@ -790,7 +790,7 @@
} while (true);
}
- postfixExpression_AST = (AST)currentAST.root;
+ postfixExpression_AST = currentAST.root;
returnAST = postfixExpression_AST;
}
@@ -859,7 +859,7 @@
}
}
}
- unaryExpression_AST = (AST)currentAST.root;
+ unaryExpression_AST = currentAST.root;
returnAST = unaryExpression_AST;
}
@@ -924,7 +924,7 @@
}
}
}
- unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
+ unaryExpressionNotPlusMinus_AST = currentAST.root;
returnAST = unaryExpressionNotPlusMinus_AST;
}
@@ -941,14 +941,14 @@
unaryExpression();
astFactory.addASTChild(currentAST, returnAST);
if ( inputState.guessing==0 ) {
- castExpression_AST = (AST)currentAST.root;
- castExpression_AST = (AST)astFactory.make( (new
ASTArray(2)).add(astFactory.create(CAST,"CAST")).add(castExpression_AST));
+ castExpression_AST = currentAST.root;
+ castExpression_AST = astFactory.make( (new
ASTArray(2)).add(astFactory.create(CAST,"CAST")).add(castExpression_AST));
currentAST.root = castExpression_AST;
currentAST.child = castExpression_AST!=null
&&castExpression_AST.getFirstChild()!=null ?
castExpression_AST.getFirstChild() :
castExpression_AST;
currentAST.advanceChildToEnd();
}
- castExpression_AST = (AST)currentAST.root;
+ castExpression_AST = currentAST.root;
returnAST = castExpression_AST;
}
@@ -997,7 +997,7 @@
} while (true);
}
- multiplicativeExpression_AST = (AST)currentAST.root;
+ multiplicativeExpression_AST = currentAST.root;
returnAST = multiplicativeExpression_AST;
}
@@ -1046,7 +1046,7 @@
} while (true);
}
- additiveExpression_AST = (AST)currentAST.root;
+ additiveExpression_AST = currentAST.root;
returnAST = additiveExpression_AST;
}
@@ -1111,7 +1111,7 @@
} while (true);
}
- relationalExpression_AST = (AST)currentAST.root;
+ relationalExpression_AST = currentAST.root;
returnAST = relationalExpression_AST;
}
@@ -1160,7 +1160,7 @@
} while (true);
}
- equalityExpression_AST = (AST)currentAST.root;
+ equalityExpression_AST = currentAST.root;
returnAST = equalityExpression_AST;
}
@@ -1189,7 +1189,7 @@
} while (true);
}
- andExpression_AST = (AST)currentAST.root;
+ andExpression_AST = currentAST.root;
returnAST = andExpression_AST;
}
@@ -1218,7 +1218,7 @@
} while (true);
}
- exclusiveOrExpression_AST = (AST)currentAST.root;
+ exclusiveOrExpression_AST = currentAST.root;
returnAST = exclusiveOrExpression_AST;
}
@@ -1247,7 +1247,7 @@
} while (true);
}
- inclusiveOrExpression_AST = (AST)currentAST.root;
+ inclusiveOrExpression_AST = currentAST.root;
returnAST = inclusiveOrExpression_AST;
}
@@ -1276,7 +1276,7 @@
} while (true);
}
- conditionalAndExpression_AST = (AST)currentAST.root;
+ conditionalAndExpression_AST = currentAST.root;
returnAST = conditionalAndExpression_AST;
}
@@ -1305,7 +1305,7 @@
} while (true);
}
- conditionalOrExpression_AST = (AST)currentAST.root;
+ conditionalOrExpression_AST = currentAST.root;
returnAST = conditionalOrExpression_AST;
}
@@ -1317,7 +1317,7 @@
expression();
astFactory.addASTChild(currentAST, returnAST);
- dummyExpressionUsage_AST = (AST)currentAST.root;
+ dummyExpressionUsage_AST = currentAST.root;
returnAST = dummyExpressionUsage_AST;
}
@@ -1400,10 +1400,10 @@
}
}
if ( inputState.guessing==0 ) {
- primitiveType_AST = (AST)currentAST.root;
+ primitiveType_AST = currentAST.root;
primitiveType_AST.setType(PRIMITIVE_TYPE);
}
- primitiveType_AST = (AST)currentAST.root;
+ primitiveType_AST = currentAST.root;
returnAST = primitiveType_AST;
}
No revision
No revision
1.19.2.3 +10 -10 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
Index: OQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -r1.19.2.2 -r1.19.2.3
--- OQLLexer.java 16 Aug 2005 15:06:55 -0000 1.19.2.2
+++ OQLLexer.java 17 Aug 2005 13:54:35 -0000 1.19.2.3
@@ -266,7 +266,7 @@
}
else {
if (LA(1)==EOF_CHAR) {uponEOF();
_returnToken = makeToken(Token.EOF_TYPE);}
- else {throw new
NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ else {throw new
NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
}
if ( _returnToken==null ) continue tryAgain; //
found SKIP token
@@ -633,7 +633,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -678,7 +678,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -754,7 +754,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
@@ -766,7 +766,7 @@
matchRange('0','9');
}
else {
- if ( _cnt34>=1 ) { break _loop34; } else {throw
new NoViableAltForCharException((char)LA(1), getFilename(), getLine(),
getColumn());}
+ if ( _cnt34>=1 ) { break _loop34; } else {throw
new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
}
_cnt34++;
@@ -796,7 +796,7 @@
mTOK_UNSIGNED_INTEGER(false);
}
else {
- if ( _cnt37>=1 ) { break _loop37; }
else {throw new NoViableAltForCharException((char)LA(1), getFilename(),
getLine(), getColumn());}
+ if ( _cnt37>=1 ) { break _loop37; }
else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(),
getColumn());}
}
_cnt37++;
@@ -826,7 +826,7 @@
mTOK_UNSIGNED_INTEGER(false);
}
else {
- if ( _cnt40>=1 ) { break _loop40; }
else {throw new NoViableAltForCharException((char)LA(1), getFilename(),
getLine(), getColumn());}
+ if ( _cnt40>=1 ) { break _loop40; }
else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(),
getColumn());}
}
_cnt40++;
@@ -877,7 +877,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
@@ -993,7 +993,7 @@
}
default:
{
- throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
+ throw new NoViableAltForCharException(LA(1),
getFilename(), getLine(), getColumn());
}
}
}
No revision
No revision
1.1.2.1 +47 -0 db-ojb/.settings/Attic/org.eclipse.jdt.core.prefs
No revision
No revision
1.2.2.2 +3 -3
db-ojb/src/test/org/apache/ojb/broker/MultipleTableExtentAwareQueryTest.java
Index: MultipleTableExtentAwareQueryTest.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/test/org/apache/ojb/broker/MultipleTableExtentAwareQueryTest.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- MultipleTableExtentAwareQueryTest.java 16 Aug 2005 15:04:39 -0000
1.2.2.1
+++ MultipleTableExtentAwareQueryTest.java 17 Aug 2005 13:54:37 -0000
1.2.2.2
@@ -132,7 +132,7 @@
int counterB = 0;
for (Iterator iterator = result.iterator(); iterator.hasNext();)
{
- ExtentC obj = (ExtentC) iterator.next();
+ Object obj = (ExtentC) iterator.next();
if(obj instanceof ExtentB) ++counterB;
}
@@ -145,7 +145,7 @@
int counterC = 0;
for (Iterator iterator = result.iterator(); iterator.hasNext();)
{
- ExtentB obj = (ExtentB) iterator.next();
+ Object obj = iterator.next();
if(obj instanceof ExtentB) ++counterB;
if(obj instanceof ExtentC) ++counterC;
}
No revision
No revision
1.17.2.2 +1 -2
db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNextValImpl.java
Index: SequenceManagerNextValImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNextValImpl.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -r1.17.2.1 -r1.17.2.2
--- SequenceManagerNextValImpl.java 16 Aug 2005 20:11:19 -0000 1.17.2.1
+++ SequenceManagerNextValImpl.java 17 Aug 2005 13:54:37 -0000 1.17.2.2
@@ -17,7 +17,6 @@
import java.sql.ResultSet;
import java.sql.Statement;
-import java.util.Properties;
import org.apache.commons.lang.SystemUtils;
import org.apache.ojb.broker.PersistenceBroker;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
