diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressFix.java index e3edb4c69..39eef7e0a 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressFix.java @@ -51,11 +51,10 @@ public SuppressFix(@Nonnull String ID) { super(ID, false); } - @Override @Nonnull + @Override public LocalizeValue getText() { - LocalizeValue text = super.getText(); - return text == LocalizeValue.of() ? LocalizeValue.localizeTODO("Suppress for member") : text; + return super.getText().orIfEmpty(LocalizeValue.localizeTODO("Suppress for member")); } @Override diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java index 0c97bbd42..80b0e39f2 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java @@ -257,7 +257,7 @@ else if (isAnnotationRepeatedTwice(owner, annotationType.getQualifiedName())) { } LocalizeValue explanation = doCheckRepeatableAnnotation(metaAnno); - if (explanation != LocalizeValue.empty()) { + if (explanation.isNotEmpty()) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(element) .descriptionAndTooltip(JavaCompilationErrorLocalize.annotationDuplicateExplained(explanation)); @@ -676,7 +676,7 @@ public static HighlightInfo.Builder checkFunctionalInterface(@Nonnull PsiAnnotat psiClass, JavaCompilationErrorLocalize.lambdaNotAFunctionalInterface(psiClass.getName()) ); - if (errorMessage != LocalizeValue.empty()) { + if (errorMessage.isNotEmpty()) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(annotation) .descriptionAndTooltip(errorMessage); @@ -694,7 +694,7 @@ public static HighlightInfo.Builder checkRepeatableAnnotation(PsiAnnotation anno } LocalizeValue description = doCheckRepeatableAnnotation(annotation); - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { PsiAnnotationMemberValue containerRef = PsiImplUtil.findAttributeValue(annotation, null); if (containerRef != null) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java index 26e6876ab..6c2f2bc99 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java @@ -178,7 +178,7 @@ && detectExpectedType(referenceParameterList) instanceof PsiClassType expectedCl description = JavaCompilationErrorLocalize.typeParameterCountMismatch(refParametersNum, targetParametersNum); } - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(referenceParameterList) .descriptionAndTooltip(description); @@ -1764,10 +1764,10 @@ public static HighlightInfo.Builder areSupersAccessible(@Nonnull PsiClass aClass PsiSubstitutor substitutor = resolveResult.getSubstitutor(); message = isSuperTypeAccessible(substitutor.substitute(method.getReturnType()), classes, false, resolveScope, facade); - if (message == LocalizeValue.empty()) { + if (message.isEmpty()) { for (PsiType type : method.getSignature(substitutor).getParameterTypes()) { message = isSuperTypeAccessible(type, classes, false, resolveScope, facade); - if (message != LocalizeValue.empty()) { + if (message.isNotEmpty()) { break; } } @@ -1784,7 +1784,7 @@ else if (ref.resolve() instanceof PsiField field) { ); } - if (message != LocalizeValue.empty()) { + if (message.isNotEmpty()) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .descriptionAndTooltip(message) .range(ref.getTextRange()); @@ -1804,7 +1804,7 @@ private static HighlightInfo.Builder areSupersAccessible( for (PsiClassType superType : aClass.getSuperTypes()) { LocalizeValue notAccessibleErrorMessage = isSuperTypeAccessible(superType, new HashSet<>(), checkParameters, resolveScope, factory); - if (notAccessibleErrorMessage != LocalizeValue.empty()) { + if (notAccessibleErrorMessage.isNotEmpty()) { return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .descriptionAndTooltip(notAccessibleErrorMessage) .range(range); @@ -1843,7 +1843,7 @@ private static LocalizeValue isSuperTypeAccessible( if (superType instanceof PsiClassType classType) { for (PsiType psiType : classType.getParameters()) { LocalizeValue notAccessibleMessage = isSuperTypeAccessible(psiType, classes, true, resolveScope, factory); - if (notAccessibleMessage != LocalizeValue.empty()) { + if (notAccessibleMessage.isNotEmpty()) { return notAccessibleMessage; } } @@ -1851,7 +1851,7 @@ private static LocalizeValue isSuperTypeAccessible( for (PsiClassType type : aClass.getSuperTypes()) { LocalizeValue notAccessibleMessage = isSuperTypeAccessible(type, classes, !isInLibrary, resolveScope, factory); - if (notAccessibleMessage != LocalizeValue.empty()) { + if (notAccessibleMessage.isNotEmpty()) { return notAccessibleMessage; } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index fd3bbdee7..1192a3978 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -551,7 +551,7 @@ else if (candidateInfo != null && !candidateInfo.isApplicable()) { LocalizeValue toolTip; if (parent instanceof PsiClass) { toolTip = buildOneLineMismatchDescription(list, candidateInfo, elementToHighlight); - if (toolTip == LocalizeValue.empty()) { + if (toolTip.isEmpty()) { toolTip = createMismatchedArgumentsHtmlTooltip(candidateInfo, list); } } @@ -1829,14 +1829,14 @@ public static HighlightInfo.Builder checkOverrideEquivalentInheritedMethods( continue; } - if (description == LocalizeValue.empty()) { + if (description.isEmpty()) { highlightInfo = checkMethodIncompatibleThrows(signature, superSignatures, false, aClass); if (highlightInfo != null) { description = highlightInfo.getDescription(); } } - if (description == LocalizeValue.empty()) { + if (description.isEmpty()) { HighlightInfo.Builder hlBuilder = checkMethodWeakerPrivileges(signature, superSignatures, false, containingFile); highlightInfo = hlBuilder == null ? null : hlBuilder.create(); if (highlightInfo != null) { @@ -1844,12 +1844,12 @@ public static HighlightInfo.Builder checkOverrideEquivalentInheritedMethods( } } - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { break; } } - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { // show error info at the class level HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(HighlightNamesUtil.getClassDeclarationTextRange(aClass)) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java index 82dd76f5a..d77fb7c53 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -3831,7 +3831,7 @@ private static LocalizeValue getUnsupportedFeatureMessage(PsiElement element, Ja if (pusher instanceof JavaLanguageLevelPusher languageLevelPusher) { LocalizeValue newMessage = languageLevelPusher.getInconsistencyLanguageLevelMessage(message, element, level, file); - if (newMessage != LocalizeValue.empty()) { + if (newMessage.isNotEmpty()) { return newMessage; } } diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java index 575f967aa..5c7034f9c 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java @@ -392,7 +392,7 @@ public void visitLambdaExpression(@Nonnull PsiLambdaExpression expression) { functionalInterfaceType = expression.getFunctionalInterfaceType(); if (functionalInterfaceType != null) { LocalizeValue notFunctionalMessage = LambdaHighlightingUtil.checkInterfaceFunctional(functionalInterfaceType); - if (notFunctionalMessage != LocalizeValue.empty()) { + if (notFunctionalMessage.isNotEmpty()) { myHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(expression) .descriptionAndTooltip(notFunctionalMessage) @@ -1760,7 +1760,7 @@ public void visitMethodReferenceExpression(@Nonnull PsiMethodReferenceExpression if (!myHolder.hasErrorResults() && functionalInterfaceType != null) { LocalizeValue errorMessage = PsiMethodReferenceUtil.checkMethodReferenceContext(expression); - if (errorMessage != LocalizeValue.empty()) { + if (errorMessage.isNotEmpty()) { HighlightInfo.Builder info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(expression) .descriptionAndTooltip(errorMessage); @@ -1785,7 +1785,7 @@ public void visitMethodReferenceExpression(@Nonnull PsiMethodReferenceExpression } else { LocalizeValue wildcardMessage = PsiMethodReferenceUtil.checkTypeArguments(typeElem, psiType); - if (wildcardMessage != LocalizeValue.empty()) { + if (wildcardMessage.isNotEmpty()) { add( HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(typeElem) @@ -1805,7 +1805,7 @@ public void visitMethodReferenceExpression(@Nonnull PsiMethodReferenceExpression if (!myHolder.hasErrorResults()) { LocalizeValue badReturnTypeMessage = PsiMethodReferenceUtil.checkReturnType(expression, result, functionalInterfaceType); - if (badReturnTypeMessage != LocalizeValue.empty()) { + if (badReturnTypeMessage.isNotEmpty()) { myHolder.add(HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR) .range(expression) .descriptionAndTooltip(badReturnTypeMessage) diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/LambdaHighlightingUtil.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/LambdaHighlightingUtil.java index ccbb66042..9fb1c3e76 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/LambdaHighlightingUtil.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/LambdaHighlightingUtil.java @@ -108,7 +108,7 @@ public static LocalizeValue checkInterfaceFunctional(PsiType functionalInterface if (functionalInterfaceType instanceof PsiIntersectionType) { Set signatures = new HashSet<>(); for (PsiType type : ((PsiIntersectionType) functionalInterfaceType).getConjuncts()) { - if (checkInterfaceFunctional(type) == LocalizeValue.empty()) { + if (checkInterfaceFunctional(type).isEmpty()) { MethodSignature signature = LambdaUtil.getFunction(PsiUtil.resolveClassInType(type)); LOG.assertTrue(signature != null, type.getCanonicalText()); signatures.add(signature); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/DeleteElementFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/DeleteElementFix.java index 4d5714e44..7d22cf7a8 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/DeleteElementFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/DeleteElementFix.java @@ -33,7 +33,7 @@ public class DeleteElementFix extends LocalQuickFixAndIntentionActionOnPsiElemen public DeleteElementFix(@Nonnull PsiElement element) { super(element); - myText = LocalizeValue.of(); + myText = LocalizeValue.empty(); } public DeleteElementFix(@Nonnull PsiElement element, @Nonnull LocalizeValue text) { @@ -44,7 +44,7 @@ public DeleteElementFix(@Nonnull PsiElement element, @Nonnull LocalizeValue text @Nonnull @Override public LocalizeValue getText() { - return myText == LocalizeValue.of() ? JavaQuickFixLocalize.deleteElementFixText() : myText; + return myText.orIfEmpty(JavaQuickFixLocalize.deleteElementFixText()); } @Override diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java index 21e7fc486..c1e5a92bf 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java @@ -39,8 +39,7 @@ public abstract class QualifyThisOrSuperArgumentFix implements SyntheticIntentio protected static final Logger LOG = Logger.getInstance(QualifyThisOrSuperArgumentFix.class); protected final PsiExpression myExpression; protected final PsiClass myPsiClass; - private LocalizeValue myText = LocalizeValue.of(); - + private LocalizeValue myText = LocalizeValue.empty(); public QualifyThisOrSuperArgumentFix(@Nonnull PsiExpression expression, @Nonnull PsiClass psiClass) { myExpression = expression; diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TrackingRunner.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TrackingRunner.java index d9f475109..70ef0bc11 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TrackingRunner.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/dataFlow/TrackingRunner.java @@ -882,7 +882,7 @@ else if (operand instanceof PsiReferenceExpression operandRefExpr) { } } LocalizeValue explanation = LocalizeValue.ofNullable(constraint.getAssignabilityExplanation(wanted, isInstance, name.get())); - if (explanation != LocalizeValue.empty()) { + if (explanation.isNotEmpty()) { if (constraint.equals(wanted)) { explanation = JavaAnalysisLocalize.dfaFindCauseTypeKnown(name, constraint.toShortString()); } @@ -897,7 +897,7 @@ else if (operand instanceof PsiReferenceExpression operandRefExpr) { isInstance, JavaAnalysisLocalize.dfaFindCauseObjectKindGeneric().get() )); - while (explanation != LocalizeValue.empty()) { + while (explanation.isNotEmpty()) { MemoryStateChange causeLocation = fact.myChange; if (causeLocation == null) { break; @@ -913,7 +913,7 @@ else if (operand instanceof PsiReferenceExpression operandRefExpr) { isInstance, JavaAnalysisLocalize.dfaFindCauseObjectKindGeneric().get() )); - if (prevExplanation == LocalizeValue.empty()) { + if (prevExplanation.isEmpty()) { if (causeLocation.myInstruction instanceof AssignInstruction assignInsn && causeLocation.myTopOfStack == operandValue) { PsiExpression rExpression = assignInsn.getRExpression(); if (rExpression != null) { @@ -1258,7 +1258,7 @@ private CauseItem findNullabilityCause(MemoryStateChange factUse, DfaNullability MemoryStateChange factDef = info.myFact == nullability ? info.myChange : null; if (nullability == DfaNullability.NOT_NULL) { LocalizeValue explanation = getObviouslyNonNullExplanation(expression); - if (explanation != LocalizeValue.empty()) { + if (explanation.isNotEmpty()) { return new CauseItem(JavaAnalysisLocalize.dfaFindCauseObviouslyNonNullExpression(explanation), expression); } if (factDef != null) { diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java index cb7017f11..e79f7c763 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/equalsAndHashcode/EqualsAndHashcode.java @@ -145,7 +145,7 @@ public LocalizeValue getDisplayName() { @Nonnull @Override public LocalizeValue getGroupDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } @Nonnull diff --git a/java-analysis-impl/test/com/siyeh/igtest/style/One.java b/java-analysis-impl/test/com/siyeh/igtest/style/One.java index 56d343b44..9cd42949a 100644 --- a/java-analysis-impl/test/com/siyeh/igtest/style/One.java +++ b/java-analysis-impl/test/com/siyeh/igtest/style/One.java @@ -20,15 +20,16 @@ protected String buildErrorString(Object... infos) { return null; } + @Nonnull + @Override public LocalizeValue getDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } private static class Inner { private static boolean test() { return false; } - } } class TestVariableScope { diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java index 4d5d14a2f..4400ec63d 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebuggerSession.java @@ -307,7 +307,7 @@ public LocalizeValue getStateDescription() { case DISPOSED: return JavaDebuggerLocalize.statusDebugStopped(); } - return LocalizeValue.of(); + return LocalizeValue.empty(); } /* Stepping */ diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaDebugProcess.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaDebugProcess.java index 35a753305..333f3b4fb 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaDebugProcess.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/JavaDebugProcess.java @@ -510,7 +510,7 @@ public NodeManagerImpl getNodeManager() { @Override public LocalizeValue getCurrentStateMessage() { LocalizeValue description = myJavaSession.getStateDescription(); - return description != LocalizeValue.empty() ? description : super.getCurrentStateMessage(); + return description.isNotEmpty() ? description : super.getCurrentStateMessage(); } @Nullable diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NewDebuggerLaunchingConfigurable.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NewDebuggerLaunchingConfigurable.java index 82f310999..a4fa84da3 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NewDebuggerLaunchingConfigurable.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/settings/NewDebuggerLaunchingConfigurable.java @@ -53,14 +53,11 @@ protected Component createLayout(@Nonnull PropertyBuilder propertyBuilder, return LocalizeValue.empty(); } - switch (value) { - case DebuggerSettings.SOCKET_TRANSPORT: - return JavaDebuggerLocalize.transportNameSocket(); - case DebuggerSettings.SHMEM_TRANSPORT: - return JavaDebuggerLocalize.transportNameSharedMemory(); - default: - return LocalizeValue.of(String.valueOf(value)); - } + return switch (value) { + case DebuggerSettings.SOCKET_TRANSPORT -> JavaDebuggerLocalize.transportNameSocket(); + case DebuggerSettings.SHMEM_TRANSPORT -> JavaDebuggerLocalize.transportNameSharedMemory(); + default -> LocalizeValue.of(String.valueOf(value)); + }; }); layout.add(LabeledBuilder.sided(JavaDebuggerLocalize.labelDebuggerLaunchingConfigurableDebuggerTransport(), transportBox)); propertyBuilder.add(transportBox, () -> settings.DEBUGGER_TRANSPORT, it -> settings.DEBUGGER_TRANSPORT = it); diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/impl/watch/DefaultNodeDescriptor.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/impl/watch/DefaultNodeDescriptor.java index 8c3ea3ddb..2d468b2e1 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/impl/watch/DefaultNodeDescriptor.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/impl/watch/DefaultNodeDescriptor.java @@ -13,37 +13,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author Eugene Zhuravlev - */ package com.intellij.java.debugger.impl.ui.impl.watch; import com.intellij.java.debugger.impl.engine.evaluation.EvaluationContextImpl; import com.intellij.java.debugger.impl.ui.tree.render.DescriptorLabelListener; import consulo.localize.LocalizeValue; import consulo.logging.Logger; +import jakarta.annotation.Nonnull; - +/** + * @author Eugene Zhuravlev + */ public final class DefaultNodeDescriptor extends NodeDescriptorImpl{ private static final Logger LOG = Logger.getInstance(DefaultNodeDescriptor.class); - public boolean equals(Object obj) { - return obj instanceof DefaultNodeDescriptor; - } - - public int hashCode() { - return 0; - } - - public boolean isExpandable() { - return true; - } - - public void setContext(EvaluationContextImpl context) { - } - - protected LocalizeValue calcRepresentation(EvaluationContextImpl context, DescriptorLabelListener labelListener) { - LOG.assertTrue(false); - return LocalizeValue.of(); - } + @Override + public boolean equals(Object obj) { + return obj instanceof DefaultNodeDescriptor; + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public boolean isExpandable() { + return true; + } + + @Override + public void setContext(EvaluationContextImpl context) { + } + + @Nonnull + @Override + protected LocalizeValue calcRepresentation(EvaluationContextImpl context, DescriptorLabelListener labelListener) { + LOG.assertTrue(false); + return LocalizeValue.empty(); + } } diff --git a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/ui/AdvancedSettingsUI.java b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/ui/AdvancedSettingsUI.java index a281eaf84..809d0a2ba 100644 --- a/java-intellilang/src/main/java/consulo/java/impl/intelliLang/ui/AdvancedSettingsUI.java +++ b/java-intellilang/src/main/java/consulo/java/impl/intelliLang/ui/AdvancedSettingsUI.java @@ -83,6 +83,7 @@ public void disposeUIResources() { myPanel = null; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO("Advanced"); diff --git a/plugin/src/main/java/com/intellij/java/impl/application/options/CodeStyleGenerationConfigurable.java b/plugin/src/main/java/com/intellij/java/impl/application/options/CodeStyleGenerationConfigurable.java index 864b9771e..5cb813154 100644 --- a/plugin/src/main/java/com/intellij/java/impl/application/options/CodeStyleGenerationConfigurable.java +++ b/plugin/src/main/java/com/intellij/java/impl/application/options/CodeStyleGenerationConfigurable.java @@ -30,6 +30,7 @@ import consulo.ui.ex.awt.JBList; import consulo.ui.ex.awt.JBUI; import consulo.ui.annotation.RequiredUIAccess; +import jakarta.annotation.Nonnull; import javax.swing.*; import java.awt.*; @@ -77,6 +78,7 @@ public JComponent createComponent() { return myPanel; } + @Nonnull @Override public LocalizeValue getDisplayName() { return ApplicationLocalize.titleCodeGeneration(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReferenceCompletionProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReferenceCompletionProvider.java index 1cba992b7..6212bb85c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReferenceCompletionProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/completion/MethodReferenceCompletionProvider.java @@ -80,27 +80,23 @@ public void addCompletions( @RequiredReadAction public void accept(LookupElement lookupElement) { if (lookupElement.getPsiElement() instanceof PsiMethod method) { - PsiMethodReferenceExpression referenceExpression = createMethodReferenceExpression(method); - if (referenceExpression == null) { + PsiMethodReferenceExpression refExpr = createMethodReferenceExpression(method); + if (refExpr == null) { return; } - PsiType added = map.put(referenceExpression, functionalType); + PsiType added = map.put(refExpr, functionalType); try { - PsiElement resolve = referenceExpression.resolve(); + PsiElement resolve = refExpr.resolve(); if (resolve != null && PsiEquivalenceUtil.areElementsEquivalent(method, resolve) - && PsiMethodReferenceUtil.checkMethodReferenceContext( - referenceExpression, - resolve, - functionalType - ) == LocalizeValue.empty()) { + && PsiMethodReferenceUtil.checkMethodReferenceContext(refExpr, resolve, functionalType).isEmpty()) { result.addElement(new JavaMethodReferenceElement(method, refPlace)); } } finally { if (added == null) { - map.remove(referenceExpression); + map.remove(refExpr); } } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodFix.java index ddc0bbf9d..0cd950e2f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/AddMethodFix.java @@ -102,7 +102,7 @@ public boolean isAvailable( && myMethodPrototype.isValid() && myClass.isValid() && myClass.getManager().isInProject(myClass) - && myText != LocalizeValue.empty() + && myText.isNotEmpty() && MethodSignatureUtil.findMethodBySignature(myClass, myMethodPrototype, false) == null; } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java index 7f0471aba..c86c01407 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java @@ -135,7 +135,7 @@ public ChangeMethodSignatureFromUsageFix( @Override public LocalizeValue getText() { LocalizeValue shortText = myShortName; - if (shortText != LocalizeValue.of()) { + if (shortText.isNotEmpty()) { return shortText; } return JavaQuickFixLocalize.changeMethodSignatureFromUsageText( diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java index 01843ded9..ca7e2ea56 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java @@ -65,7 +65,7 @@ else if (myCreateSetter) { return JavaQuickFixLocalize.createSetterForField(myField.getName()); } else { - return LocalizeValue.of(); + return LocalizeValue.empty(); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java index bcc0a083f..03b445f89 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java @@ -82,7 +82,7 @@ protected boolean isAvailableImpl(int offset) { String propertyName = PropertyUtil.getPropertyName(methodName); if (propertyName == null || propertyName.length() == 0) return false; - LocalizeValue getterOrSetter = LocalizeValue.of(); + LocalizeValue getterOrSetter = LocalizeValue.empty(); if (methodName.startsWith(GET_PREFIX) || methodName.startsWith(IS_PREFIX)) { if (myMethodCall.getArgumentList().getExpressions().length != 0) return false; getterOrSetter = JavaQuickFixLocalize.createGetter(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java index c3aec1a90..5b88c4ee4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java @@ -79,8 +79,8 @@ public LocalizeValue getText() { case COPY_TO_FINAL: return JavaQuickFixLocalize.makeFinalCopyToTemp(myVariable.getName()); default: - return LocalizeValue.of(); - } + return LocalizeValue.empty(); + } } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateGetterSetterHandlerBase.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateGetterSetterHandlerBase.java index 0c4754b7e..750b90598 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateGetterSetterHandlerBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateGetterSetterHandlerBase.java @@ -101,6 +101,7 @@ protected boolean onMultipleFields() { return false; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO(StringUtil.capitalizeWords( diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/ui/EqualsHashCodeTemplatesPanel.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/ui/EqualsHashCodeTemplatesPanel.java index 10cedaaaa..413af9b18 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/ui/EqualsHashCodeTemplatesPanel.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/ui/EqualsHashCodeTemplatesPanel.java @@ -109,6 +109,7 @@ public EqualsHashCodeTemplatesPanel(Project project, EqualsHashCodeTemplatesMana myManager = manager; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO("Templates"); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/accessStaticViaInstance/AccessStaticViaInstanceBase.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/accessStaticViaInstance/AccessStaticViaInstanceBase.java index b2b1925a1..55b185358 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/accessStaticViaInstance/AccessStaticViaInstanceBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/accessStaticViaInstance/AccessStaticViaInstanceBase.java @@ -38,10 +38,10 @@ public abstract class AccessStaticViaInstanceBase extends BaseJavaBatchLocalInspectionTool { @NonNls public static final String ACCESS_STATIC_VIA_INSTANCE = "AccessStaticViaInstance"; - @Override @Nonnull + @Override public LocalizeValue getGroupDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java index cee5fc305..2fb218da9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/ContractInspection.java @@ -103,7 +103,7 @@ private void checkMutationContract(PsiAnnotation annotation, PsiMethod method) { else { error = MutationSignature.checkSignature(mutationContract, method); } - if (error != LocalizeValue.empty()) { + if (error.isNotEmpty()) { PsiAnnotationMemberValue value = annotation.findAttributeValue(MutationSignature.ATTR_MUTATES); assert value != null; holder.newProblem(error) @@ -168,7 +168,7 @@ public static ParseException checkContract(PsiMethod method, String text) { } } LocalizeValue problem = contract.getReturnValue().getMethodCompatibilityProblem(method); - if (problem != LocalizeValue.empty()) { + if (problem.isNotEmpty()) { return ParseException.forReturnValue(problem, text, clauseIndex); } if (possibleContracts != null) { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/EditContractIntention.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/EditContractIntention.java index 42106cdea..dd899c94d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/EditContractIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/dataFlow/EditContractIntention.java @@ -98,7 +98,7 @@ protected void textChanged(@Nonnull DocumentEvent e) { } else { LocalizeValue mutatesError = getMutatesErrorMessage(mutatesText.getText(), method); - if (mutatesError != LocalizeValue.empty()) { + if (mutatesError.isNotEmpty()) { builder.setOkActionEnabled(false); builder.setErrorText(mutatesError.get(), mutatesText); } diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/deadCode/DummyEntryPointsTool.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/deadCode/DummyEntryPointsTool.java index ba44770f7..743322746 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/deadCode/DummyEntryPointsTool.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/deadCode/DummyEntryPointsTool.java @@ -52,10 +52,10 @@ public LocalizeValue getDisplayName() { return InspectionLocalize.inspectionDeadCodeEntryPointsDisplayName(); } - @Override @Nonnull + @Override public LocalizeValue getGroupDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/duplicateThrows/DuplicateThrowsInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/duplicateThrows/DuplicateThrowsInspection.java index 2017729d9..b470209d2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/duplicateThrows/DuplicateThrowsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/duplicateThrows/DuplicateThrowsInspection.java @@ -103,7 +103,7 @@ else if (type.isAssignableFrom(otherType)) { type = otherType; } } - if (problem != LocalizeValue.empty()) { + if (problem.isNotEmpty()) { holder.newProblem(problem) .range(ref) .withFixes(new DeleteThrowsFix(method, type)) diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/emptyMethod/EmptyMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/emptyMethod/EmptyMethodInspection.java index 2d9e0364c..01a5806dd 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/emptyMethod/EmptyMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/emptyMethod/EmptyMethodInspection.java @@ -150,7 +150,7 @@ else if (!refMethod.getDerivedMethods().isEmpty()) { } } - if (message != LocalizeValue.empty()) { + if (message.isNotEmpty()) { List fixes = new ArrayList<>(); fixes.add(getFix(processor, needToDeleteHierarchy)); SpecialAnnotationsUtilBase.createAddToSpecialAnnotationFixes( diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java b/plugin/src/main/java/com/intellij/java/impl/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java index 663225c96..18e8ec514 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java @@ -281,7 +281,7 @@ public void visitMethodReferenceExpression(@Nonnull PsiMethodReferenceExpression } JavaResolveResult result = expression.advancedResolve(false); LocalizeValue description = getUncheckedCallDescription(expression, result); - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { PsiElement referenceNameElement = expression.getReferenceNameElement(); registerProblem(description, expression, referenceNameElement != null ? referenceNameElement : expression, myGenerifyFixes); } @@ -293,7 +293,7 @@ public void visitCallExpression(@Nonnull PsiCallExpression callExpression) { super.visitCallExpression(callExpression); JavaResolveResult result = callExpression.resolveMethodGenerics(); LocalizeValue description = getUncheckedCallDescription(callExpression, result); - if (description != LocalizeValue.empty()) { + if (description.isNotEmpty()) { if (IGNORE_UNCHECKED_CALL) { return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringActionHandlerImpl.java b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringActionHandlerImpl.java index e1673eeb5..281314396 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringActionHandlerImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringActionHandlerImpl.java @@ -249,6 +249,7 @@ protected List createConfigurables() { return res; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO("toString() Generation Settings"); diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringConfigurable.java b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringConfigurable.java index 66523334b..a93978d88 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringConfigurable.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/GenerateToStringConfigurable.java @@ -22,6 +22,7 @@ import consulo.localize.LocalizeValue; import consulo.logging.Logger; import consulo.project.Project; +import jakarta.annotation.Nonnull; import org.jetbrains.java.generate.GenerateToStringContext; import javax.swing.*; @@ -39,6 +40,7 @@ public GenerateToStringConfigurable(Project project) { myProject = project; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO("Settings"); diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/view/TemplatesPanel.java b/plugin/src/main/java/com/intellij/java/impl/generate/view/TemplatesPanel.java index 43a2e244f..d4b5f6c15 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/view/TemplatesPanel.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/view/TemplatesPanel.java @@ -30,6 +30,7 @@ import consulo.ui.ex.awt.NamedItemsListEditor; import consulo.util.collection.HashingStrategy; import consulo.util.lang.Comparing; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -102,6 +103,7 @@ public TemplatesPanel(Project project, TemplatesManager templatesManager) { myTemplatesManager = templatesManager; } + @Nonnull @Override public LocalizeValue getDisplayName() { return LocalizeValue.localizeTODO("Templates"); diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/util/SuperMethodWarningDialog.java b/plugin/src/main/java/com/intellij/java/impl/ide/util/SuperMethodWarningDialog.java index 7b421b609..3e9710484 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/util/SuperMethodWarningDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/util/SuperMethodWarningDialog.java @@ -99,7 +99,7 @@ public JComponent createNorthPanel() { } } labelsPanel.add(new JLabel(JavaLocalize.promptDoYouWantToActionVerbTheMethodFromClass( - myActionString == LocalizeValue.empty() ? RefactoringLocalize.toRefactor() : myActionString, + myActionString.orIfEmpty(RefactoringLocalize.toRefactor()), myClassNames.length > 1 ? 2 : 1 ).get())); panel.add(labelsPanel, BorderLayout.CENTER); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FieldCanBeMovedToSubclassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FieldCanBeMovedToSubclassInspection.java index f4488b8c6..428381956 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FieldCanBeMovedToSubclassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/FieldCanBeMovedToSubclassInspection.java @@ -40,7 +40,7 @@ public abstract class FieldCanBeMovedToSubclassInspection extends BaseGlobalInsp @Nonnull @Override public LocalizeValue getDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); //return InspectionGadgetsBundle.message("field.can.be.moved.so.subclass.display.name"); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/CreateDefaultBranchFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/CreateDefaultBranchFix.java index b19d10762..eb9a84a9e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/CreateDefaultBranchFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/CreateDefaultBranchFix.java @@ -38,7 +38,7 @@ public CreateDefaultBranchFix(@Nonnull PsiSwitchBlock block, @Nonnull LocalizeVa @Nonnull @Override public LocalizeValue getText() { - return myMessage == LocalizeValue.empty() ? getName() : myMessage; + return myMessage.orIfEmpty(getName()); } @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/annotation/AnnotateOverriddenMethodsIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/annotation/AnnotateOverriddenMethodsIntention.java index 74f21ae3f..58bd7f033 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/annotation/AnnotateOverriddenMethodsIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/annotation/AnnotateOverriddenMethodsIntention.java @@ -52,16 +52,16 @@ protected PsiElementPredicate getElementPredicate() { return new AnnotateOverriddenMethodsPredicate(); } + @Nonnull @Override protected LocalizeValue getTextForElement(PsiElement element) { PsiAnnotation annotation = (PsiAnnotation) element; String qualifiedName = annotation.getQualifiedName(); if (qualifiedName == null) { - return LocalizeValue.of(); + return LocalizeValue.empty(); } String annotationName = ClassUtil.extractClassName(qualifiedName); - PsiElement grandParent = element.getParent().getParent(); - if (grandParent instanceof PsiMethod) { + if (element.getParent().getParent() instanceof PsiMethod) { return IntentionPowerPackLocalize.annotateOverriddenMethodsIntentionMethodName(annotationName); } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/base/MutablyNamedIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/base/MutablyNamedIntention.java index fd27276f8..7b6e12777 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/base/MutablyNamedIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/base/MutablyNamedIntention.java @@ -22,15 +22,15 @@ import jakarta.annotation.Nonnull; public abstract class MutablyNamedIntention extends Intention { - private LocalizeValue myMText = LocalizeValue.of(); + private LocalizeValue myMText = LocalizeValue.empty(); @Nonnull protected abstract LocalizeValue getTextForElement(PsiElement element); - @Override @Nonnull + @Override public final LocalizeValue getText() { - return myMText == LocalizeValue.of() ? getNeutralText() : myMText; + return myMText.orIfEmpty(getNeutralText()); } @Nonnull @@ -43,6 +43,6 @@ public final boolean isAvailable(@Nonnull Project project, Editor editor, @Nonnu return false; } myMText = getTextForElement(element); - return myMText != LocalizeValue.of(); + return myMText.isNotEmpty(); } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/braces/BaseBracesIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/braces/BaseBracesIntention.java index 1d6b89fdd..725f37afa 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/braces/BaseBracesIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/braces/BaseBracesIntention.java @@ -27,11 +27,12 @@ * @author Danila Ponomarenko */ public abstract class BaseBracesIntention extends MutablyNamedIntention { + @Nonnull @Override protected final LocalizeValue getTextForElement(PsiElement element) { PsiElement body = getSurroundingStatement(element); if (body == null) { - return LocalizeValue.of(); + return LocalizeValue.empty(); } return getMessageKey(getKeyword(body.getParent(), body)); diff --git a/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ObscureThrownExceptionsIntention.java b/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ObscureThrownExceptionsIntention.java index 2d834b634..375e3ba5a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ObscureThrownExceptionsIntention.java +++ b/plugin/src/main/java/com/intellij/java/impl/ipp/exceptions/ObscureThrownExceptionsIntention.java @@ -97,13 +97,14 @@ public static PsiClass findCommonSuperClass(PsiClassType... types) { return aClass1; } + @Nonnull @Override protected LocalizeValue getTextForElement(PsiElement element) { PsiReferenceList referenceList = (PsiReferenceList) element; PsiClassType[] types = referenceList.getReferencedTypes(); PsiClass commonSuperClass = findCommonSuperClass(types); if (commonSuperClass == null) { - return LocalizeValue.of(); + return LocalizeValue.empty(); } return IntentionPowerPackLocalize.obscureThrownExceptionsIntentionName(commonSuperClass.getName()); } diff --git a/plugin/src/main/java/com/intellij/java/impl/javadoc/JavadocConfigurable.java b/plugin/src/main/java/com/intellij/java/impl/javadoc/JavadocConfigurable.java index 91e0a712c..d16cc5d30 100644 --- a/plugin/src/main/java/com/intellij/java/impl/javadoc/JavadocConfigurable.java +++ b/plugin/src/main/java/com/intellij/java/impl/javadoc/JavadocConfigurable.java @@ -18,6 +18,7 @@ import com.intellij.java.language.psi.PsiKeyword; import consulo.configurable.Configurable; import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import javax.swing.*; import java.io.File; @@ -143,9 +144,10 @@ private static String toUserSystemFormat(String directory) { return directory.replace('/', File.separatorChar); } + @Nonnull @Override public LocalizeValue getDisplayName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } public String getHelpTopic() { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractEnumProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractEnumProcessor.java index 11339cbb1..71ae6cb30 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractEnumProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractclass/ExtractEnumProcessor.java @@ -206,7 +206,7 @@ public void fixUsage() throws IncorrectOperationException { @Override public LocalizeValue getConflictMessage() { return LocalizeValue.localizeTODO( - "Unable to migrate statement to enum constant." + (myDescription != LocalizeValue.empty() ? " " + myDescription : "") + "Unable to migrate statement to enum constant." + myDescription.map(text -> " " + text) ); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodHandler.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodHandler.java index 6f62de8ec..186fd753d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodHandler.java @@ -103,7 +103,7 @@ public void inlineElement(Project project, Editor editor, PsiElement element) { if (reference != null) { LocalizeValue errorMessage = InlineMethodProcessor.checkCalledInSuperOrThisExpr(methodBody, reference.getElement()); - if (errorMessage != LocalizeValue.empty()) { + if (errorMessage.isNotEmpty()) { CommonRefactoringUtil.showErrorHint(project, editor, errorMessage, REFACTORING_NAME, HelpID.INLINE_METHOD); return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java index 2921ac2b7..b01a73782 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java @@ -240,7 +240,7 @@ protected boolean preprocessUsages(@Nonnull SimpleReference refUsag } LocalizeValue errorMessage = checkCalledInSuperOrThisExpr(myMethod.getBody(), element); - if (errorMessage != LocalizeValue.empty()) { + if (errorMessage.isNotEmpty()) { conflicts.putValue(element, errorMessage); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterHandler.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterHandler.java index 0a9e1234e..54b402e54 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineParameterHandler.java @@ -76,7 +76,7 @@ public void inlineElement(final Project project, Editor editor, PsiElement psiEl int index = parameterList.getParameterIndex(psiParameter); LocalizeValue errorMessage = getCannotInlineMessage(psiParameter, method); - if (errorMessage != LocalizeValue.empty()) { + if (errorMessage.isNotEmpty()) { CommonRefactoringUtil.showErrorHint( project, editor, diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java index 61b589b8a..2a50a25f2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineToAnonymousClassHandler.java @@ -147,7 +147,7 @@ public void inlineElement(Project project, Editor editor, PsiElement psiElement) )) { return; } - if (errorMessage.get() != LocalizeValue.empty()) { + if (errorMessage.get().isNotEmpty()) { CommonRefactoringUtil.showErrorHint(project, editor, errorMessage.get(), title, null); return; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java index c8912bcd3..e4934f34e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java @@ -100,12 +100,7 @@ public ReplaceConstructorUsageInfo(PsiNewExpression element, PsiType newType, Ps } private void appendConflict(@Nonnull LocalizeValue conflict) { - if (myConflict == LocalizeValue.empty()) { - myConflict = conflict; - } - else { - myConflict = LocalizeValue.join(myConflict, LocalizeValue.of("\n"), conflict); - } + myConflict = myConflict.isEmpty() ? conflict : LocalizeValue.join(myConflict, LocalizeValue.of("\n"), conflict); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java index ec3f33361..edd9d73a8 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java @@ -65,15 +65,12 @@ public void fixUsage() throws IncorrectOperationException { @RequiredReadAction public LocalizeValue getConflictMessage() { if (!TypeConversionUtil.isAssignable(myOriginalType, myTargetClassType)) { - LocalizeValue conflict = LocalizeValue.localizeTODO("No consistent substitution found for " + getElement().getText() + ". " + - "Expected \'" + myOriginalType.getPresentableText() + "\' " + - "but found \'" + myTargetClassType.getPresentableText() + "\'."); - if (myConflict == LocalizeValue.empty()) { - myConflict = conflict; - } - else { - myConflict = LocalizeValue.join(myConflict, LocalizeValue.of("\n"), conflict); - } + LocalizeValue conflict = LocalizeValue.localizeTODO( + "No consistent substitution found for " + getElement().getText() + ". " + + "Expected \'" + myOriginalType.getPresentableText() + "\' " + + "but found \'" + myTargetClassType.getPresentableText() + "\'." + ); + myConflict = myConflict.isEmpty() ? conflict : LocalizeValue.join(myConflict, LocalizeValue.of("\n"), conflict); } return myConflict; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java index 2dcee80ee..e30a3da43 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceField/IntroduceConstantDialog.java @@ -465,7 +465,7 @@ else if (newClass != null && !myParentClass.getLanguage().equals(newClass.getLan newClass.getQualifiedName() ); } - if (errorString != LocalizeValue.empty()) { + if (errorString.isNotEmpty()) { CommonRefactoringUtil.showErrorMessage( IntroduceFieldHandler.REFACTORING_NAME, errorString, diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java index e5e586148..a8b83f014 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java @@ -187,7 +187,7 @@ protected boolean preprocessUsages(@Nonnull SimpleReference refUsag for (UsageInfo usageInfo : refUsages.get()) { if (usageInfo instanceof FixableUsageInfo fixableUsageInfo) { LocalizeValue conflictMessage = fixableUsageInfo.getConflictMessage(); - if (conflictMessage != LocalizeValue.empty()) { + if (conflictMessage.isNotEmpty()) { conflicts.putValue(fixableUsageInfo.getElement(), conflictMessage); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersDialog.java index 934be4f92..3501e9fda 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/move/moveMembers/MoveMembersDialog.java @@ -258,7 +258,7 @@ protected void doAction() { LocalizeValue message = validateInputData(); if (message != null) { - if (message != LocalizeValue.empty()) { + if (message.isNotEmpty()) { CommonRefactoringUtil.showErrorMessage( MoveMembersImpl.REFACTORING_NAME, message, diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamerFactory.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamerFactory.java index 477d74e53..4182d28a2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamerFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamerFactory.java @@ -34,7 +34,7 @@ public boolean isApplicable(PsiElement element) { @Nonnull public LocalizeValue getOptionName() { - return LocalizeValue.of(); + return LocalizeValue.empty(); } public boolean isEnabled() {