From 2f91a3b6a4f963a7b8362948ebc805644f9984bb Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 14 Apr 2015 19:17:56 +0200
Subject: [PATCH] Cleanup (no PSI leak in quick fix; deprecated calls dropped)

---
 .../highlighting/MissingFinalNewlineInspection.java  | 12 +++++-------
 .../manifest/MissingFinalNewlineInspectionTest.java  |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java
index 7404b27de30f..60bfce5fd13c 100644
--- a/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java
+++ b/java/manifest/src/org/jetbrains/lang/manifest/highlighting/MissingFinalNewlineInspection.java
@@ -61,16 +61,14 @@ public class MissingFinalNewlineInspection extends LocalInspectionTool {
     return null;
   }
 
-  private static class AddNewlineQuickFix implements LocalQuickFix {
-    private final Section mySection;
-
+  private static class AddNewlineQuickFix extends LocalQuickFixOnPsiElement {
     private AddNewlineQuickFix(Section section) {
-      mySection = section;
+      super(section);
     }
 
     @NotNull
     @Override
-    public String getName() {
+    public String getText() {
       return ManifestBundle.message("inspection.newline.fix");
     }
 
@@ -81,8 +79,8 @@ public class MissingFinalNewlineInspection extends LocalInspectionTool {
     }
 
     @Override
-    public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      PsiElement lastChild = mySection.getLastChild();
+    public void invoke(@NotNull Project project, @NotNull PsiFile file, @NotNull PsiElement startElement, @NotNull PsiElement endElement) {
+      PsiElement lastChild = startElement.getLastChild();
       if (lastChild instanceof Header) {
         lastChild.getNode().addLeaf(ManifestTokenType.NEWLINE, "\n", null);
       }
diff --git a/java/manifest/test/org/jetbrains/lang/manifest/MissingFinalNewlineInspectionTest.java b/java/manifest/test/org/jetbrains/lang/manifest/MissingFinalNewlineInspectionTest.java
index a55b938145cb..d0b56a2fd6df 100644
--- a/java/manifest/test/org/jetbrains/lang/manifest/MissingFinalNewlineInspectionTest.java
+++ b/java/manifest/test/org/jetbrains/lang/manifest/MissingFinalNewlineInspectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.jetbrains.lang.manifest;
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
-import junit.framework.Assert;
 import org.jetbrains.lang.manifest.highlighting.MissingFinalNewlineInspection;
 
 public class MissingFinalNewlineInspectionTest extends LightCodeInsightFixtureTestCase {
@@ -29,12 +28,12 @@ public class MissingFinalNewlineInspectionTest extends LightCodeInsightFixtureTe
 
   public void testEmptyFile() {
     myFixture.configureByText(ManifestFileTypeFactory.MANIFEST, "");
-    Assert.assertEquals(0, myFixture.getAvailableIntentions().size());
+    assertEquals(0, myFixture.getAvailableIntentions().size());
   }
 
   public void testNoProblem() {
     myFixture.configureByText(ManifestFileTypeFactory.MANIFEST, "Manifest-Version: 1.0\n");
-    Assert.assertEquals(0, myFixture.getAvailableIntentions().size());
+    assertEquals(0, myFixture.getAvailableIntentions().size());
   }
 
   public void testFix() {