Skip to content

Commit 83bff19

Browse files
committed
Merge pull request #1278 from Blaisorblade/topic/javadoc-build
Fix errors with Javadoc 8
2 parents 6610658 + 0577280 commit 83bff19

File tree

7 files changed

+27
-24
lines changed

7 files changed

+27
-24
lines changed

interfaces/src/main/java/dotty/tools/dotc/interfaces/AbstractFile.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* manipulate objects of this type.
1212
*/
1313
public interface AbstractFile {
14-
/** The name of this file, note that two files may have the same name. */
14+
/** @return The name of this file, note that two files may have the same name. */
1515
String name();
1616

17-
/** The path of this file, this might be a virtual path of an unspecified format. */
17+
/** @return The path of this file, this might be a virtual path of an unspecified format. */
1818
String path();
1919

20-
/** If this is a real file on disk, a `java.io.File` that corresponds to this file.
20+
/** @return If this is a real file on disk, a `java.io.File` that corresponds to this file.
2121
* Otherwise, an empty `Optional`.
2222
*/
2323
Optional<File> jfile();

interfaces/src/main/java/dotty/tools/dotc/interfaces/CompilerCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* You should implement this interface if you want to react to one or more of
66
* these events.
77
*
8-
* @see the method `process` of `dotty.tools.dotc.Driver` for more information.
8+
* See the method `process` of `dotty.tools.dotc.Driver` for more information.
99
*/
1010
public interface CompilerCallback {
1111
/** Called when a class has been generated.

interfaces/src/main/java/dotty/tools/dotc/interfaces/Diagnostic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ public interface Diagnostic {
1414
public static final int WARNING = 1;
1515
public static final int INFO = 0;
1616

17-
/** The message to report */
17+
/** @return The message to report */
1818
String message();
1919

20-
/** Level of the diagnostic, can be either ERROR, WARNING or INFO */
20+
/** @return Level of the diagnostic, can be either ERROR, WARNING or INFO */
2121
int level();
2222

23-
/** The position in a source file of the code that caused this diagnostic
23+
/** @return The position in a source file of the code that caused this diagnostic
2424
* to be emitted. */
2525
Optional<SourcePosition> position();
2626
}

interfaces/src/main/java/dotty/tools/dotc/interfaces/ReporterResult.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
* manipulate objects of this type.
77
*/
88
public interface ReporterResult {
9-
/** Have we emitted any error ? */
9+
/** @return Have we emitted any error? */
1010
boolean hasErrors();
11-
/** Number of errors that have been emitted */
11+
/** @return Number of errors that have been emitted */
1212
int errorCount();
1313

14-
/** Have we emitted any warning ? */
14+
/** @return Have we emitted any warning ? */
1515
boolean hasWarnings();
16-
/** Number of warnings that have been emitted */
16+
/** @return Number of warnings that have been emitted */
1717
int warningCount();
1818
}

interfaces/src/main/java/dotty/tools/dotc/interfaces/SimpleReporter.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* You should implement this interface if you want to handle the diagnostics
66
* returned by the compiler yourself.
77
*
8-
* @see the method `process` of `dotty.tools.dotc.Driver` for more information.
8+
* See the method `process` of `dotty.tools.dotc.Driver` for more information.
99
*/
1010
public interface SimpleReporter {
11-
/** Report a diagnostic. */
11+
/** Report a diagnostic.
12+
* @param diag the diagnostic message to report
13+
*/
1214
void report(Diagnostic diag);
1315
}

interfaces/src/main/java/dotty/tools/dotc/interfaces/SourceFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
* manipulate objects of this type.
99
*/
1010
public interface SourceFile extends AbstractFile {
11-
/** The content of this file as seen by the compiler. */
11+
/** @return The content of this file as seen by the compiler. */
1212
char[] content();
1313
}

interfaces/src/main/java/dotty/tools/dotc/interfaces/SourcePosition.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,34 @@
1212
* manipulate objects of this type.
1313
*/
1414
public interface SourcePosition {
15-
/** Content of the line which contains the point */
15+
/** @return Content of the line which contains the point */
1616
String lineContent();
1717

18-
/** Offset to the point */
18+
/** @return Offset to the point */
1919
int point();
20-
/** Line number of the point, starting at 0 */
20+
/** @return Line number of the point, starting at 0 */
2121
int line();
22-
/** Column number of the point, starting at 0 */
22+
/** @return Column number of the point, starting at 0 */
2323
int column();
2424

25-
/** Offset to the range start */
25+
/** @return Offset to the range start */
2626
int start();
27-
/** Line number of the range start, starting at 0 */
27+
/** @return Line number of the range start, starting at 0 */
2828
int startLine();
29-
/** Column number of the range start, starting at 0 */
29+
/** @return Column number of the range start, starting at 0 */
3030
int startColumn();
3131

32-
/** Offset to the range end */
32+
/** @return Offset to the range end */
3333
int end();
34-
/** Line number of the range end, starting at 0 */
34+
/** @return Line number of the range end, starting at 0 */
3535
int endLine();
36-
/** Column number of the range end, starting at 0 */
36+
/** @return Column number of the range end, starting at 0 */
3737
int endColumn();
3838

3939
/** The source file corresponding to this position.
4040
* The values returned by `point()`, `start()` and `end()`
4141
* are indices in the array returned by `source().content()`.
42+
* @return source file for this position
4243
*/
4344
SourceFile source();
4445
}

0 commit comments

Comments
 (0)