Mercurial > hg > icedtea8-forest > langtools
changeset 1076:18002d039806
7058174: Reduce langtools build warnings
Reviewed-by: jjg
Contributed-by: alexandre.boulgakov@oracle.com
author | jjg |
---|---|
date | Thu, 23 Jun 2011 11:49:27 -0700 |
parents | 4844a9fd3a62 |
children | 9eb36cac6b64 |
files | make/build.xml make/tools/CompileProperties/CompileProperties.java |
diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/build.xml Wed Jun 22 17:07:02 2011 -0700 +++ b/make/build.xml Thu Jun 23 11:49:27 2011 -0700 @@ -336,7 +336,9 @@ classpath="${dist.lib.dir}/javac.jar" includeAntRuntime="no" debug="${javac.debug}" - debuglevel="${javac.debuglevel}"/> + debuglevel="${javac.debuglevel}"> + <compilerarg line="${javac.lint.opts}"/> + </javac> <java fork="true" jvm="${target.java.home}/bin/java" dir="test/tools/javac/diags" @@ -857,7 +859,10 @@ srcdir="${make.tools.dir}/CompileProperties" destdir="${build.toolclasses.dir}/" classpath="${ant.core.lib}" - includeantruntime="false"/> + bootclasspath="${boot.java.home}/jre/lib/rt.jar" + includeantruntime="false"> + <compilerarg line="${javac.lint.opts}"/> + </javac> <taskdef name="pcompile" classname="CompilePropertiesTask" classpath="${build.toolclasses.dir}/"/> @@ -874,6 +879,7 @@ classpath="${ant.core.lib}" includeantruntime="false"> <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> + <compilerarg line="${javac.lint.opts}"/> </javac> <taskdef name="genstubs" classname="GenStubs$$Ant"
--- a/make/tools/CompileProperties/CompileProperties.java Wed Jun 22 17:07:02 2011 -0700 +++ b/make/tools/CompileProperties/CompileProperties.java Thu Jun 23 11:49:27 2011 -0700 @@ -222,13 +222,13 @@ sortedKeys.add((String)key); } Collections.sort(sortedKeys); - Iterator keys = sortedKeys.iterator(); + Iterator<String> keys = sortedKeys.iterator(); StringBuffer data = new StringBuffer(); while (keys.hasNext()) { - Object key = keys.next(); - data.append(" { \"" + escape((String)key) + "\", \"" + + String key = keys.next(); + data.append(" { \"" + escape(key) + "\", \"" + escape((String)p.get(key)) + "\" },\n"); }