svn commit: r1486039 - in /db/derby/code/trunk: build.xml java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj java/tools/org/apache/derby/impl/tools/ij/ij.jj java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj

[ka...@apache.org]

Author: kahatlen
Date: Fri May 24 12:53:13 2013
New Revision: 1486039

URL: http://svn.apache.org/r1486039
Log:
DERBY-5840: Clean up compiler warnings introduced by using Java 5 language features

Tell JavaCC to generate Java 5 code for the parsers. This change
silences the warnings previously seen when compiling the parsers, so
it also removes the build target that post-processes the parsers and
inserts @SuppressWarnings annotations.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1486039&r1=1486038&r2=1486039&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri May 24 12:53:13 2013
@@ -787,26 +787,6 @@
     <!-- IBM JDK 1.3.1. See DERBY-1078                                 -->
     <replaceregexp file="${generated.src.dir}/${directory}/${chkfile}" match="tokenImage" 
                    replace="${constantsfile}.tokenImage"/>
-
-    <antcall  target="postProcessParser"/>
-
-  </target>
-
-  <target name="postProcessParser" unless="parser.done">
-
-    <!-- Suppress some warnings so the grammar will compile cleanly on Java 6. -->
-    <replaceregexp match="private void jj_add_error_token" replace="@SuppressWarnings(&quot;unchecked&quot;) private void jj_add_error_token" flags="m">
-      <fileset dir="${generated.src.dir}/${directory}">
-        <include name="${chkfile}"/>
-      </fileset>
-    </replaceregexp>
-
-    <replaceregexp match="public ParseException generateParseException" replace="@SuppressWarnings(&quot;unchecked&quot;) public ParseException generateParseException" flags="m">
-      <fileset dir="${generated.src.dir}/${directory}">
-        <include name="${chkfile}"/>
-      </fileset>
-    </replaceregexp>
-
   </target>
 
   <target name="chkparser">

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1486039&r1=1486038&r2=1486039&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Fri May 24 12:53:13 2013
@@ -11,6 +11,7 @@ options
 	COMMON_TOKEN_ACTION = true;
 	CACHE_TOKENS = true;
 	UNICODE_INPUT = true;
+    JDK_VERSION = "1.5";
 }
 
 PARSER_BEGIN(SQLParser)

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=1486039&r1=1486038&r2=1486039&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Fri May 24 12:53:13 2013
@@ -28,6 +28,7 @@ options {
 	UNICODE_INPUT = true;
 	IGNORE_CASE = true;
 	CACHE_TOKENS = true;
+    JDK_VERSION = "1.5";
 }
 
 PARSER_BEGIN(ij)

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj?rev=1486039&r1=1486038&r2=1486039&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj Fri May 24 12:53:13 2013
@@ -27,6 +27,7 @@ options {
 	IGNORE_CASE = true;
 	CACHE_TOKENS = true;
 	LOOKAHEAD = 1;
+    JDK_VERSION = "1.5";
 }
 
 PARSER_BEGIN(mtGrammar)