equal
deleted
inserted
replaced
33 import com.sun.tools.javac.code.Symbol.VarSymbol; |
33 import com.sun.tools.javac.code.Symbol.VarSymbol; |
34 import com.sun.tools.javac.code.Symbol.ClassSymbol; |
34 import com.sun.tools.javac.code.Symbol.ClassSymbol; |
35 import com.sun.tools.javac.code.Symbol.MethodSymbol; |
35 import com.sun.tools.javac.code.Symbol.MethodSymbol; |
36 import com.sun.tools.javac.util.Name; |
36 import com.sun.tools.javac.util.Name; |
37 import com.sun.tools.javac.util.ListBuffer; |
37 import com.sun.tools.javac.util.ListBuffer; |
|
38 import com.sun.tools.javac.util.Names; |
38 |
39 |
39 /** |
40 /** |
40 * The serialized form is the specification of a class' serialization |
41 * The serialized form is the specification of a class' serialization |
41 * state. <p> |
42 * state. <p> |
42 * |
43 * |
147 * Check for explicit Serializable fields. |
148 * Check for explicit Serializable fields. |
148 * Check for a private static array of ObjectStreamField with |
149 * Check for a private static array of ObjectStreamField with |
149 * name SERIALIZABLE_FIELDS. |
150 * name SERIALIZABLE_FIELDS. |
150 */ |
151 */ |
151 private VarSymbol getDefinedSerializableFields(ClassSymbol def) { |
152 private VarSymbol getDefinedSerializableFields(ClassSymbol def) { |
152 Name.Table names = def.name.table; |
153 Names names = def.name.table.names; |
153 |
154 |
154 /* SERIALIZABLE_FIELDS can be private, |
155 /* SERIALIZABLE_FIELDS can be private, |
155 * so must lookup by ClassSymbol, not by ClassDocImpl. |
156 * so must lookup by ClassSymbol, not by ClassDocImpl. |
156 */ |
157 */ |
157 for (Scope.Entry e = def.members().lookup(names.fromString(SERIALIZABLE_FIELDS)); e.scope != null; e = e.next()) { |
158 for (Scope.Entry e = def.members().lookup(names.fromString(SERIALIZABLE_FIELDS)); e.scope != null; e = e.next()) { |
200 * name either READOBJECT, WRITEOBJECT, READRESOLVE |
201 * name either READOBJECT, WRITEOBJECT, READRESOLVE |
201 * or WRITEREPLACE. |
202 * or WRITEREPLACE. |
202 * @param visibility the visibility flag for the given method. |
203 * @param visibility the visibility flag for the given method. |
203 */ |
204 */ |
204 private void addMethodIfExist(DocEnv env, ClassSymbol def, String methodName) { |
205 private void addMethodIfExist(DocEnv env, ClassSymbol def, String methodName) { |
205 Name.Table names = def.name.table; |
206 Names names = def.name.table.names; |
206 |
207 |
207 for (Scope.Entry e = def.members().lookup(names.fromString(methodName)); e.scope != null; e = e.next()) { |
208 for (Scope.Entry e = def.members().lookup(names.fromString(methodName)); e.scope != null; e = e.next()) { |
208 if (e.sym.kind == Kinds.MTH) { |
209 if (e.sym.kind == Kinds.MTH) { |
209 MethodSymbol md = (MethodSymbol)e.sym; |
210 MethodSymbol md = (MethodSymbol)e.sym; |
210 if ((md.flags() & Flags.STATIC) == 0) { |
211 if ((md.flags() & Flags.STATIC) == 0) { |
226 * of a class. |
227 * of a class. |
227 */ |
228 */ |
228 private void mapSerialFieldTagImplsToFieldDocImpls(FieldDocImpl spfDoc, |
229 private void mapSerialFieldTagImplsToFieldDocImpls(FieldDocImpl spfDoc, |
229 DocEnv env, |
230 DocEnv env, |
230 ClassSymbol def) { |
231 ClassSymbol def) { |
231 Name.Table names = def.name.table; |
232 Names names = def.name.table.names; |
232 |
233 |
233 SerialFieldTag[] sfTag = spfDoc.serialFieldTags(); |
234 SerialFieldTag[] sfTag = spfDoc.serialFieldTags(); |
234 for (int i = 0; i < sfTag.length; i++) { |
235 for (int i = 0; i < sfTag.length; i++) { |
235 Name fieldName = names.fromString(sfTag[i].fieldName()); |
236 Name fieldName = names.fromString(sfTag[i].fieldName()); |
236 |
237 |