Mercurial > jdk8-mips64-public > langtools / file comparison
comparison: src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
- changeset 1468
- 690c41cdab55
- parent 1417
- 522a1ee72340
- child 1476
- 0e17c3c23e3b
equal
deleted
inserted
replaced
| 1467:189b26e3818f | 1468:690c41cdab55 |
|---|---|
| 237 // According to JLS, we should not be showing public modifier for | 237 // According to JLS, we should not be showing public modifier for |
| 238 // interface methods. | 238 // interface methods. |
| 239 if ((member.isField() || member.isMethod()) && | 239 if ((member.isField() || member.isMethod()) && |
| 240 writer instanceof ClassWriterImpl && | 240 writer instanceof ClassWriterImpl && |
| 241 ((ClassWriterImpl) writer).getClassDoc().isInterface()) { | 241 ((ClassWriterImpl) writer).getClassDoc().isInterface()) { |
| 242 mod = Util.replaceText(mod, "public", "").trim(); | 242 // This check for isDefault() and the default modifier needs to be |
| 243 // added for it to appear on the method details section. Once the | |
| 244 // default modifier is added to the Modifier list on DocEnv and once | |
| 245 // it is updated to use the javax.lang.model.element.Modifier, we | |
| 246 // will need to remove this. | |
| 247 mod = (member.isMethod() && ((MethodDoc)member).isDefault()) ? | |
| 248 Util.replaceText(mod, "public", "default").trim() : | |
| 249 Util.replaceText(mod, "public", "").trim(); | |
| 243 } | 250 } |
| 244 if(mod.length() > 0) { | 251 if(mod.length() > 0) { |
| 245 htmltree.addContent(mod); | 252 htmltree.addContent(mod); |
| 246 htmltree.addContent(writer.getSpace()); | 253 htmltree.addContent(writer.getSpace()); |
| 247 } | 254 } |
| 311 code.addContent("private "); | 318 code.addContent("private "); |
| 312 } else if (!member.isPublic()) { // Package private | 319 } else if (!member.isPublic()) { // Package private |
| 313 code.addContent(configuration.getText("doclet.Package_private")); | 320 code.addContent(configuration.getText("doclet.Package_private")); |
| 314 code.addContent(" "); | 321 code.addContent(" "); |
| 315 } | 322 } |
| 316 if (member.isMethod() && ((MethodDoc)member).isAbstract()) { | 323 if (member.isMethod()) { |
| 317 code.addContent("abstract "); | 324 if (((MethodDoc)member).isAbstract()) { |
| 325 code.addContent("abstract "); | |
| 326 } | |
| 327 // This check for isDefault() and the default modifier needs to be | |
| 328 // added for it to appear on the "Modifier and Type" column in the | |
| 329 // method summary section. Once the default modifier is added | |
| 330 // to the Modifier list on DocEnv and once it is updated to use the | |
| 331 // javax.lang.model.element.Modifier, we will need to remove this. | |
| 332 else if (((MethodDoc)member).isDefault()) { | |
| 333 code.addContent("default "); | |
| 334 } | |
| 318 } | 335 } |
| 319 if (member.isStatic()) { | 336 if (member.isStatic()) { |
| 320 code.addContent("static "); | 337 code.addContent("static "); |
| 321 } | 338 } |
| 322 } | 339 } |
| 545 int methodType = (member.isStatic()) ? MethodTypes.STATIC.value() : | 562 int methodType = (member.isStatic()) ? MethodTypes.STATIC.value() : |
| 546 MethodTypes.INSTANCE.value(); | 563 MethodTypes.INSTANCE.value(); |
| 547 methodType = (classdoc.isInterface() || ((MethodDoc)member).isAbstract()) ? | 564 methodType = (classdoc.isInterface() || ((MethodDoc)member).isAbstract()) ? |
| 548 methodType | MethodTypes.ABSTRACT.value() : | 565 methodType | MethodTypes.ABSTRACT.value() : |
| 549 methodType | MethodTypes.CONCRETE.value(); | 566 methodType | MethodTypes.CONCRETE.value(); |
| 567 if (((MethodDoc)member).isDefault()) { | |
| 568 methodType = methodType | MethodTypes.DEFAULT.value(); | |
| 569 } | |
| 550 if (Util.isDeprecated(member) || Util.isDeprecated(classdoc)) { | 570 if (Util.isDeprecated(member) || Util.isDeprecated(classdoc)) { |
| 551 methodType = methodType | MethodTypes.DEPRECATED.value(); | 571 methodType = methodType | MethodTypes.DEPRECATED.value(); |
| 552 } | 572 } |
| 553 methodTypesOr = methodTypesOr | methodType; | 573 methodTypesOr = methodTypesOr | methodType; |
| 554 String tableId = "i" + counter; | 574 String tableId = "i" + counter; |
