Skip to content

Commit 9c4ea6f

Browse files
committed
fix compile after moving api, and updating constructorrs
1 parent efe3c84 commit 9c4ea6f

6 files changed

Lines changed: 30 additions & 15 deletions

File tree

plugin/src/main/java/com/intellij/java/impl/analysis/BaseClassesAnalysisAction.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@
3434
* @author mike
3535
*/
3636
public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
37-
protected BaseClassesAnalysisAction(String title, String analysisNoon) {
38-
super(title, analysisNoon);
37+
protected BaseClassesAnalysisAction(@Nonnull LocalizeValue actionText,
38+
@Nonnull LocalizeValue actionDescription,
39+
@Nonnull LocalizeValue title,
40+
@Nonnull LocalizeValue analysisNoon) {
41+
super(actionText, actionDescription, title, analysisNoon);
3942
}
4043

4144
protected abstract void analyzeClasses(Project project, AnalysisScope scope, ProgressIndicator indicator);

plugin/src/main/java/com/intellij/java/impl/codeInspection/inferNullity/InferNullityAnnotationsAction.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import consulo.document.Document;
3535
import consulo.ide.impl.idea.openapi.project.ProjectUtil;
3636
import consulo.ide.impl.idea.openapi.roots.libraries.LibraryUtil;
37+
import consulo.java.localize.JavaLocalize;
3738
import consulo.language.editor.FileModificationService;
3839
import consulo.language.editor.WriteCommandAction;
3940
import consulo.language.editor.impl.action.BaseAnalysisAction;
@@ -79,7 +80,12 @@ public class InferNullityAnnotationsAction extends BaseAnalysisAction {
7980
private CheckBox myAnnotateLocalVariablesCb;
8081

8182
public InferNullityAnnotationsAction() {
82-
super("Infer Nullity", INFER_NULLITY_ANNOTATIONS.get());
83+
super(
84+
JavaLocalize.actionInfernullityText(),
85+
JavaLocalize.actionInfernullityDescription(),
86+
LocalizeValue.localizeTODO("Infer Nullity"),
87+
INFER_NULLITY_ANNOTATIONS
88+
);
8389
}
8490

8591
@Override

plugin/src/main/java/com/intellij/java/impl/javadoc/actions/GenerateJavadocAction.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.intellij.java.impl.javadoc.JavadocConfigurable;
1919
import com.intellij.java.impl.javadoc.JavadocGenerationManager;
2020
import consulo.java.language.localize.JavadocLocalize;
21+
import consulo.java.localize.JavaLocalize;
2122
import consulo.language.editor.impl.action.BaseAnalysisAction;
2223
import consulo.language.editor.scope.AnalysisScope;
2324
import consulo.language.editor.ui.awt.scope.BaseAnalysisActionDialog;
@@ -35,7 +36,12 @@ public final class GenerateJavadocAction extends BaseAnalysisAction {
3536
private JavadocConfigurable myConfigurable;
3637

3738
public GenerateJavadocAction() {
38-
super(JavadocLocalize.javadocGenerateTitle().get(), JavadocLocalize.javadocGenerateTitle().get());
39+
super(
40+
JavaLocalize.actionGeneratejavadocText(),
41+
JavaLocalize.actionGeneratejavadocDescription(),
42+
JavadocLocalize.javadocGenerateTitle(),
43+
JavadocLocalize.javadocGenerateTitle()
44+
);
3945
}
4046

4147
@Override

plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import com.intellij.java.language.psi.PsiJavaPackage;
3333
import consulo.application.progress.ProgressManager;
3434
import consulo.ide.impl.idea.ide.util.DirectoryChooser;
35-
import consulo.ide.impl.idea.refactoring.rename.DirectoryAsPackageRenameHandlerBase;
3635
import consulo.language.editor.refactoring.BaseRefactoringProcessor;
3736
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
3837
import consulo.language.editor.refactoring.move.MoveCallback;
38+
import consulo.language.editor.refactoring.rename.DirectoryAsPackageRenameHandlerBase;
3939
import consulo.language.editor.refactoring.rename.RenameUtil;
4040
import consulo.language.editor.refactoring.ui.ConflictsDialog;
4141
import consulo.language.editor.refactoring.ui.RefactoringUIUtil;

plugin/src/main/java/com/intellij/java/impl/refactoring/rename/DirectoryAsPackageRenameHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import com.intellij.java.language.psi.PsiJavaPackage;
2121
import com.intellij.java.language.psi.PsiNameHelper;
2222
import consulo.annotation.component.ExtensionImpl;
23-
import consulo.ide.impl.idea.refactoring.rename.DirectoryAsPackageRenameHandlerBase;
2423
import consulo.language.editor.refactoring.BaseRefactoringProcessor;
2524
import consulo.language.editor.refactoring.localize.RefactoringLocalize;
25+
import consulo.language.editor.refactoring.rename.DirectoryAsPackageRenameHandlerBase;
2626
import consulo.language.psi.PsiDirectory;
2727
import consulo.project.Project;
2828
import consulo.util.lang.StringUtil;

plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenamePsiDirectoryProcessor.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
import com.intellij.java.language.psi.PsiPackageStatement;
2323
import consulo.annotation.component.ExtensionImpl;
2424
import consulo.codeEditor.Editor;
25-
import consulo.project.Project;
26-
import consulo.language.psi.PsiDirectory;
27-
import consulo.language.psi.PsiElement;
28-
import consulo.language.psi.PsiReference;
29-
import consulo.language.psi.search.ReferencesSearch;
30-
import consulo.language.psi.util.PsiTreeUtil;
3125
import consulo.language.editor.refactoring.RefactoringSettings;
3226
import consulo.language.editor.refactoring.event.RefactoringElementListener;
3327
import consulo.language.editor.refactoring.rename.RenameDialog;
3428
import consulo.language.editor.refactoring.rename.RenamePsiElementProcessor;
3529
import consulo.language.editor.refactoring.rename.RenameUtil;
36-
import consulo.ide.impl.idea.refactoring.rename.RenameWithOptionalReferencesDialog;
37-
import consulo.usage.UsageInfo;
30+
import consulo.language.editor.refactoring.rename.RenameWithOptionalReferencesDialog;
31+
import consulo.language.psi.PsiDirectory;
32+
import consulo.language.psi.PsiElement;
33+
import consulo.language.psi.PsiReference;
34+
import consulo.language.psi.search.ReferencesSearch;
35+
import consulo.language.psi.util.PsiTreeUtil;
3836
import consulo.language.util.IncorrectOperationException;
37+
import consulo.project.Project;
38+
import consulo.usage.UsageInfo;
3939
import jakarta.annotation.Nonnull;
40+
import jakarta.annotation.Nullable;
4041
import org.jetbrains.annotations.NonNls;
4142

42-
import jakarta.annotation.Nullable;
4343
import java.util.Collection;
4444
import java.util.Collections;
4545

0 commit comments

Comments
 (0)