Skip to content

Commit 3d3e098

Browse files
committed
Require modifier initialization for extends setting
1 parent 7e81702 commit 3d3e098

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -106,8 +106,8 @@ void createTestClass(Path base, Path srcDir) throws Exception {
106106
new JavacTask(tb).files(srcDir.resolve("A.java")).outdir(classes).run();
107107

108108
new ClassBuilder(tb, "B")
109-
.setExtends("A")
110109
.setModifiers("public", "class")
110+
.setExtends("A")
111111
.write(srcDir);
112112
}
113113
}

test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ void emitHiddenMembers(Path srcDir) throws Exception {
677677
.write(srcDir);
678678

679679
new ClassBuilder(tb, "p.C2")
680-
.setExtends("C1")
681680
.setModifiers("public", "abstract", "class")
681+
.setExtends("C1")
682682
.addMembers(
683683
FieldBuilder.parse("public int field;"),
684684
MethodBuilder.parse("public void method(){}"),

test/langtools/tools/lib/builder/AbstractBuilder.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ public void setModifiers(List<String> modifiers) {
204204
}
205205

206206
boolean isInterface() {
207-
return !modifiers.isEmpty() && modifiers.getLast().endsWith("interface");
207+
if (modifiers.isEmpty()) {
208+
throw new IllegalStateException("modifiers not initialized");
209+
}
210+
return modifiers.getLast().endsWith("interface");
208211
}
209212

210213
@Override

0 commit comments

Comments
 (0)