From 2357108c8e2490c4c21400508ebbdf1a4cd00eeb Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 3 Jan 2021 14:02:35 +0100
Subject: [PATCH] code cleanup
---
src/main/java/org/jastadd/tooling/JastAddIcons.java | 4 ++--
src/main/java/org/jastadd/tooling/RelAstGrammar.java | 11 ++++-------
.../tooling/RelAstGrammarColorSettingsPage.java | 4 ++--
.../org/jastadd/tooling/RelAstGrammarFileType.java | 1 -
.../tooling/RelAstGrammarReferenceContributor.java | 4 ++--
.../tooling/RelAstGrammarSyntaxHighlighter.java | 2 +-
.../tooling/psi/RelAstGrammarElementFactory.java | 9 ++++++++-
.../psi/RelAstGrammarTypeReferenceManipulator.java | 12 ------------
.../psi/impl/RelAstGrammarNamedElementImpl.java | 4 ++--
9 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/jastadd/tooling/JastAddIcons.java b/src/main/java/org/jastadd/tooling/JastAddIcons.java
index 38df87c..011ca99 100644
--- a/src/main/java/org/jastadd/tooling/JastAddIcons.java
+++ b/src/main/java/org/jastadd/tooling/JastAddIcons.java
@@ -6,10 +6,10 @@ import javax.swing.*;
public class JastAddIcons {
+ public static final Icon FILE = IconLoader.getIcon("/icons/jastadd.svg", JastAddIcons.class);
+
private JastAddIcons() {
throw new IllegalStateException("Utility class");
}
- public static final Icon FILE = IconLoader.getIcon("/icons/jastadd.svg", JastAddIcons.class);
-
}
diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammar.java b/src/main/java/org/jastadd/tooling/RelAstGrammar.java
index 0aafd25..2b6f58f 100644
--- a/src/main/java/org/jastadd/tooling/RelAstGrammar.java
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammar.java
@@ -1,16 +1,13 @@
package org.jastadd.tooling;
-
import com.intellij.lang.Language;
public class RelAstGrammar extends Language {
+ public static final RelAstGrammar INSTANCE = new RelAstGrammar();
- public static final RelAstGrammar INSTANCE = new RelAstGrammar();
-
- private RelAstGrammar() {
- super("JastAddGrammar");
- }
-
+ private RelAstGrammar() {
+ super("JastAddGrammar");
+ }
}
diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammarColorSettingsPage.java b/src/main/java/org/jastadd/tooling/RelAstGrammarColorSettingsPage.java
index bb980d4..8acc9f5 100644
--- a/src/main/java/org/jastadd/tooling/RelAstGrammarColorSettingsPage.java
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammarColorSettingsPage.java
@@ -68,13 +68,13 @@ public class RelAstGrammarColorSettingsPage implements ColorSettingsPage {
@NotNull
@Override
- public AttributesDescriptor[] getAttributeDescriptors() {
+ public AttributesDescriptor @NotNull [] getAttributeDescriptors() {
return DESCRIPTORS;
}
@NotNull
@Override
- public ColorDescriptor[] getColorDescriptors() {
+ public ColorDescriptor @NotNull [] getColorDescriptors() {
return ColorDescriptor.EMPTY_ARRAY;
}
diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammarFileType.java b/src/main/java/org/jastadd/tooling/RelAstGrammarFileType.java
index 3d00b97..793a3a4 100644
--- a/src/main/java/org/jastadd/tooling/RelAstGrammarFileType.java
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammarFileType.java
@@ -33,7 +33,6 @@ public class RelAstGrammarFileType extends LanguageFileType {
}
-
@Nullable
@Override
public Icon getIcon() {
diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammarReferenceContributor.java b/src/main/java/org/jastadd/tooling/RelAstGrammarReferenceContributor.java
index c302968..326b075 100644
--- a/src/main/java/org/jastadd/tooling/RelAstGrammarReferenceContributor.java
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammarReferenceContributor.java
@@ -15,8 +15,8 @@ public class RelAstGrammarReferenceContributor extends PsiReferenceContributor {
new PsiReferenceProvider() {
@NotNull
@Override
- public PsiReference[] getReferencesByElement(@NotNull PsiElement element,
- @NotNull ProcessingContext context) {
+ public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element,
+ @NotNull ProcessingContext context) {
RelAstGrammarTypeReference typeReference = (RelAstGrammarTypeReference) element;
String value = typeReference.getText();
diff --git a/src/main/java/org/jastadd/tooling/RelAstGrammarSyntaxHighlighter.java b/src/main/java/org/jastadd/tooling/RelAstGrammarSyntaxHighlighter.java
index fad48b5..23bc610 100644
--- a/src/main/java/org/jastadd/tooling/RelAstGrammarSyntaxHighlighter.java
+++ b/src/main/java/org/jastadd/tooling/RelAstGrammarSyntaxHighlighter.java
@@ -62,7 +62,7 @@ public class RelAstGrammarSyntaxHighlighter extends SyntaxHighlighterBase {
@NotNull
@Override
- public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+ public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) {
if (tokenType.equals(RelAstGrammarTypes.ABSTRACT)) {
return KEYWORD_KEYS;
diff --git a/src/main/java/org/jastadd/tooling/psi/RelAstGrammarElementFactory.java b/src/main/java/org/jastadd/tooling/psi/RelAstGrammarElementFactory.java
index 10a87a8..df3bef4 100644
--- a/src/main/java/org/jastadd/tooling/psi/RelAstGrammarElementFactory.java
+++ b/src/main/java/org/jastadd/tooling/psi/RelAstGrammarElementFactory.java
@@ -5,7 +5,14 @@ import com.intellij.psi.PsiFileFactory;
import org.jastadd.tooling.RelAstGrammarFileType;
import org.jastadd.tooling.parser.RelAstGrammarTypes;
+import java.util.Objects;
+
public class RelAstGrammarElementFactory {
+
+ private RelAstGrammarElementFactory() {
+ throw new IllegalStateException("Utility class");
+ }
+
public static RelAstGrammarDeclaredName createDeclaredName(Project project, String name) {
final RelAstGrammarFile file = createFile(project, name + ";");
return (RelAstGrammarDeclaredName) file.getFirstChild().getFirstChild();
@@ -13,7 +20,7 @@ public class RelAstGrammarElementFactory {
public static RelAstGrammarTypeReference createTypeReference(Project project, String name) {
final RelAstGrammarFile file = createFile(project, "X : " + name + ";");
- return (RelAstGrammarTypeReference) (file.getFirstChild().getNode().findChildByType(RelAstGrammarTypes.TYPE_REFERENCE).getPsi());
+ return (RelAstGrammarTypeReference) (Objects.requireNonNull(file.getFirstChild().getNode().findChildByType(RelAstGrammarTypes.TYPE_REFERENCE)).getPsi());
}
public static RelAstGrammarFile createFile(Project project, String text) {
diff --git a/src/main/java/org/jastadd/tooling/psi/RelAstGrammarTypeReferenceManipulator.java b/src/main/java/org/jastadd/tooling/psi/RelAstGrammarTypeReferenceManipulator.java
index f05b01a..3811262 100644
--- a/src/main/java/org/jastadd/tooling/psi/RelAstGrammarTypeReferenceManipulator.java
+++ b/src/main/java/org/jastadd/tooling/psi/RelAstGrammarTypeReferenceManipulator.java
@@ -26,16 +26,4 @@ public class RelAstGrammarTypeReferenceManipulator extends AbstractElementManipu
throw new IncorrectOperationException(e);
}
}
-
-// @Nullable
-// @Override
-// public PsiElement handleContentChange(@NotNull PsiElement element, String newContent) throws IncorrectOperationException {
-// if (element instanceof RelAstGrammarTypeReference) {
-// RelAstGrammarTypeReference ref = (RelAstGrammarTypeReference) element;
-// ref.setName(newContent);
-// } else {
-// throw new IncorrectOperationException("Called with wrong element type " + element.getClass().getName());
-// }
-// return element;
-// }
}
diff --git a/src/main/java/org/jastadd/tooling/psi/impl/RelAstGrammarNamedElementImpl.java b/src/main/java/org/jastadd/tooling/psi/impl/RelAstGrammarNamedElementImpl.java
index fd20d16..11c41f4 100644
--- a/src/main/java/org/jastadd/tooling/psi/impl/RelAstGrammarNamedElementImpl.java
+++ b/src/main/java/org/jastadd/tooling/psi/impl/RelAstGrammarNamedElementImpl.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
public abstract class RelAstGrammarNamedElementImpl extends ASTWrapperPsiElement implements RelAstGrammarNamedElement {
- public RelAstGrammarNamedElementImpl(@NotNull ASTNode node) {
+ protected RelAstGrammarNamedElementImpl(@NotNull ASTNode node) {
super(node);
}
@@ -21,7 +21,7 @@ public abstract class RelAstGrammarNamedElementImpl extends ASTWrapperPsiElement
}
@NotNull
- public PsiReference[] getReferences() {
+ public PsiReference @NotNull [] getReferences() {
return ReferenceProvidersRegistry.getReferencesFromProviders(this);
}
--
GitLab