Tue, 11 Aug 2009 01:13:14 +0100
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
Summary: javac should warn/complain about identifiers with the same name as synthetic symbol
Reviewed-by: jjg
duke@1 | 1 | /* |
xdono@229 | 2 | * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. Sun designates this |
duke@1 | 8 | * particular file as subject to the "Classpath" exception as provided |
duke@1 | 9 | * by Sun in the LICENSE file that accompanied this code. |
duke@1 | 10 | * |
duke@1 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | * accompanied this code). |
duke@1 | 16 | * |
duke@1 | 17 | * You should have received a copy of the GNU General Public License version |
duke@1 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | * |
duke@1 | 21 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 22 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 23 | * have any questions. |
duke@1 | 24 | */ |
duke@1 | 25 | |
duke@1 | 26 | package com.sun.tools.javadoc; |
duke@1 | 27 | |
duke@1 | 28 | import java.io.PrintWriter; |
duke@1 | 29 | import java.text.MessageFormat; |
duke@1 | 30 | import java.util.ResourceBundle; |
duke@1 | 31 | import java.util.MissingResourceException; |
duke@1 | 32 | |
duke@1 | 33 | import com.sun.javadoc.*; |
duke@1 | 34 | |
duke@1 | 35 | import com.sun.tools.javac.util.Context; |
duke@1 | 36 | |
duke@1 | 37 | import com.sun.tools.javac.util.Log; // Access to 'javac' output streams |
duke@1 | 38 | |
duke@1 | 39 | /** |
duke@1 | 40 | * Utility for integrating with javadoc tools and for localization. |
duke@1 | 41 | * Handle Resources. Access to error and warning counts. |
duke@1 | 42 | * Message formatting. |
duke@1 | 43 | * <br> |
duke@1 | 44 | * Also provides implementation for DocErrorReporter. |
duke@1 | 45 | * |
duke@1 | 46 | * @see java.util.ResourceBundle |
duke@1 | 47 | * @see java.text.MessageFormat |
duke@1 | 48 | * @author Neal Gafter (rewrite) |
duke@1 | 49 | */ |
duke@1 | 50 | public class Messager extends Log implements DocErrorReporter { |
duke@1 | 51 | |
duke@1 | 52 | /** Get the current messager, which is also the compiler log. */ |
duke@1 | 53 | public static Messager instance0(Context context) { |
duke@1 | 54 | Log instance = context.get(logKey); |
duke@1 | 55 | if (instance == null || !(instance instanceof Messager)) |
duke@1 | 56 | throw new InternalError("no messager instance!"); |
duke@1 | 57 | return (Messager)instance; |
duke@1 | 58 | } |
duke@1 | 59 | |
duke@1 | 60 | public static void preRegister(final Context context, |
duke@1 | 61 | final String programName) { |
duke@1 | 62 | context.put(logKey, new Context.Factory<Log>() { |
duke@1 | 63 | public Log make() { |
duke@1 | 64 | return new Messager(context, |
duke@1 | 65 | programName); |
duke@1 | 66 | } |
duke@1 | 67 | }); |
duke@1 | 68 | } |
duke@1 | 69 | public static void preRegister(final Context context, |
duke@1 | 70 | final String programName, |
duke@1 | 71 | final PrintWriter errWriter, |
duke@1 | 72 | final PrintWriter warnWriter, |
duke@1 | 73 | final PrintWriter noticeWriter) { |
duke@1 | 74 | context.put(logKey, new Context.Factory<Log>() { |
duke@1 | 75 | public Log make() { |
duke@1 | 76 | return new Messager(context, |
duke@1 | 77 | programName, |
duke@1 | 78 | errWriter, |
duke@1 | 79 | warnWriter, |
duke@1 | 80 | noticeWriter); |
duke@1 | 81 | } |
duke@1 | 82 | }); |
duke@1 | 83 | } |
duke@1 | 84 | |
duke@1 | 85 | public class ExitJavadoc extends Error { |
duke@1 | 86 | private static final long serialVersionUID = 0; |
duke@1 | 87 | } |
duke@1 | 88 | |
duke@1 | 89 | private final String programName; |
duke@1 | 90 | |
duke@1 | 91 | private ResourceBundle messageRB = null; |
duke@1 | 92 | |
duke@1 | 93 | /** The default writer for diagnostics |
duke@1 | 94 | */ |
duke@1 | 95 | static final PrintWriter defaultErrWriter = new PrintWriter(System.err); |
duke@1 | 96 | static final PrintWriter defaultWarnWriter = new PrintWriter(System.err); |
duke@1 | 97 | static final PrintWriter defaultNoticeWriter = new PrintWriter(System.out); |
duke@1 | 98 | |
duke@1 | 99 | /** |
duke@1 | 100 | * Constructor |
duke@1 | 101 | * @param programName Name of the program (for error messages). |
duke@1 | 102 | */ |
duke@1 | 103 | protected Messager(Context context, String programName) { |
duke@1 | 104 | this(context, programName, defaultErrWriter, defaultWarnWriter, defaultNoticeWriter); |
duke@1 | 105 | } |
duke@1 | 106 | |
duke@1 | 107 | /** |
duke@1 | 108 | * Constructor |
duke@1 | 109 | * @param programName Name of the program (for error messages). |
duke@1 | 110 | * @param errWriter Stream for error messages |
duke@1 | 111 | * @param warnWriter Stream for warnings |
duke@1 | 112 | * @param noticeWriter Stream for other messages |
duke@1 | 113 | */ |
jjg@198 | 114 | @SuppressWarnings("deprecation") |
duke@1 | 115 | protected Messager(Context context, |
duke@1 | 116 | String programName, |
duke@1 | 117 | PrintWriter errWriter, |
duke@1 | 118 | PrintWriter warnWriter, |
duke@1 | 119 | PrintWriter noticeWriter) { |
duke@1 | 120 | super(context, errWriter, warnWriter, noticeWriter); |
duke@1 | 121 | this.programName = programName; |
duke@1 | 122 | } |
duke@1 | 123 | |
duke@1 | 124 | /** |
duke@1 | 125 | * Reset resource bundle, eg. locale has changed. |
duke@1 | 126 | */ |
duke@1 | 127 | public void reset() { |
duke@1 | 128 | messageRB = null; |
duke@1 | 129 | } |
duke@1 | 130 | |
duke@1 | 131 | /** |
duke@1 | 132 | * Get string from ResourceBundle, initialize ResourceBundle |
duke@1 | 133 | * if needed. |
duke@1 | 134 | */ |
duke@1 | 135 | private String getString(String key) { |
duke@1 | 136 | ResourceBundle messageRB = this.messageRB; |
duke@1 | 137 | if (messageRB == null) { |
duke@1 | 138 | try { |
duke@1 | 139 | this.messageRB = messageRB = |
duke@1 | 140 | ResourceBundle.getBundle( |
duke@1 | 141 | "com.sun.tools.javadoc.resources.javadoc"); |
duke@1 | 142 | } catch (MissingResourceException e) { |
duke@1 | 143 | throw new Error("Fatal: Resource for javadoc is missing"); |
duke@1 | 144 | } |
duke@1 | 145 | } |
duke@1 | 146 | return messageRB.getString(key); |
duke@1 | 147 | } |
duke@1 | 148 | |
duke@1 | 149 | /** |
duke@1 | 150 | * get and format message string from resource |
duke@1 | 151 | * |
duke@1 | 152 | * @param key selects message from resource |
duke@1 | 153 | */ |
duke@1 | 154 | String getText(String key) { |
duke@1 | 155 | return getText(key, (String)null); |
duke@1 | 156 | } |
duke@1 | 157 | |
duke@1 | 158 | /** |
duke@1 | 159 | * get and format message string from resource |
duke@1 | 160 | * |
duke@1 | 161 | * @param key selects message from resource |
duke@1 | 162 | * @param a1 first argument |
duke@1 | 163 | */ |
duke@1 | 164 | String getText(String key, String a1) { |
duke@1 | 165 | return getText(key, a1, null); |
duke@1 | 166 | } |
duke@1 | 167 | |
duke@1 | 168 | /** |
duke@1 | 169 | * get and format message string from resource |
duke@1 | 170 | * |
duke@1 | 171 | * @param key selects message from resource |
duke@1 | 172 | * @param a1 first argument |
duke@1 | 173 | * @param a2 second argument |
duke@1 | 174 | */ |
duke@1 | 175 | String getText(String key, String a1, String a2) { |
duke@1 | 176 | return getText(key, a1, a2, null); |
duke@1 | 177 | } |
duke@1 | 178 | |
duke@1 | 179 | /** |
duke@1 | 180 | * get and format message string from resource |
duke@1 | 181 | * |
duke@1 | 182 | * @param key selects message from resource |
duke@1 | 183 | * @param a1 first argument |
duke@1 | 184 | * @param a2 second argument |
duke@1 | 185 | * @param a3 third argument |
duke@1 | 186 | */ |
duke@1 | 187 | String getText(String key, String a1, String a2, String a3) { |
duke@1 | 188 | return getText(key, a1, a2, a3, null); |
duke@1 | 189 | } |
duke@1 | 190 | |
duke@1 | 191 | /** |
duke@1 | 192 | * get and format message string from resource |
duke@1 | 193 | * |
duke@1 | 194 | * @param key selects message from resource |
duke@1 | 195 | * @param a1 first argument |
duke@1 | 196 | * @param a2 second argument |
duke@1 | 197 | * @param a3 third argument |
duke@1 | 198 | * @param a4 fourth argument |
duke@1 | 199 | */ |
duke@1 | 200 | String getText(String key, String a1, String a2, String a3, |
duke@1 | 201 | String a4) { |
duke@1 | 202 | try { |
duke@1 | 203 | String message = getString(key); |
duke@1 | 204 | String[] args = new String[4]; |
duke@1 | 205 | args[0] = a1; |
duke@1 | 206 | args[1] = a2; |
duke@1 | 207 | args[2] = a3; |
duke@1 | 208 | args[3] = a4; |
duke@1 | 209 | return MessageFormat.format(message, (Object[])args); |
duke@1 | 210 | } catch (MissingResourceException e) { |
duke@1 | 211 | return "********** Resource for javadoc is broken. There is no " + |
duke@1 | 212 | key + " key in resource."; |
duke@1 | 213 | } |
duke@1 | 214 | } |
duke@1 | 215 | |
duke@1 | 216 | /** |
duke@1 | 217 | * Print error message, increment error count. |
duke@1 | 218 | * Part of DocErrorReporter. |
duke@1 | 219 | * |
duke@1 | 220 | * @param msg message to print |
duke@1 | 221 | */ |
duke@1 | 222 | public void printError(String msg) { |
duke@1 | 223 | printError(null, msg); |
duke@1 | 224 | } |
duke@1 | 225 | |
duke@1 | 226 | /** |
duke@1 | 227 | * Print error message, increment error count. |
duke@1 | 228 | * Part of DocErrorReporter. |
duke@1 | 229 | * |
duke@1 | 230 | * @param pos the position where the error occurs |
duke@1 | 231 | * @param msg message to print |
duke@1 | 232 | */ |
duke@1 | 233 | public void printError(SourcePosition pos, String msg) { |
duke@1 | 234 | String prefix = (pos == null) ? programName : pos.toString(); |
duke@1 | 235 | errWriter.println(prefix + ": " + getText("javadoc.error") + " - " + msg); |
duke@1 | 236 | errWriter.flush(); |
duke@1 | 237 | prompt(); |
duke@1 | 238 | nerrors++; |
duke@1 | 239 | } |
duke@1 | 240 | |
duke@1 | 241 | /** |
duke@1 | 242 | * Print warning message, increment warning count. |
duke@1 | 243 | * Part of DocErrorReporter. |
duke@1 | 244 | * |
duke@1 | 245 | * @param msg message to print |
duke@1 | 246 | */ |
duke@1 | 247 | public void printWarning(String msg) { |
duke@1 | 248 | printWarning(null, msg); |
duke@1 | 249 | } |
duke@1 | 250 | |
duke@1 | 251 | /** |
duke@1 | 252 | * Print warning message, increment warning count. |
duke@1 | 253 | * Part of DocErrorReporter. |
duke@1 | 254 | * |
duke@1 | 255 | * @param pos the position where the error occurs |
duke@1 | 256 | * @param msg message to print |
duke@1 | 257 | */ |
duke@1 | 258 | public void printWarning(SourcePosition pos, String msg) { |
duke@1 | 259 | String prefix = (pos == null) ? programName : pos.toString(); |
duke@1 | 260 | warnWriter.println(prefix + ": " + getText("javadoc.warning") +" - " + msg); |
duke@1 | 261 | warnWriter.flush(); |
duke@1 | 262 | nwarnings++; |
duke@1 | 263 | } |
duke@1 | 264 | |
duke@1 | 265 | /** |
duke@1 | 266 | * Print a message. |
duke@1 | 267 | * Part of DocErrorReporter. |
duke@1 | 268 | * |
duke@1 | 269 | * @param msg message to print |
duke@1 | 270 | */ |
duke@1 | 271 | public void printNotice(String msg) { |
duke@1 | 272 | printNotice(null, msg); |
duke@1 | 273 | } |
duke@1 | 274 | |
duke@1 | 275 | /** |
duke@1 | 276 | * Print a message. |
duke@1 | 277 | * Part of DocErrorReporter. |
duke@1 | 278 | * |
duke@1 | 279 | * @param pos the position where the error occurs |
duke@1 | 280 | * @param msg message to print |
duke@1 | 281 | */ |
duke@1 | 282 | public void printNotice(SourcePosition pos, String msg) { |
duke@1 | 283 | if (pos == null) |
duke@1 | 284 | noticeWriter.println(msg); |
duke@1 | 285 | else |
duke@1 | 286 | noticeWriter.println(pos + ": " + msg); |
duke@1 | 287 | noticeWriter.flush(); |
duke@1 | 288 | } |
duke@1 | 289 | |
duke@1 | 290 | /** |
duke@1 | 291 | * Print error message, increment error count. |
duke@1 | 292 | * |
duke@1 | 293 | * @param key selects message from resource |
duke@1 | 294 | */ |
duke@1 | 295 | public void error(SourcePosition pos, String key) { |
duke@1 | 296 | printError(pos, getText(key)); |
duke@1 | 297 | } |
duke@1 | 298 | |
duke@1 | 299 | /** |
duke@1 | 300 | * Print error message, increment error count. |
duke@1 | 301 | * |
duke@1 | 302 | * @param key selects message from resource |
duke@1 | 303 | * @param a1 first argument |
duke@1 | 304 | */ |
duke@1 | 305 | public void error(SourcePosition pos, String key, String a1) { |
duke@1 | 306 | printError(pos, getText(key, a1)); |
duke@1 | 307 | } |
duke@1 | 308 | |
duke@1 | 309 | /** |
duke@1 | 310 | * Print error message, increment error count. |
duke@1 | 311 | * |
duke@1 | 312 | * @param key selects message from resource |
duke@1 | 313 | * @param a1 first argument |
duke@1 | 314 | * @param a2 second argument |
duke@1 | 315 | */ |
duke@1 | 316 | public void error(SourcePosition pos, String key, String a1, String a2) { |
duke@1 | 317 | printError(pos, getText(key, a1, a2)); |
duke@1 | 318 | } |
duke@1 | 319 | |
duke@1 | 320 | /** |
duke@1 | 321 | * Print error message, increment error count. |
duke@1 | 322 | * |
duke@1 | 323 | * @param key selects message from resource |
duke@1 | 324 | * @param a1 first argument |
duke@1 | 325 | * @param a2 second argument |
duke@1 | 326 | * @param a3 third argument |
duke@1 | 327 | */ |
duke@1 | 328 | public void error(SourcePosition pos, String key, String a1, String a2, String a3) { |
duke@1 | 329 | printError(pos, getText(key, a1, a2, a3)); |
duke@1 | 330 | } |
duke@1 | 331 | |
duke@1 | 332 | /** |
duke@1 | 333 | * Print warning message, increment warning count. |
duke@1 | 334 | * |
duke@1 | 335 | * @param key selects message from resource |
duke@1 | 336 | */ |
duke@1 | 337 | public void warning(SourcePosition pos, String key) { |
duke@1 | 338 | printWarning(pos, getText(key)); |
duke@1 | 339 | } |
duke@1 | 340 | |
duke@1 | 341 | /** |
duke@1 | 342 | * Print warning message, increment warning count. |
duke@1 | 343 | * |
duke@1 | 344 | * @param key selects message from resource |
duke@1 | 345 | * @param a1 first argument |
duke@1 | 346 | */ |
duke@1 | 347 | public void warning(SourcePosition pos, String key, String a1) { |
duke@1 | 348 | printWarning(pos, getText(key, a1)); |
duke@1 | 349 | } |
duke@1 | 350 | |
duke@1 | 351 | /** |
duke@1 | 352 | * Print warning message, increment warning count. |
duke@1 | 353 | * |
duke@1 | 354 | * @param key selects message from resource |
duke@1 | 355 | * @param a1 first argument |
duke@1 | 356 | * @param a2 second argument |
duke@1 | 357 | */ |
duke@1 | 358 | public void warning(SourcePosition pos, String key, String a1, String a2) { |
duke@1 | 359 | printWarning(pos, getText(key, a1, a2)); |
duke@1 | 360 | } |
duke@1 | 361 | |
duke@1 | 362 | /** |
duke@1 | 363 | * Print warning message, increment warning count. |
duke@1 | 364 | * |
duke@1 | 365 | * @param key selects message from resource |
duke@1 | 366 | * @param a1 first argument |
duke@1 | 367 | * @param a2 second argument |
duke@1 | 368 | * @param a3 third argument |
duke@1 | 369 | */ |
duke@1 | 370 | public void warning(SourcePosition pos, String key, String a1, String a2, String a3) { |
duke@1 | 371 | printWarning(pos, getText(key, a1, a2, a3)); |
duke@1 | 372 | } |
duke@1 | 373 | |
duke@1 | 374 | /** |
duke@1 | 375 | * Print warning message, increment warning count. |
duke@1 | 376 | * |
duke@1 | 377 | * @param key selects message from resource |
duke@1 | 378 | * @param a1 first argument |
duke@1 | 379 | * @param a2 second argument |
duke@1 | 380 | * @param a3 third argument |
duke@1 | 381 | */ |
duke@1 | 382 | public void warning(SourcePosition pos, String key, String a1, String a2, String a3, |
duke@1 | 383 | String a4) { |
duke@1 | 384 | printWarning(pos, getText(key, a1, a2, a3, a4)); |
duke@1 | 385 | } |
duke@1 | 386 | |
duke@1 | 387 | /** |
duke@1 | 388 | * Print a message. |
duke@1 | 389 | * |
duke@1 | 390 | * @param key selects message from resource |
duke@1 | 391 | */ |
duke@1 | 392 | public void notice(String key) { |
duke@1 | 393 | printNotice(getText(key)); |
duke@1 | 394 | } |
duke@1 | 395 | |
duke@1 | 396 | /** |
duke@1 | 397 | * Print a message. |
duke@1 | 398 | * |
duke@1 | 399 | * @param key selects message from resource |
duke@1 | 400 | * @param a1 first argument |
duke@1 | 401 | */ |
duke@1 | 402 | public void notice(String key, String a1) { |
duke@1 | 403 | printNotice(getText(key, a1)); |
duke@1 | 404 | } |
duke@1 | 405 | |
duke@1 | 406 | /** |
duke@1 | 407 | * Print a message. |
duke@1 | 408 | * |
duke@1 | 409 | * @param key selects message from resource |
duke@1 | 410 | * @param a1 first argument |
duke@1 | 411 | * @param a2 second argument |
duke@1 | 412 | */ |
duke@1 | 413 | public void notice(String key, String a1, String a2) { |
duke@1 | 414 | printNotice(getText(key, a1, a2)); |
duke@1 | 415 | } |
duke@1 | 416 | |
duke@1 | 417 | /** |
duke@1 | 418 | * Print a message. |
duke@1 | 419 | * |
duke@1 | 420 | * @param key selects message from resource |
duke@1 | 421 | * @param a1 first argument |
duke@1 | 422 | * @param a2 second argument |
duke@1 | 423 | * @param a3 third argument |
duke@1 | 424 | */ |
duke@1 | 425 | public void notice(String key, String a1, String a2, String a3) { |
duke@1 | 426 | printNotice(getText(key, a1, a2, a3)); |
duke@1 | 427 | } |
duke@1 | 428 | |
duke@1 | 429 | /** |
duke@1 | 430 | * Return total number of errors, including those recorded |
duke@1 | 431 | * in the compilation log. |
duke@1 | 432 | */ |
duke@1 | 433 | public int nerrors() { return nerrors; } |
duke@1 | 434 | |
duke@1 | 435 | /** |
duke@1 | 436 | * Return total number of warnings, including those recorded |
duke@1 | 437 | * in the compilation log. |
duke@1 | 438 | */ |
duke@1 | 439 | public int nwarnings() { return nwarnings; } |
duke@1 | 440 | |
duke@1 | 441 | /** |
duke@1 | 442 | * Print exit message. |
duke@1 | 443 | */ |
duke@1 | 444 | public void exitNotice() { |
duke@1 | 445 | int nerrors = nerrors(); |
duke@1 | 446 | int nwarnings = nwarnings(); |
duke@1 | 447 | if (nerrors > 0) { |
duke@1 | 448 | notice((nerrors > 1) ? "main.errors" : "main.error", |
duke@1 | 449 | "" + nerrors); |
duke@1 | 450 | } |
duke@1 | 451 | if (nwarnings > 0) { |
duke@1 | 452 | notice((nwarnings > 1) ? "main.warnings" : "main.warning", |
duke@1 | 453 | "" + nwarnings); |
duke@1 | 454 | } |
duke@1 | 455 | } |
duke@1 | 456 | |
duke@1 | 457 | /** |
duke@1 | 458 | * Force program exit, e.g., from a fatal error. |
duke@1 | 459 | * <p> |
duke@1 | 460 | * TODO: This method does not really belong here. |
duke@1 | 461 | */ |
duke@1 | 462 | public void exit() { |
duke@1 | 463 | throw new ExitJavadoc(); |
duke@1 | 464 | } |
duke@1 | 465 | |
duke@1 | 466 | } |