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 2001-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 | |
jjg@197 | 28 | import java.io.File; |
jjg@197 | 29 | import javax.tools.FileObject; |
jjg@197 | 30 | |
duke@1 | 31 | import com.sun.javadoc.SourcePosition; |
duke@1 | 32 | import com.sun.tools.javac.util.Position; |
duke@1 | 33 | |
duke@1 | 34 | /** |
duke@1 | 35 | * A source position: filename, line number, and column number. |
duke@1 | 36 | * |
duke@1 | 37 | * @since J2SE1.4 |
duke@1 | 38 | * @author Neal M Gafter |
duke@1 | 39 | * @author Michael Van De Vanter (position representation changed to char offsets) |
duke@1 | 40 | */ |
jjg@197 | 41 | public class SourcePositionImpl implements SourcePosition { |
jjg@197 | 42 | FileObject filename; |
duke@1 | 43 | int position; |
duke@1 | 44 | Position.LineMap lineMap; |
duke@1 | 45 | |
duke@1 | 46 | /** The source file. Returns null if no file information is |
duke@1 | 47 | * available. */ |
duke@1 | 48 | public File file() { |
jjg@197 | 49 | return (filename == null) ? null : new File(filename.getName()); |
jjg@197 | 50 | } |
jjg@197 | 51 | |
jjg@197 | 52 | /** The source file. Returns null if no file information is |
jjg@197 | 53 | * available. */ |
jjg@197 | 54 | public FileObject fileObject() { |
jjg@197 | 55 | return filename; |
duke@1 | 56 | } |
duke@1 | 57 | |
duke@1 | 58 | /** The line in the source file. The first line is numbered 1; |
duke@1 | 59 | * 0 means no line number information is available. */ |
duke@1 | 60 | public int line() { |
duke@1 | 61 | if (lineMap == null) { |
duke@1 | 62 | return 0; |
duke@1 | 63 | } else { |
duke@1 | 64 | return lineMap.getLineNumber(position); |
duke@1 | 65 | } |
duke@1 | 66 | } |
duke@1 | 67 | |
duke@1 | 68 | /** The column in the source file. The first column is |
duke@1 | 69 | * numbered 1; 0 means no column information is available. |
duke@1 | 70 | * Columns count characters in the input stream; a tab |
duke@1 | 71 | * advances the column number to the next 8-column tab stop. |
duke@1 | 72 | */ |
duke@1 | 73 | public int column() { |
duke@1 | 74 | if (lineMap == null) { |
duke@1 | 75 | return 0; |
duke@1 | 76 | }else { |
duke@1 | 77 | return lineMap.getColumnNumber(position); |
duke@1 | 78 | } |
duke@1 | 79 | } |
duke@1 | 80 | |
jjg@197 | 81 | private SourcePositionImpl(FileObject file, int position, |
duke@1 | 82 | Position.LineMap lineMap) { |
duke@1 | 83 | super(); |
duke@1 | 84 | this.filename = file; |
duke@1 | 85 | this.position = position; |
duke@1 | 86 | this.lineMap = lineMap; |
duke@1 | 87 | } |
duke@1 | 88 | |
jjg@197 | 89 | public static SourcePosition make(FileObject file, int pos, |
duke@1 | 90 | Position.LineMap lineMap) { |
duke@1 | 91 | if (file == null) return null; |
duke@1 | 92 | return new SourcePositionImpl(file, pos, lineMap); |
duke@1 | 93 | } |
duke@1 | 94 | |
duke@1 | 95 | public String toString() { |
jjg@197 | 96 | // Backwards compatibility hack. ZipFileObjects use the format |
jjg@197 | 97 | // zipfile(zipentry) but javadoc has been using zipfile/zipentry |
jjg@197 | 98 | String fn = filename.toString(); |
jjg@197 | 99 | if (fn.endsWith(")")) { |
jjg@197 | 100 | int paren = fn.lastIndexOf("("); |
jjg@197 | 101 | if (paren != -1) |
jjg@197 | 102 | fn = fn.substring(0, paren) |
jjg@197 | 103 | + File.separatorChar |
jjg@197 | 104 | + fn.substring(paren + 1, fn.length() - 1); |
jjg@197 | 105 | } |
jjg@197 | 106 | |
duke@1 | 107 | if (position == Position.NOPOS) |
jjg@197 | 108 | return fn; |
duke@1 | 109 | else |
jjg@197 | 110 | return fn + ":" + line(); |
duke@1 | 111 | } |
duke@1 | 112 | } |