langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
equal
deleted
inserted
replaced
1461 result.append(seeTagToString((SeeTag)tagelem)); |
1461 result.append(seeTagToString((SeeTag)tagelem)); |
1462 } else if (! tagName.equals("Text")) { |
1462 } else if (! tagName.equals("Text")) { |
1463 int originalLength = result.length(); |
1463 int originalLength = result.length(); |
1464 TagletOutput output = TagletWriter.getInlineTagOuput( |
1464 TagletOutput output = TagletWriter.getInlineTagOuput( |
1465 configuration.tagletManager, holderTag, |
1465 configuration.tagletManager, holderTag, |
1466 (Tag) tagelem, getTagletWriterInstance(isFirstSentence)); |
1466 tagelem, getTagletWriterInstance(isFirstSentence)); |
1467 result.append(output == null ? "" : output.toString()); |
1467 result.append(output == null ? "" : output.toString()); |
1468 if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) { |
1468 if (originalLength == 0 && isFirstSentence && tagelem.name().equals("@inheritDoc") && result.length() > 0) { |
1469 break; |
1469 break; |
1470 } else { |
1470 } else { |
1471 continue; |
1471 continue; |
1748 * @param descList the array of {@link AnnotationDesc}. |
1748 * @param descList the array of {@link AnnotationDesc}. |
1749 * @param linkBreak if true, add new line between each member value. |
1749 * @param linkBreak if true, add new line between each member value. |
1750 * @return an array of strings representing the annotations being |
1750 * @return an array of strings representing the annotations being |
1751 * documented. |
1751 * documented. |
1752 */ |
1752 */ |
1753 private List getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak) { |
1753 private List<String> getAnnotations(int indent, AnnotationDesc[] descList, boolean linkBreak) { |
1754 List results = new ArrayList(); |
1754 List<String> results = new ArrayList<String>(); |
1755 StringBuffer annotation; |
1755 StringBuffer annotation; |
1756 for (int i = 0; i < descList.length; i++) { |
1756 for (int i = 0; i < descList.length; i++) { |
1757 AnnotationTypeDoc annotationDoc = descList[i].annotationType(); |
1757 AnnotationTypeDoc annotationDoc = descList[i].annotationType(); |
1758 if (! Util.isDocumentedAnnotation(annotationDoc)){ |
1758 if (! Util.isDocumentedAnnotation(annotationDoc)){ |
1759 continue; |
1759 continue; |
1779 } |
1779 } |
1780 annotation.append(getDocLink(LinkInfoImpl.CONTEXT_ANNOTATION, |
1780 annotation.append(getDocLink(LinkInfoImpl.CONTEXT_ANNOTATION, |
1781 pairs[j].element(), pairs[j].element().name(), false)); |
1781 pairs[j].element(), pairs[j].element().name(), false)); |
1782 annotation.append('='); |
1782 annotation.append('='); |
1783 AnnotationValue annotationValue = pairs[j].value(); |
1783 AnnotationValue annotationValue = pairs[j].value(); |
1784 List annotationTypeValues = new ArrayList(); |
1784 List<AnnotationValue> annotationTypeValues = new ArrayList<AnnotationValue>(); |
1785 if (annotationValue.value() instanceof AnnotationValue[]) { |
1785 if (annotationValue.value() instanceof AnnotationValue[]) { |
1786 AnnotationValue[] annotationArray = |
1786 AnnotationValue[] annotationArray = |
1787 (AnnotationValue[]) annotationValue.value(); |
1787 (AnnotationValue[]) annotationValue.value(); |
1788 for (int k = 0; k < annotationArray.length; k++) { |
1788 for (int k = 0; k < annotationArray.length; k++) { |
1789 annotationTypeValues.add(annotationArray[k]); |
1789 annotationTypeValues.add(annotationArray[k]); |