diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java index 41f6cc277d..a9bf8c5d91 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java @@ -5,8 +5,6 @@ package net.sourceforge.pmd.lang.java.ast; -import net.sourceforge.pmd.lang.rule.xpath.NoAttribute; - /** * A directive of a {@linkplain ASTModuleDeclaration module declaration}. * Implementations provide more specific attributes. @@ -23,28 +21,9 @@ import net.sourceforge.pmd.lang.rule.xpath.NoAttribute; */ public abstract class ASTModuleDirective extends AbstractJavaNode { - private final DirectiveType type; - - ASTModuleDirective(int id, DirectiveType type) { + ASTModuleDirective(int id) { super(id); - this.type = type; - } - - /** - * Returns the kind of the directive. - */ - @NoAttribute - public DirectiveType getType() { - return type; - } - - /** - * Kind of a module directive. Specific kinds are represented by - * specific subclasses. - */ - public enum DirectiveType { - REQUIRES, EXPORTS, OPENS, USES, PROVIDES } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java index ab2fe93fed..e20dbf2269 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleExportsDirective.java @@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream; public final class ASTModuleExportsDirective extends AbstractPackageNameModuleDirective { ASTModuleExportsDirective(int id) { - super(id, DirectiveType.EXPORTS); + super(id); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java index b575c83de9..d412faa88c 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleOpensDirective.java @@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream; public final class ASTModuleOpensDirective extends AbstractPackageNameModuleDirective { ASTModuleOpensDirective(int id) { - super(id, DirectiveType.OPENS); + super(id); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java index 8c833733bc..939914cf2d 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleProvidesDirective.java @@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.ast.NodeStream; public final class ASTModuleProvidesDirective extends ASTModuleDirective { ASTModuleProvidesDirective(int id) { - super(id, DirectiveType.PROVIDES); + super(id); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java index add47fa902..c696aba3b3 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleRequiresDirective.java @@ -24,7 +24,7 @@ public final class ASTModuleRequiresDirective extends ASTModuleDirective { private boolean isTransitive; ASTModuleRequiresDirective(int id) { - super(id, DirectiveType.REQUIRES); + super(id); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java index 19541af597..447985fb67 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleUsesDirective.java @@ -16,7 +16,7 @@ package net.sourceforge.pmd.lang.java.ast; public final class ASTModuleUsesDirective extends ASTModuleDirective { ASTModuleUsesDirective(int id) { - super(id, DirectiveType.USES); + super(id); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java index 6bf5a78bf3..38a66d9f1d 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractPackageNameModuleDirective.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.java.ast; public abstract class AbstractPackageNameModuleDirective extends ASTModuleDirective { - AbstractPackageNameModuleDirective(int id, DirectiveType type) { - super(id, type); + AbstractPackageNameModuleDirective(int id) { + super(id); } public final String getPackageName() {