Quickfixes for deprecated API usage, and removal of unused parameters

Author: Gijs

src/main/java/com/axellience/vuegwtplugin/VueGWTBundle.java

@@ -3,12 +3,10 @@
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
-
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
-
-import com.intellij.CommonBundle;
+import com.intellij.AbstractBundle;
 
 public class VueGWTBundle
 {
@@ -24,7 +22,7 @@ private VueGWTBundle()
     public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key,
                                  @NotNull Object... params)
     {
-        return CommonBundle.message(getBundle(), key, params);
+        return AbstractBundle.message(getBundle(), key, params);
     }
 
     private static ResourceBundle getBundle()

src/main/java/com/axellience/vuegwtplugin/VueGWTFileWatcher.java

@@ -1,21 +1,21 @@
 package com.axellience.vuegwtplugin;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.fileEditor.FileDocumentManagerAdapter;
+import com.intellij.openapi.fileEditor.FileDocumentManagerListener;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-public class VueGWTFileWatcher extends FileDocumentManagerAdapter {
+public class VueGWTFileWatcher implements FileDocumentManagerListener {
 
   private static final Logger LOGGER = Logger.getInstance(VueGWTFileWatcher.class);
   private final Project project;
@@ -85,10 +85,6 @@ private VirtualFile getSibling(VirtualFile file, String siblingName) {
       return null;
     }
 
-    VirtualFile siblingFile = parent.findChild(siblingName);
-    if (siblingFile == null) {
-      return null;
-    }
-    return siblingFile;
+    return parent.findChild(siblingName);
   }
 }

src/main/java/com/axellience/vuegwtplugin/annotators/JavaComponentAnnotator.java

@@ -6,6 +6,7 @@
 import com.axellience.vuegwtplugin.intentions.CreateTemplateIntention;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
+import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.psi.PsiAnnotation;
 import com.intellij.psi.PsiAnnotationParameterList;
 import com.intellij.psi.PsiElement;
@@ -33,15 +34,15 @@ private void annotatePsiAnnotation(PsiAnnotation psiAnnotation,
     }
 
     PsiFile javaFile = psiAnnotation.getContainingFile();
-    if (!findHtmlTemplate(javaFile).isPresent()) {
-      addCreateTemplateIntention(psiAnnotation, annotationHolder);
+    if (findHtmlTemplate(javaFile).isEmpty()) {
+      addCreateTemplateIntention(annotationHolder);
     }
   }
 
-  private void addCreateTemplateIntention(PsiElement psiElement,
-      AnnotationHolder annotationHolder) {
-    annotationHolder.createErrorAnnotation(psiElement, "Unresolved HTML Template")
-        .registerFix(new CreateTemplateIntention());
+  private void addCreateTemplateIntention(AnnotationHolder annotationHolder) {
+    annotationHolder.newAnnotation(HighlightSeverity.ERROR, "Unresolved HTML Template")
+        .withFix(new CreateTemplateIntention())
+        .create();
   }
 
   private boolean shouldHaveTemplate(PsiAnnotation psiAnnotation) {

src/main/java/com/axellience/vuegwtplugin/intentions/CreateTemplateIntention.java

@@ -1,5 +1,8 @@
 package com.axellience.vuegwtplugin.intentions;
 
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.Nls.Capitalization;
+import org.jetbrains.annotations.NotNull;
 import com.axellience.vuegwtplugin.language.htmltemplate.HtmlTemplateFileType;
 import com.axellience.vuegwtplugin.util.VueGWTPluginUtil;
 import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
@@ -11,9 +14,6 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.Nls.Capitalization;
-import org.jetbrains.annotations.NotNull;
 
 public class CreateTemplateIntention extends BaseIntentionAction {
 
@@ -38,21 +38,21 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile psiF
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile psiFile)
       throws IncorrectOperationException {
-    ApplicationManager.getApplication().invokeLater(() -> createTemplate(project, editor, psiFile));
+    ApplicationManager.getApplication().invokeLater(() -> createTemplate(project, psiFile));
   }
 
-  private void createTemplate(Project project, Editor editor, PsiFile javaFile) {
+  private void createTemplate(Project project, PsiFile javaFile) {
     String templateName = VueGWTPluginUtil.getTemplateNameFrom(javaFile);
     PsiFile htmlFile = PsiFileFactory.getInstance(project).
         createFileFromText(templateName, HtmlTemplateFileType.INSTANCE, "<div></div>");
 
-    new WriteCommandAction.Simple(project, "Create HTML VueGwt Template '" + templateName + "'",
-        htmlFile) {
-      @Override
-      protected void run() {
-        PsiDirectory directory = javaFile.getContainingDirectory();
-        directory.add(htmlFile);
-      }
-    }.execute();
+    WriteCommandAction.runWriteCommandAction(project,
+        "Create HTML VueGwt Template '" + templateName + "'",
+        null,
+        () -> {
+          PsiDirectory directory = javaFile.getContainingDirectory();
+          directory.add(htmlFile);
+        },
+        htmlFile);
   }
 }