diff --git a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspectionToolWrapper.java b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspectionToolWrapper.java index c24090461b1e..2c32eb40bd55 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspectionToolWrapper.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/CustomRegExpInspectionToolWrapper.java @@ -13,6 +13,7 @@ public class CustomRegExpInspectionToolWrapper extends LocalInspectionToolWrappe super(new CustomRegExpFakeInspection(configuration)); } + @Override public int hashCode() { return myTool.getShortName().hashCode(); } diff --git a/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java b/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java index 4a15e12833cd..ff25cbe750a6 100644 --- a/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java +++ b/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java @@ -67,6 +67,7 @@ final class ExternalEditorOptionsImpl implements ExternalEditorOptions, JDOMExte } } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -80,6 +81,7 @@ final class ExternalEditorOptionsImpl implements ExternalEditorOptions, JDOMExte otherOptions.getExecutablePath() == null; } + @Override public int hashCode() { return executablePath != null ? executablePath.hashCode() : 0; } diff --git a/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java b/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java index 84d0b11669b2..0a9f0d271ffd 100644 --- a/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java +++ b/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java @@ -72,6 +72,7 @@ final class ZoomOptionsImpl implements ZoomOptions { return true; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java index 0181f36811a6..0ac2941985a1 100644 --- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java +++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java @@ -35,6 +35,7 @@ final class ThumbnailSelectInTarget implements SelectInTarget, DumbAware { } } + @Override public String toString() { return ImagesBundle.message("thumbnails.toolwindow.name"); } diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java index 9e31c9c7d5a1..379f7e19d376 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/ColorDescriptor.java @@ -75,6 +75,7 @@ public final class ColorDescriptor { return myAWTColor; } + @Override public String toString() { if (mySwingColor != null) { return mySwingColor; @@ -91,6 +92,7 @@ public final class ColorDescriptor { return "null"; } + @Override public boolean equals(Object obj) { if (!(obj instanceof ColorDescriptor)) { return false; diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java index 3e4c655fee6c..67578adbdd05 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/FontDescriptor.java @@ -100,6 +100,7 @@ public final class FontDescriptor { return UIManager.getFont(mySwingFont) != null; } + @Override public boolean equals(Object obj) { if (!(obj instanceof FontDescriptor)) { return false; diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java index e09691366af4..07f9ed5152f1 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/lw/StringDescriptor.java @@ -114,6 +114,7 @@ public final class StringDescriptor { myFormClass = formClass; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof StringDescriptor)) return false; @@ -128,6 +129,7 @@ public final class StringDescriptor { return true; } + @Override public int hashCode() { int result; result = (myBundleName != null ? myBundleName.hashCode() : 0); @@ -136,6 +138,7 @@ public final class StringDescriptor { return result; } + @Override public String toString() { if (myValue != null) { return "[StringDescriptor:" + myValue + "]"; diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java index 033f79515a26..8598979da03e 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/shared/BorderType.java @@ -63,6 +63,7 @@ public final class BorderType { return myBorderFactoryMethodName; } + @Override public boolean equals(final Object o){ if (o instanceof BorderType){ return myId.equals(((BorderType)o).myId); @@ -70,6 +71,7 @@ public final class BorderType { return false; } + @Override public int hashCode(){ return 0; } diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java index 1d808350db03..c78ce7062ccf 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java @@ -134,6 +134,7 @@ public final class CompilerMessageImpl implements CompilerMessage { return myModuleNames; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof CompilerMessage)) return false; @@ -149,6 +150,7 @@ public final class CompilerMessageImpl implements CompilerMessage { return true; } + @Override public int hashCode() { int result; result = myCategory.hashCode(); @@ -159,6 +161,7 @@ public final class CompilerMessageImpl implements CompilerMessage { return result; } + @Override public String toString() { return myMessage; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/ExitStatus.java b/java/compiler/impl/src/com/intellij/compiler/impl/ExitStatus.java index 4b7660a59925..e0b3bd46592e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/ExitStatus.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/ExitStatus.java @@ -27,6 +27,7 @@ public class ExitStatus { myName = name; } + @Override public String toString() { return myName; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java index ca4b0c7acd97..d29204a93f17 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java @@ -83,6 +83,7 @@ public abstract class BuildArtifactsBeforeRunTaskBase { return new ArgumentValueDescriptorImpl(project, myVariable, myValue); } + @Override public boolean equals(Object object) { if (!(object instanceof ArgValueData)) return false; return myVariable.slot() == ((ArgValueData)object).myVariable.slot(); } + @Override public int hashCode() { return myVariable.slot(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java index 12dcdefc9c7e..441b5fc7fdab 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java @@ -32,10 +32,12 @@ public final class ArrayItemData extends DescriptorData implements Descri protected abstract T createDescriptorImpl(@NotNull Project project); + @Override public abstract boolean equals(Object object); + @Override public abstract int hashCode(); public abstract DisplayKey getDisplayKey(); diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/DisplayKey.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/DisplayKey.java index 0c886274e6e5..6ecfd154fc26 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/DisplayKey.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/DisplayKey.java @@ -4,7 +4,9 @@ package com.intellij.debugger.impl.descriptors.data; import com.intellij.debugger.ui.tree.NodeDescriptor; public interface DisplayKey extends DescriptorKey { + @Override boolean equals(Object object); + @Override int hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/FieldData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/FieldData.java index b56f4ee6beef..0890411bffdd 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/FieldData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/FieldData.java @@ -21,10 +21,12 @@ public final class FieldData extends DescriptorData { return new FieldDescriptorImpl(project, myObjRef, myField); } + @Override public boolean equals(Object object) { return object instanceof FieldData fieldData && fieldData.myField == myField && fieldData.myObjRef.equals(myObjRef); } + @Override public int hashCode() { return myObjRef.hashCode() + myField.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/LocalData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/LocalData.java index 8e4143c16a79..6513f031937a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/LocalData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/LocalData.java @@ -19,12 +19,14 @@ public class LocalData extends DescriptorData { return new LocalVariableDescriptorImpl(project, myLocalVariable); } + @Override public boolean equals(Object object) { if (!(object instanceof LocalData)) return false; return ((LocalData)object).myLocalVariable.equals(myLocalVariable); } + @Override public int hashCode() { return myLocalVariable.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/MethodReturnValueData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/MethodReturnValueData.java index 58a5d9caee91..d93a3f936edb 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/MethodReturnValueData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/MethodReturnValueData.java @@ -35,6 +35,7 @@ public final class MethodReturnValueData extends DescriptorData implements DisplayKey myKey = key; } + @Override public boolean equals(Object o) { if (!(o instanceof SimpleDisplayKey)) return false; return ((SimpleDisplayKey)o).myKey.equals(myKey); } + @Override public int hashCode() { return myKey.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StackFrameData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StackFrameData.java index 79afa6cea221..27b6daad1f43 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StackFrameData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StackFrameData.java @@ -28,6 +28,7 @@ public class StackFrameData extends DescriptorData { return new StackFrameDescriptorImpl(myFrame, myMethodsTracker); } + @Override public boolean equals(Object object) { if (!(object instanceof StackFrameData)) { return false; @@ -35,6 +36,7 @@ public class StackFrameData extends DescriptorData { return ((StackFrameData)object).myFrame == myFrame; } + @Override public int hashCode() { return myFrame.hashCode(); } @@ -51,6 +53,7 @@ public class StackFrameData extends DescriptorData { myContextKey = contextKey; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -62,6 +65,7 @@ public class StackFrameData extends DescriptorData { return true; } + @Override public int hashCode() { return myContextKey == null ? 0 : myContextKey.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticData.java index 5b15509e6285..e596a031e60c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticData.java @@ -25,10 +25,12 @@ public final class StaticData extends DescriptorData { return new StaticDescriptorImpl(myRefType); } + @Override public boolean equals(Object object) { return object instanceof StaticData; } + @Override public int hashCode() { return STATIC.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticFieldData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticFieldData.java index 50dc5ab30c3f..de210d64eb91 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticFieldData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/StaticFieldData.java @@ -18,6 +18,7 @@ public final class StaticFieldData extends DescriptorData { return new FieldDescriptorImpl(project, null, myField); } + @Override public boolean equals(Object object) { if (!(object instanceof StaticFieldData fieldData)) { return false; @@ -25,6 +26,7 @@ public final class StaticFieldData extends DescriptorData { return (fieldData.myField == myField); } + @Override public int hashCode() { return myField.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThisData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThisData.java index 98faaa386577..e2aa48f03d3b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThisData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThisData.java @@ -15,12 +15,14 @@ public final class ThisData extends DescriptorData { return new ThisDescriptorImpl(project); } + @Override public boolean equals(Object object) { if (!(object instanceof ThisData)) return false; return true; } + @Override public int hashCode() { return THIS.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadData.java index 48f43616df99..d21d607c8f8c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadData.java @@ -19,6 +19,7 @@ public class ThreadData extends DescriptorData { return new ThreadDescriptorImpl(myThread); } + @Override public boolean equals(Object object) { if (!(object instanceof ThreadData)) { return false; @@ -26,6 +27,7 @@ public class ThreadData extends DescriptorData { return myThread.equals(((ThreadData)object).myThread); } + @Override public int hashCode() { return myThread.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadGroupData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadGroupData.java index 1edf6552d194..433a0aa7081c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadGroupData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ThreadGroupData.java @@ -19,12 +19,14 @@ public class ThreadGroupData extends DescriptorData { return new ThreadGroupDescriptorImpl(myThreadGroup); } + @Override public boolean equals(Object object) { if (!(object instanceof ThreadGroupData)) return false; return myThreadGroup.equals(((ThreadGroupData)object).myThreadGroup); } + @Override public int hashCode() { return myThreadGroup.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/UserExpressionData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/UserExpressionData.java index c27f296dcb77..8e9099f56638 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/UserExpressionData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/UserExpressionData.java @@ -28,12 +28,14 @@ public class UserExpressionData extends DescriptorData return new UserExpressionDescriptorImpl(project, myParentDescriptor, myTypeName, myName, myText, myEnumerationIndex); } + @Override public boolean equals(Object object) { if (!(object instanceof UserExpressionData)) return false; return myName.equals(((UserExpressionData)object).myName); } + @Override public int hashCode() { return myName.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/WatchItemData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/WatchItemData.java index 523de2954723..49f8cc9138e2 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/WatchItemData.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/WatchItemData.java @@ -25,6 +25,7 @@ public final class WatchItemData extends DescriptorData { return myValue == null ? new WatchItemDescriptor(project, myText) : new WatchItemDescriptor(project, myText, myValue); } + @Override public boolean equals(final Object object) { if (object instanceof WatchItemData) { return myText.equals(((WatchItemData)object).myText); @@ -32,6 +33,7 @@ public final class WatchItemData extends DescriptorData { return false; } + @Override public int hashCode() { return myText.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/GeneratedLocation.java b/java/debugger/impl/src/com/intellij/debugger/jdi/GeneratedLocation.java index 37b16891b4ae..56faac247e30 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/GeneratedLocation.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/GeneratedLocation.java @@ -102,6 +102,7 @@ public class GeneratedLocation implements Location { return Long.compare(codeIndex(), o.codeIndex()); } + @Override public String toString() { return myReferenceType.name() + "." + myMethodName + ":" + myLineNumber; } diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariableProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariableProxyImpl.java index 965ad486b7b3..c54e5f8df92e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariableProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariableProxyImpl.java @@ -56,10 +56,12 @@ public class LocalVariableProxyImpl extends JdiProxy implements LocalVariablePro return myFrame; } + @Override public int hashCode() { return 31 * myFrame.hashCode() + myVariableName.hashCode(); } + @Override public boolean equals(Object o) { return o instanceof LocalVariableProxyImpl proxy && Comparing.equal(proxy.myFrame, myFrame) && diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java index ce23687ce879..0d7db2d03b24 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ObjectReferenceProxyImpl.java @@ -53,6 +53,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy { return myType; } + @Override @NonNls public String toString() { final ObjectReference objectReference = getObjectReference(); @@ -107,6 +108,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy { return getObjectReference().entryCount(); } + @Override public boolean equals(Object o) { if (!(o instanceof ObjectReferenceProxyImpl)) { return false; @@ -117,6 +119,7 @@ public class ObjectReferenceProxyImpl extends JdiProxy { } + @Override public int hashCode() { return myObjectReference.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java index fea69fa79fe7..d5668ea26ad8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java @@ -268,6 +268,7 @@ public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxyEx { return myThreadProxy; } + @Override public @NonNls String toString() { try { return "StackFrameProxyImpl: " + getStackFrame().toString(); @@ -513,11 +514,13 @@ public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxyEx { throw new EvaluateException(error.getMessage(), error); } + @Override public int hashCode() { return 31 * myThreadProxy.hashCode() + myFrameFromBottomIndex; } + @Override public boolean equals(final Object obj) { if (!(obj instanceof StackFrameProxyImpl frameProxy)) { return false; diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java index 1d06992df4c6..7ea0cd849d99 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java @@ -46,6 +46,7 @@ public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl impl return myParentThreadGroupProxy; } + @Override public @NonNls String toString() { return "ThreadGroupReferenceProxy: " + getThreadGroupReference().toString(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java index 5ff458cc3f3a..eb253f2a220b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java @@ -124,6 +124,7 @@ public final class ThreadReferenceProxyImpl extends ObjectReferenceProxyImpl imp getThreadReference().suspend(); } + @Override @NonNls public String toString() { try { diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java index d5632007f05e..bc4fbc727306 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java @@ -158,6 +158,7 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy { return allClasses; } + @Override public String toString() { return myVirtualMachine.toString(); } @@ -477,11 +478,13 @@ public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy { return proxy; } + @Override public boolean equals(Object obj) { LOG.assertTrue(obj instanceof VirtualMachineProxyImpl); return myVirtualMachine.equals(((VirtualMachineProxyImpl)obj).getVirtualMachine()); } + @Override public int hashCode() { return myVirtualMachine.hashCode(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java index f4754775d42f..3d1dc5742f99 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java @@ -115,6 +115,7 @@ public class NodeRendererSettings implements PersistentStateComponent { return myAlternateCollectionRenderers[0].isEnabled(); } + @Override public boolean equals(Object o) { if (!(o instanceof NodeRendererSettings)) return false; diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java b/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java index e44fdc59443c..79a689dc087c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java @@ -48,6 +48,7 @@ public class RendererConfiguration implements Cloneable, JDOMExternalizable { return result; } + @Override public boolean equals(Object o) { if (!(o instanceof RendererConfiguration)) return false; diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java index 1a73d7a8cdeb..e478488a4022 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java @@ -31,6 +31,7 @@ public final class ViewsGeneralSettings implements PersistentStateComponent CommonXmlStrings.HTML_START + CommonXmlStrings.BODY_START + XmlStringUtil.escapeString(getDisplayName()) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTreeNodeImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTreeNodeImpl.java index 8f0a7cfc0f03..f7a709e9274d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTreeNodeImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTreeNodeImpl.java @@ -55,6 +55,7 @@ public class DebuggerTreeNodeImpl extends TreeBuilderNode implements DebuggerTre return myTree; } + @Override public String toString() { return myText != null ? myText.toString() : ""; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java index 686626d236de..ad9a94c7c150 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java @@ -27,10 +27,12 @@ import com.intellij.openapi.diagnostic.Logger; public final class DefaultNodeDescriptor extends NodeDescriptorImpl { private static final Logger LOG = Logger.getInstance(DefaultNodeDescriptor.class); + @Override public boolean equals(Object obj) { return obj instanceof DefaultNodeDescriptor; } + @Override public int hashCode() { return 0; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java index aa26a997c500..43b7cf785b6f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java @@ -126,6 +126,7 @@ public abstract class NodeDescriptorImpl implements NodeDescriptor { return myLabel; } + @Override public String toString() { return getLabel(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java index 7bde081ced68..bcb784b2a246 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java @@ -125,6 +125,7 @@ public abstract class NodeRendererImpl implements NodeRenderer { myProperties.writeExternal(element, myDefaultName); } + @Override public String toString() { return getName(); } diff --git a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java index 9c5b71d14546..e3b1a013a09b 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java +++ b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java @@ -328,6 +328,7 @@ public abstract class SourcePosition implements Navigatable { }; } + @Override public boolean equals(Object o) { if (o instanceof SourcePosition sourcePosition) { return Comparing.equal(sourcePosition.getFile(), getFile()) && sourcePosition.getOffset() == getOffset(); diff --git a/java/debugger/shared/src/com/intellij/debugger/settings/DebuggerSettings.java b/java/debugger/shared/src/com/intellij/debugger/settings/DebuggerSettings.java index 903211794ac9..42e09030f864 100644 --- a/java/debugger/shared/src/com/intellij/debugger/settings/DebuggerSettings.java +++ b/java/debugger/shared/src/com/intellij/debugger/settings/DebuggerSettings.java @@ -186,6 +186,7 @@ public final class DebuggerSettings implements Cloneable, PersistentStateCompone } } + @Override public boolean equals(Object obj) { if (!(obj instanceof DebuggerSettings secondSettings)) return false; diff --git a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java index c5064779e9f4..3a059a3f5b87 100644 --- a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java +++ b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java @@ -121,6 +121,7 @@ public class JarApplicationConfiguration extends LocatableConfigurationBase impl JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this); } + @Override public Module @NotNull [] getModules() { Module module = myConfigurationModule.getModule(); return module != null ? new Module[]{module} : Module.EMPTY_ARRAY; diff --git a/java/idea-ui/src/com/intellij/ide/impl/ProjectStructureSelectInTarget.java b/java/idea-ui/src/com/intellij/ide/impl/ProjectStructureSelectInTarget.java index d86f97879b63..0b302405457c 100644 --- a/java/idea-ui/src/com/intellij/ide/impl/ProjectStructureSelectInTarget.java +++ b/java/idea-ui/src/com/intellij/ide/impl/ProjectStructureSelectInTarget.java @@ -123,6 +123,7 @@ public final class ProjectStructureSelectInTarget implements SelectInTarget, Dum return false; } + @Override public String toString() { return JavaUiBundle.message("select.in.project.settings"); } diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java b/java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java index 2f9aa3d74cf7..5d8776c82981 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/LibraryDescriptor.java @@ -54,6 +54,7 @@ public final class LibraryDescriptor implements Dependency { myJars.removeAll(jars); } + @Override public String toString() { return "Lib[" + myName + "]"; } diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java index 4a101c92e423..3812c637e4ca 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleDescriptor.java @@ -139,6 +139,7 @@ public non-sealed class ModuleDescriptor implements Dependency { /** * For debug purposes only */ + @Override public String toString() { @NonNls final StringBuilder builder = new StringBuilder(); builder.append("[Module: ").append(getContentRoots()).append(" | "); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java index 0111efaf8eb5..d14eb076360c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java @@ -478,6 +478,7 @@ public class JdkComboBox extends SdkComboBoxBase { return new SdkListItem.NoneSdkItem(); } + @Override public String toString() { return JavaUiBundle.message("jdk.combo.box.none.item"); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java index 1d6fbd9d1222..6fdb3921d597 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactSourceItem.java @@ -60,6 +60,7 @@ public class ArtifactSourceItem extends PackagingSourceItem { return Collections.singletonList(PackagingElementFactory.getInstance().createArtifactElement(pointer, project)); } + @Override public boolean equals(Object obj) { return obj instanceof ArtifactSourceItem && myArtifact.equals(((ArtifactSourceItem)obj).myArtifact); } @@ -74,6 +75,7 @@ public class ArtifactSourceItem extends PackagingSourceItem { return myArtifact; } + @Override public int hashCode() { return myArtifact.hashCode(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java index ff1bc7879c0f..56c99b048f03 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java @@ -43,10 +43,12 @@ public final class ArtifactsSourceItemsProvider extends PackagingSourceItemsProv super(false); } + @Override public boolean equals(Object obj) { return obj instanceof ArtifactsGroupSourceItem; } + @Override public int hashCode() { return 0; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java index 3f53e9fe056f..debdf1eea2ad 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java @@ -50,10 +50,12 @@ public class LibrarySourceItem extends PackagingSourceItem { return new LibrarySourceItemPresentation(myLibrary, context); } + @Override public boolean equals(Object obj) { return obj instanceof LibrarySourceItem && myLibrary.equals(((LibrarySourceItem)obj).myLibrary); } + @Override public int hashCode() { return myLibrary.hashCode(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java index bfe44a5b271c..158a0847188a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java @@ -40,10 +40,12 @@ public class ModuleGroupItem extends PackagingSourceItem { myPath = path; } + @Override public boolean equals(Object obj) { return obj instanceof ModuleGroupItem && myPath.equals(((ModuleGroupItem)obj).myPath); } + @Override public int hashCode() { return myPath.hashCode(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java index e2fdd25a9c87..e38e3ecb3039 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleOutputSourceItem.java @@ -23,7 +23,10 @@ import com.intellij.packaging.elements.PackagingElementOutputKind; import com.intellij.packaging.impl.elements.ProductionModuleOutputElementType; import com.intellij.packaging.impl.elements.ProductionModuleOutputPackagingElement; import com.intellij.packaging.impl.ui.ModuleElementPresentation; -import com.intellij.packaging.ui.*; +import com.intellij.packaging.ui.ArtifactEditorContext; +import com.intellij.packaging.ui.PackagingSourceItem; +import com.intellij.packaging.ui.SourceItemPresentation; +import com.intellij.packaging.ui.SourceItemWeights; import org.jetbrains.annotations.NotNull; import java.util.Collections; @@ -40,10 +43,12 @@ public class ModuleOutputSourceItem extends PackagingSourceItem { return myModule; } + @Override public boolean equals(Object obj) { return obj instanceof ModuleOutputSourceItem && myModule.equals(((ModuleOutputSourceItem)obj).myModule); } + @Override public int hashCode() { return myModule.hashCode(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java index 330d2aac554e..5c352bb6fd01 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java @@ -35,10 +35,12 @@ public class ModuleSourceItemGroup extends PackagingSourceItem { return new ModuleSourceItemPresentation(myModule, context); } + @Override public boolean equals(Object obj) { return obj instanceof ModuleSourceItemGroup && myModule.equals(((ModuleSourceItemGroup)obj).myModule); } + @Override public int hashCode() { return myModule.hashCode(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java index 3543c29c169c..4c891f258109 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElement.java @@ -89,6 +89,7 @@ class ItemElement extends LibraryTableTreeContentElement { return myRootType; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof ItemElement itemElement)) return false; @@ -100,6 +101,7 @@ class ItemElement extends LibraryTableTreeContentElement { return myUrl; } + @Override public int hashCode() { int result; result = getParent().hashCode(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java index 1b17bbb5c811..4d1c40782864 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainer.java @@ -36,6 +36,7 @@ public interface LibrariesContainer { Project getProject(); enum LibraryLevel {GLOBAL, PROJECT, MODULE; + @Override public String toString() { return StringUtil.capitalize(StringUtil.toLowerCase(name())); } diff --git a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaElement.java b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaElement.java index 0495a785c481..c28c7652fa1e 100644 --- a/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaElement.java +++ b/java/java-analysis-api/src/com/intellij/codeInspection/reference/RefJavaElement.java @@ -10,6 +10,7 @@ import java.util.Collection; public interface RefJavaElement extends RefElement { + @Override @Deprecated default PsiElement getElement() { throw new UnsupportedOperationException(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapWithAdapterMethodCallFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapWithAdapterMethodCallFix.java index 532ce102282d..bd9d34fac0ec 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapWithAdapterMethodCallFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapWithAdapterMethodCallFix.java @@ -211,6 +211,7 @@ public final class WrapWithAdapterMethodCallFix extends LocalQuickFixAndIntentio return null; } + @Override public String toString() { return myTemplate.replace("{0}", "").replaceAll("\\b[a-z.]+\\.", ""); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/HMember.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/HMember.java index 7fc0ea672b55..a1717d569112 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/HMember.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/HMember.java @@ -74,6 +74,7 @@ public final class HMember implements MemberDescriptor { return this; } + @Override public String toString() { return bytesToString(asBytes()); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/LambdaIndy.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/LambdaIndy.java index 1ffea9e08401..7ad14e7619cd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/LambdaIndy.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/LambdaIndy.java @@ -78,6 +78,7 @@ final class LambdaIndy { return ContainerUtil.concat(captured, ContainerUtil.map(getFunctionalMethodType().getArgumentTypes(), valueSupplier)); } + @Override public String toString() { return "Lambda [" + myMethod.methodName + "]: " + StringUtil.getShortName(myFunctionalInterfaceType.getClassName()); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java index 16c0c9b75e1b..6e6887c588af 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java @@ -218,6 +218,7 @@ public final class TrackingRunner extends StandardDataFlowRunner { } public abstract static class DfaProblemType { + @Override public abstract @Nls String toString(); CauseItem[] findCauses(TrackingRunner runner, PsiExpression expression, MemoryStateChange history) { @@ -432,6 +433,7 @@ public final class TrackingRunner extends StandardDataFlowRunner { return new CauseItem[0]; } + @Override public String toString() { return JavaAnalysisBundle.message("dfa.find.cause.cast.may.fail"); } @@ -447,6 +449,7 @@ public final class TrackingRunner extends StandardDataFlowRunner { return new CauseItem[0]; } + @Override public String toString() { return JavaAnalysisBundle.message("dfa.find.cause.may.be.null"); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanAndOrInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanAndOrInstruction.java index 7258f046cbae..33fc0dabc9cd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanAndOrInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanAndOrInstruction.java @@ -51,6 +51,7 @@ public class BooleanAndOrInstruction extends ExpressionPushingInstruction { return result.toArray(DfaInstructionState.EMPTY_ARRAY); } + @Override public String toString() { return myOr ? "OR" : "AND"; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanBinaryInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanBinaryInstruction.java index 2b4f936fea81..3000146bea30 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanBinaryInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/BooleanBinaryInstruction.java @@ -112,6 +112,7 @@ public class BooleanBinaryInstruction extends ExpressionPushingInstruction { } + @Override public String toString() { return "BOOLEAN_OP " + myRelation; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodCallInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodCallInstruction.java index 8a18ab03d8c6..7441bdbfaa72 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodCallInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodCallInstruction.java @@ -264,6 +264,7 @@ public class MethodCallInstruction extends ExpressionPushingInstruction { return myContext; } + @Override public String toString() { if (myContext instanceof PsiCall) { return "CALL_METHOD: " + myContext.getText(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodReferenceInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodReferenceInstruction.java index 1c630930b783..cb8d53f21fb5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodReferenceInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/MethodReferenceInstruction.java @@ -39,6 +39,7 @@ public class MethodReferenceInstruction extends ExpressionPushingInstruction { return nextStates(interpreter, stateBefore); } + @Override public String toString() { return "METHOD_REF: " + getDfaAnchor(); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NotInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NotInstruction.java index 860af676bb5f..6ed1c9879acd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NotInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NotInstruction.java @@ -40,6 +40,7 @@ public class NotInstruction extends ExpressionPushingInstruction { return result.toArray(DfaInstructionState.EMPTY_ARRAY); } + @Override public String toString() { return "NOT"; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NumericBinaryInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NumericBinaryInstruction.java index 46e02256fd92..9aa8486becda 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NumericBinaryInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/NumericBinaryInstruction.java @@ -63,6 +63,7 @@ public class NumericBinaryInstruction extends EvalInstruction { }; } + @Override public String toString() { return myBinOp == null ? "UNKNOWN_NUMERIC_OP" : "NUMERIC_OP " + myBinOp; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/StringConcatInstruction.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/StringConcatInstruction.java index 5465561dd26e..431d95114109 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/StringConcatInstruction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/java/inst/StringConcatInstruction.java @@ -79,6 +79,7 @@ public class StringConcatInstruction extends EvalInstruction { constant instanceof Boolean ? constant.toString() : null; } + @Override public String toString() { return "STRING_CONCAT"; } diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java index f01dcf50cf2c..1ab4707a813e 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java @@ -87,6 +87,7 @@ public class JavaClassFindUsagesOptions extends JavaFindUsagesOptions { } } + @Override public boolean equals(Object o) { if (this == o) return true; if (!super.equals(o)) return false; @@ -105,6 +106,7 @@ public class JavaClassFindUsagesOptions extends JavaFindUsagesOptions { return true; } + @Override public int hashCode() { int result = super.hashCode(); result = 31 * result + (isMethodsUsages ? 1 : 0); diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java index 06bc90c7d218..55cbb89acc6e 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java @@ -56,6 +56,7 @@ public class JavaMethodFindUsagesOptions extends JavaFindUsagesOptions { properties.setValue(prefix + "isSearchForBaseMethod", isSearchForBaseMethod, true); } + @Override public boolean equals(Object o) { if (this == o) return true; if (!super.equals(o)) return false; @@ -74,6 +75,7 @@ public class JavaMethodFindUsagesOptions extends JavaFindUsagesOptions { return true; } + @Override public int hashCode() { int result = super.hashCode(); result = 31 * result + (isOverridingMethods ? 1 : 0); diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaPackageFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaPackageFindUsagesOptions.java index c538bec9816b..ebb09026bc7c 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaPackageFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaPackageFindUsagesOptions.java @@ -59,6 +59,7 @@ public class JavaPackageFindUsagesOptions extends JavaFindUsagesOptions { } } + @Override public boolean equals(Object o) { if (this == o) return true; if (!super.equals(o)) return false; @@ -73,6 +74,7 @@ public class JavaPackageFindUsagesOptions extends JavaFindUsagesOptions { return true; } + @Override public int hashCode() { int result = super.hashCode(); result = 31 * result + (isClassesUsages ? 1 : 0); diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaVariableFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaVariableFindUsagesOptions.java index e3ce36fa1805..3288367921c5 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaVariableFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaVariableFindUsagesOptions.java @@ -61,6 +61,7 @@ public class JavaVariableFindUsagesOptions extends JavaFindUsagesOptions { properties.setValue(prefix + "isSearchForBaseAccessors", isSearchForBaseAccessors, false); } + @Override public boolean equals(Object o) { if (this == o) return true; if (!super.equals(o)) return false; @@ -77,6 +78,7 @@ public class JavaVariableFindUsagesOptions extends JavaFindUsagesOptions { return true; } + @Override public int hashCode() { int result = super.hashCode(); result = 31 * result + (isReadAccess ? 1 : 0); diff --git a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java index 5264d661986e..98d53e6510d2 100644 --- a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java +++ b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java @@ -973,6 +973,7 @@ public final class DuplicatesFinder { return myFolded; } + @Override public String toString() { return myVariable + ", " + myType + (myFolded ? ", folded" : ""); } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/fixes/MemberSignature.java b/java/java-analysis-impl/src/com/siyeh/ig/fixes/MemberSignature.java index fc8ecd7c0b41..ed980e49c9f7 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/fixes/MemberSignature.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/fixes/MemberSignature.java @@ -1,7 +1,10 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.siyeh.ig.fixes; -import com.intellij.psi.*; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiModifier; +import com.intellij.psi.PsiModifierList; import com.intellij.psi.util.ClassUtil; import org.jetbrains.annotations.NonNls; @@ -88,6 +91,7 @@ public class MemberSignature implements Comparable { return signature.compareTo(other.signature); } + @Override public boolean equals(Object object) { try { final MemberSignature other = (MemberSignature)object; @@ -128,10 +132,12 @@ public class MemberSignature implements Comparable { return STATIC_INITIALIZER; } + @Override public int hashCode() { return name.hashCode() + signature.hashCode(); } + @Override public String toString() { return name + signature; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ApplicationMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ApplicationMediaType.java index 17df4fe79230..d29a4af1fa35 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ApplicationMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ApplicationMediaType.java @@ -555,6 +555,7 @@ public enum ApplicationMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/AudioMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/AudioMediaType.java index 4113a630c074..d597222fc7c0 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/AudioMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/AudioMediaType.java @@ -116,6 +116,7 @@ public enum AudioMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ImageMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ImageMediaType.java index 385be81201e6..a239651a2fa9 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ImageMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ImageMediaType.java @@ -63,6 +63,7 @@ public enum ImageMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MessageMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MessageMediaType.java index 4d46b2885c74..e01b2fdcc453 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MessageMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MessageMediaType.java @@ -38,6 +38,7 @@ public enum MessageMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ModelMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ModelMediaType.java index e3ae110058bc..4061558967f1 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ModelMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/ModelMediaType.java @@ -39,6 +39,7 @@ public enum ModelMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MultipartMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MultipartMediaType.java index a20167ea7f92..7eaca28b9412 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MultipartMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/MultipartMediaType.java @@ -39,6 +39,7 @@ public enum MultipartMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/TextMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/TextMediaType.java index 24bfee171573..7134fc04e352 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/TextMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/TextMediaType.java @@ -71,6 +71,7 @@ public enum TextMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/VideoMediaType.java b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/VideoMediaType.java index a98b12421901..238803a1289a 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/VideoMediaType.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/portability/mediatype/VideoMediaType.java @@ -70,6 +70,7 @@ public enum VideoMediaType { this.contentType = contentType; } + @Override public String toString() { return contentType; } diff --git a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/StatementExtractor.java b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/StatementExtractor.java index ef1c8a293411..68ed22b7ef22 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/StatementExtractor.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/StatementExtractor.java @@ -133,6 +133,7 @@ public final class StatementExtractor { public abstract Node prepend(Node node); + @Override public abstract String toString(); } @@ -206,6 +207,7 @@ public final class StatementExtractor { return node.myAnchor == null ? this : new Cons(node, this); } + @Override public String toString() { if (myAnchor instanceof PsiInstanceOfExpression) { var patternVariableWrappers = JavaPsiPatternUtil.collectPatternVariableWrappers(myAnchor); diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java index 008c550784a1..5a07c43f20a5 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java @@ -42,6 +42,7 @@ public final class CancelPolicy implements ConflictResolutionPolicy { return null; } + @Override public String toString() { return "Cancel"; } diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/Config.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/Config.java index a10e0d59fdba..13458566e625 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/Config.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/Config.java @@ -195,6 +195,7 @@ public class Config { return myPattern = pattern; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -224,6 +225,7 @@ public class Config { return true; } + @Override public int hashCode() { int result; result = (useFullyQualifiedName ? 1 : 0); @@ -244,6 +246,7 @@ public class Config { return result; } + @Override public String toString() { return "Config{" + "useFullyQualifiedName=" + useFullyQualifiedName + diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/FilterPattern.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/FilterPattern.java index c697852b1be1..7dd0ad1482cc 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/FilterPattern.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/FilterPattern.java @@ -259,6 +259,7 @@ public final class FilterPattern { this.methodType = methodType; } + @Override public String toString() { return "FilterPattern{" + "fieldName='" + fieldName + "'" + diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/InsertLastStrategy.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/InsertLastStrategy.java index 83b13f5f3972..6433c41781b7 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/InsertLastStrategy.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/InsertLastStrategy.java @@ -53,6 +53,7 @@ public final class InsertLastStrategy implements InsertNewMethodStrategy { return (PsiMethod) clazz.addBefore(newMethod, last); } + @Override public String toString() { return "Last"; } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationMap.java b/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationMap.java index 91973c01919c..7ace8f901c9b 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationMap.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/migration/MigrationMap.java @@ -98,6 +98,7 @@ public class MigrationMap { myEntries.set(index, entry); } + @Override public String toString() { return getName(); } diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java index 3ad80cb25781..b99c0a69054e 100644 --- a/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java +++ b/java/java-impl-refactorings/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java @@ -359,6 +359,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof ClassMemberWrapper wrapper)) return false; @@ -371,6 +372,7 @@ public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor { return Objects.equals(myElement.getName(), wrapper.myElement.getName()); } + @Override public int hashCode() { final String name = myElement.getName(); if (name != null) { diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java index 68cc7ca0905e..541abea738a8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java @@ -59,6 +59,7 @@ public interface ExpectedTypeInfo { boolean equals(ExpectedTypeInfo info); + @Override String toString(); ExpectedTypeInfo @NotNull [] intersect(@NotNull ExpectedTypeInfo info); diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java index 30a1d6ee4f15..921c5f349903 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java @@ -75,6 +75,7 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo { return myDefaultType; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof ExpectedTypeInfoImpl that)) return false; @@ -87,6 +88,7 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo { return true; } + @Override public int hashCode() { int result = myType.hashCode(); result = 31 * result + myDefaultType.hashCode(); @@ -100,6 +102,7 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo { return equals((Object)obj); } + @Override public String toString() { return "ExpectedTypeInfo[type='" + myType + "' kind='" + myKind + "']"; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java index 6b1603ce88fc..7d9e20c5141b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java @@ -56,6 +56,7 @@ public abstract class RParenthTailType extends TailType { return moveCaret(editor, existingRParenthOffset, 1); } + @Override public @NonNls String toString() { return "RParenth"; } diff --git a/java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java index 6d84c5a3e4ee..ee38d24656f8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java @@ -1,9 +1,9 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.template; -import com.intellij.psi.*; -import com.intellij.openapi.editor.Document; import com.intellij.codeInsight.template.impl.JavaTemplateUtil; +import com.intellij.openapi.editor.Document; +import com.intellij.psi.*; public class JavaPsiElementResult extends PsiElementResult { @@ -11,6 +11,7 @@ public class JavaPsiElementResult extends PsiElementResult { super(element); } + @Override public String toString() { PsiElement element = getElement(); if (element != null) { diff --git a/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java b/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java index b34ba7336205..33c039cd663a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java @@ -56,6 +56,7 @@ public class PsiTypeResult implements RecalculatableResult { } } + @Override public String toString() { return getType().getCanonicalText(true); } diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CycleNode.java b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CycleNode.java index cac77a89202a..da2e3d3a4937 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CycleNode.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CycleNode.java @@ -24,6 +24,7 @@ public class CycleNode extends PackageDependenciesNode{ super(project); } + @Override public String toString() { return JavaBundle.message("cyclic.dependencies.tree.cycle.node.text"); } diff --git a/java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java b/java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java index ee442eb0629d..71b413bd913a 100644 --- a/java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java +++ b/java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java @@ -19,6 +19,7 @@ public class PackagesPaneSelectInTarget extends ProjectViewSelectInTarget implem super(project); } + @Override public String toString() { return IdeBundle.message("select.in.packages"); } diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java index f5a908e7a8bd..b478294a9a18 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java @@ -166,6 +166,7 @@ public class PackageViewPane extends AbstractProjectViewPaneWithAsyncSupport { @Override protected @NotNull ProjectViewTree createTree(@NotNull DefaultTreeModel treeModel) { return new ProjectViewTree(treeModel) { + @Override public String toString() { return getTitle() + " " + super.toString(); } diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java index 3a0eb80a7750..4a9e9966ed27 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java @@ -23,6 +23,7 @@ public class LibrariesElement { return myProject; } + @Override public boolean equals(Object o) { if (this == o) return true; return o instanceof LibrariesElement librariesElement && @@ -30,6 +31,7 @@ public class LibrariesElement { myProject.equals(librariesElement.myProject); } + @Override public int hashCode() { int result; result = (myModule != null ? myModule.hashCode() : 0); diff --git a/java/java-impl/src/com/intellij/ide/scopeView/nodes/ClassNode.java b/java/java-impl/src/com/intellij/ide/scopeView/nodes/ClassNode.java index 9ca8914f514d..901655ab4abb 100644 --- a/java/java-impl/src/com/intellij/ide/scopeView/nodes/ClassNode.java +++ b/java/java-impl/src/com/intellij/ide/scopeView/nodes/ClassNode.java @@ -10,6 +10,7 @@ public class ClassNode extends MemberNode implements Comparable { super(field); } + @Override public String toString() { final PsiField field = (PsiField)getPsiElement(); if (field == null || !field.isValid()) return ""; diff --git a/java/java-impl/src/com/intellij/ide/scopeView/nodes/MethodNode.java b/java/java-impl/src/com/intellij/ide/scopeView/nodes/MethodNode.java index 802f5cd186d3..71598daa9e32 100644 --- a/java/java-impl/src/com/intellij/ide/scopeView/nodes/MethodNode.java +++ b/java/java-impl/src/com/intellij/ide/scopeView/nodes/MethodNode.java @@ -13,6 +13,7 @@ public class MethodNode extends MemberNode { super(element); } + @Override public String toString() { final PsiMethod method = (PsiMethod)getPsiElement(); if (method == null || !method.isValid()) return ""; diff --git a/java/java-impl/src/com/intellij/jarRepository/services/MavenRepositoryService.java b/java/java-impl/src/com/intellij/jarRepository/services/MavenRepositoryService.java index c671af3f5217..edfba15dc52f 100644 --- a/java/java-impl/src/com/intellij/jarRepository/services/MavenRepositoryService.java +++ b/java/java-impl/src/com/intellij/jarRepository/services/MavenRepositoryService.java @@ -30,6 +30,7 @@ public abstract class MavenRepositoryService { throws IOException; + @Override public final String toString() { return getDisplayName(); } diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java index 592709d5fdb8..fd3c4cf2041b 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java @@ -48,6 +48,7 @@ public class PackageNode extends PackageDependenciesNode { } } + @Override public String toString() { return myPackageName; } @@ -70,6 +71,7 @@ public class PackageNode extends PackageDependenciesNode { return 3; } + @Override public boolean equals(Object o) { if (isEquals()){ return super.equals(o); @@ -80,6 +82,7 @@ public class PackageNode extends PackageDependenciesNode { Objects.equals(myPackageQName, packageNode.myPackageQName); } + @Override public int hashCode() { int result; result = myPackageName.hashCode(); diff --git a/java/java-impl/src/com/intellij/psi/filters/ElementExtractorFilter.java b/java/java-impl/src/com/intellij/psi/filters/ElementExtractorFilter.java index 75ea4f5058ba..6cdc6553068b 100644 --- a/java/java-impl/src/com/intellij/psi/filters/ElementExtractorFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/ElementExtractorFilter.java @@ -33,6 +33,7 @@ public class ElementExtractorFilter implements ElementFilter{ } + @Override public String toString(){ return getFilter().toString(); } diff --git a/java/java-impl/src/com/intellij/psi/filters/PsiMethodCallFilter.java b/java/java-impl/src/com/intellij/psi/filters/PsiMethodCallFilter.java index 9ca7cd7178e6..9471db53ab57 100644 --- a/java/java-impl/src/com/intellij/psi/filters/PsiMethodCallFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/PsiMethodCallFilter.java @@ -41,6 +41,7 @@ public class PsiMethodCallFilter implements ElementFilter { return PsiMethodCallExpression.class.isAssignableFrom(hintClass); } + @Override public @NonNls String toString() { return "methodcall(" + myClassName + "." + myMethodNames + ")"; } diff --git a/java/java-impl/src/com/intellij/psi/filters/classes/AnyInnerFilter.java b/java/java-impl/src/com/intellij/psi/filters/classes/AnyInnerFilter.java index 735cd2cfe5d8..58bbffd91dc9 100644 --- a/java/java-impl/src/com/intellij/psi/filters/classes/AnyInnerFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/classes/AnyInnerFilter.java @@ -53,6 +53,7 @@ public class AnyInnerFilter implements ElementFilter{ return true; } + @Override public String toString(){ return "any-inner(" + getFilter().toString() + ")"; } diff --git a/java/java-impl/src/com/intellij/psi/filters/classes/AssignableFromContextFilter.java b/java/java-impl/src/com/intellij/psi/filters/classes/AssignableFromContextFilter.java index 51fc341b270f..069edead220f 100644 --- a/java/java-impl/src/com/intellij/psi/filters/classes/AssignableFromContextFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/classes/AssignableFromContextFilter.java @@ -40,6 +40,7 @@ public class AssignableFromContextFilter implements ElementFilter { return qualifiedName != null && (qualifiedName.equals(candidate.getQualifiedName()) || candidate.isInheritor(curClass, true)); } + @Override public String toString() { return "assignable-from-context"; } diff --git a/java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java b/java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java index 235ef8120f51..0e78af4480c0 100644 --- a/java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java @@ -136,6 +136,7 @@ public class AssignableFromFilter implements ElementFilter { return intersection instanceof PsiIntersectionType && ((PsiIntersectionType)intersection).getConflictingConjunctsMessage() != null; } + @Override public String toString() { return "assignable-from(" + (myType != null ? myType : myClassName) + ")"; } diff --git a/java/java-impl/src/com/intellij/psi/filters/types/AssignableToFilter.java b/java/java-impl/src/com/intellij/psi/filters/types/AssignableToFilter.java index 0bfdc451a903..d8ac22378867 100644 --- a/java/java-impl/src/com/intellij/psi/filters/types/AssignableToFilter.java +++ b/java/java-impl/src/com/intellij/psi/filters/types/AssignableToFilter.java @@ -36,6 +36,7 @@ public class AssignableToFilter implements ElementFilter { return typeByElement != null && typeByElement.isAssignableFrom(myType) && !typeByElement.equals(myType); } + @Override public String toString(){ return "assignable-to(" + myType + ")"; } diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java index a70ca2c5d3ef..9b50c095fec1 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java @@ -82,6 +82,7 @@ public class SyntheticCodeBlock implements Block, JavaBlock{ return JavaSpacePropertyProcessor.getSpacing(child2, mySettings, myJavaSettings); } + @Override public String toString() { ASTNode treeNode = null; Block child = mySubBlocks.get(0); diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java index 1149dc1e2789..70ecff876fe6 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java @@ -105,6 +105,7 @@ public class ParameterInfoImpl implements JavaParameterInfo { setType(parameter.getType()); } + @Override public boolean equals(Object o) { if (this == o) return true; return o instanceof ParameterInfoImpl parameterInfo && @@ -114,6 +115,7 @@ public class ParameterInfoImpl implements JavaParameterInfo { getTypeText().equals(parameterInfo.getTypeText()); } + @Override public int hashCode() { final String name = getName(); int result = name != null ? name.hashCode() : 0; diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/TestGenerator.java b/java/java-impl/src/com/intellij/testIntegration/createTest/TestGenerator.java index 602788267ef5..2c2f734f3084 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/TestGenerator.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/TestGenerator.java @@ -33,5 +33,6 @@ public interface TestGenerator { /** * should return text to show in dialog */ + @Override String toString(); } diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java index f69c20172ed2..ce55b5b7ea22 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java @@ -137,10 +137,12 @@ class ClassGroupingRule extends SingleParentUsageGroupingRule implements DumbAwa return psiClass != null && psiClass.isValid(); } + @Override public int hashCode() { return myQName.hashCode(); } + @Override public boolean equals(Object object) { return object instanceof ClassUsageGroup && myQName.equals(((ClassUsageGroup)object).myQName); } diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java index a68d73843564..2426a4d7d807 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java @@ -90,10 +90,12 @@ public class MethodGroupingRule extends SingleParentUsageGroupingRule { return psiMethod.getIcon(Iconable.ICON_FLAG_VISIBILITY | Iconable.ICON_FLAG_READ_STATUS); } + @Override public int hashCode() { return myName.hashCode(); } + @Override public boolean equals(Object object) { if (!(object instanceof MethodUsageGroup group)) { return false; diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java index c6e05c065e90..dae186085b76 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java @@ -95,6 +95,7 @@ public final class PackageGroupingRule extends DirectoryGroupingRule { return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText()); } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof PackageGroup)) return false; @@ -102,6 +103,7 @@ public final class PackageGroupingRule extends DirectoryGroupingRule { return myPackage.equals(((PackageGroup)o).myPackage); } + @Override public int hashCode() { return myPackage.hashCode(); } diff --git a/java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java b/java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java index 7913f7f9ca6c..0c21aac04143 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java +++ b/java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java @@ -44,6 +44,7 @@ public final class DuplicatePolicy implements ConflictResolutionPolicy { return newMethodStrategy.insertNewMethod(clazz, newMethod, editor); } + @Override public String toString() { return "Duplicate"; } diff --git a/java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java index 84864d1aead1..ebd422cf3a9e 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java +++ b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java @@ -62,6 +62,7 @@ public final class InsertAfterEqualsHashCodeStrategy implements InsertNewMethodS return newMethod; } + @Override public String toString() { return "After equals/hashCode"; } diff --git a/java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java index 3c552a66aadf..2294a5945abc 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java +++ b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java @@ -47,6 +47,7 @@ public final class InsertAtCaretStrategy implements InsertNewMethodStrategy { return generationInfo.getPsiMember(); } + @Override public String toString() { return "At caret"; } diff --git a/java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java b/java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java index c9e63f3829f6..29b90fb5f9b3 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java +++ b/java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java @@ -48,6 +48,7 @@ public final class ReplacePolicy implements ConflictResolutionPolicy { return generatedMethod; } + @Override public String toString() { return "Replace existing"; } diff --git a/java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java index e8acb9493cfe..e597c3682d45 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java +++ b/java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java @@ -366,6 +366,7 @@ public abstract class AbstractElement implements Element { isModifierStatic = modifierStatic; } + @Override public String toString() { return "AbstractElement{" + "name='" + name + "'" + diff --git a/java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java index a926935359cc..562132c5c1b0 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java +++ b/java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java @@ -157,6 +157,7 @@ public class ClassElement { this._abstract = aAbstract; } + @Override public String toString() { return "ClassElement{" + "name='" + name + "'" + diff --git a/java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java index d105a4be511f..fcca022e2c10 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java +++ b/java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java @@ -108,6 +108,7 @@ public class FieldElement extends AbstractElement implements Element { return name.matches(regexp); } + @Override public String toString() { return super.toString() + " ::: FieldElement{" + "isConstant=" + isConstant + diff --git a/java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java index e02f3d42a9b6..7853aa17cd41 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java +++ b/java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java @@ -116,6 +116,7 @@ public class MethodElement extends AbstractElement implements Element { return methodName.matches(regexp); } + @Override public String toString() { return super.toString() + " ::: MethodElement{" + "fieldName='" + fieldName + "'" + diff --git a/java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java b/java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java index aa81f758a2a5..1cee5ff1914a 100644 --- a/java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java +++ b/java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java @@ -232,6 +232,7 @@ public final class TemplateResource implements Serializable { * * @return filename for UI. */ + @Override public String toString() { return fileName != null ? fileName : template; } diff --git a/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java index 3fd27ed63162..d7eec4269aab 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java +++ b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java @@ -80,6 +80,7 @@ public abstract class MethodSignatureBase implements MethodSignature { return result; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof MethodSignature)) return false; @@ -88,6 +89,7 @@ public abstract class MethodSignatureBase implements MethodSignature { return MethodSignatureUtil.areSignaturesEqual(methodSignature, this); } + @Override public int hashCode() { int hash = myHash; if (hash == 0) { @@ -104,6 +106,7 @@ public abstract class MethodSignatureBase implements MethodSignature { return hash; } + @Override public String toString() { String s = getClass().getSimpleName() + ": "; final PsiTypeParameter[] typeParameters = getTypeParameters(); diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/AbstractControlFlow.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/AbstractControlFlow.java index 89f71ee64955..5a07b85fa8c6 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/AbstractControlFlow.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/AbstractControlFlow.java @@ -25,6 +25,7 @@ abstract class AbstractControlFlow implements ControlFlow { return (int)(myElementToOffsetMap.getOrDefault(element, -1L) >>> 32); } + @Override public String toString() { StringBuilder buffer = new StringBuilder(); List instructions = getInstructions(); diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java index 7f6f8b3783e2..3628412870f7 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java @@ -28,6 +28,7 @@ public class CallInstruction extends GoToInstruction { this.procEnd = procEnd; } + @Override public String toString() { return "CALL " + offset ; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java index ddf991516dd1..674cf9a52754 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java @@ -24,6 +24,7 @@ public class CommentInstruction extends SimpleInstruction { myText = text; } + @Override public String toString() { return "; " + myText; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java index 0d3bcffcc0dc..e3487a9a87c3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java @@ -14,6 +14,7 @@ public class ConditionalGoToInstruction extends ConditionalBranchingInstruction super(offset, expression, role); } + @Override public String toString() { final @NonNls String sRole = "[" + role + "]"; return "COND_GOTO " + sRole + " " + offset; diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java index 8f96ff8f6d50..fc021162c438 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java @@ -8,6 +8,7 @@ public class ConditionalThrowToInstruction extends ConditionalBranchingInstructi super(offset, null, Role.END); } + @Override public String toString() { return "COND_THROW_TO " + offset; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java index 2752fa05179b..1e0f4fa572b5 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java @@ -83,6 +83,7 @@ public class ControlFlowSubRange implements ControlFlow { return myControlFlow.isConstantConditionOccurred(); } + @Override public String toString() { @NonNls StringBuilder buffer = new StringBuilder(); buffer. diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java index 4fde2b7b2766..e94fd7fa646a 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java @@ -32,6 +32,7 @@ public final class ControlFlowUtil { myInstructionIdx = instructionIdx; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof SSAInstructionState)) return false; @@ -42,6 +43,7 @@ public final class ControlFlowUtil { return Math.min(2, myWriteCount) == Math.min(2, ssaInstructionState.myWriteCount); } + @Override public int hashCode() { int result = Math.min(2, myWriteCount); result = 29 * result + myInstructionIdx; @@ -1874,10 +1876,12 @@ public final class ControlFlowUtil { this.expression = expression; } + @Override public boolean equals(Object o) { return this == o || o instanceof VariableInfo && variable.equals(((VariableInfo)o).variable); } + @Override public int hashCode() { return variable.hashCode(); } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java index cf4a61059b88..0f93038cfd92 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java @@ -9,6 +9,7 @@ public final class EmptyInstruction extends SimpleInstruction { private EmptyInstruction() { } + @Override public String toString() { return "EMPTY"; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java index 4d033d7c6fee..7f41570410ab 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java @@ -34,6 +34,7 @@ public class GoToInstruction extends BranchingInstruction { this.isReturn = isReturn; } + @Override public String toString() { final String sRole = "["+role.toString()+"]"; return "GOTO " + sRole + " " + offset + (isReturn ? " RETURN" : ""); diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java index 43ac47cb6fd7..b06d34a3ca00 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java @@ -16,6 +16,7 @@ public abstract class InstructionBase implements Instruction, Cloneable{ } } + @Override public abstract @NonNls String toString(); } \ No newline at end of file diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java index 85f974131c40..ed7a49e9a1ca 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java @@ -11,6 +11,7 @@ public final class ReadVariableInstruction extends SimpleInstruction { this.variable = variable; } + @Override public String toString() { return "READ " + variable.getName(); } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java index b6e08b84de6d..7998fd3ed9b8 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java @@ -16,6 +16,7 @@ public class ReturnInstruction extends GoToInstruction { myCallInstruction = callInstruction; } + @Override public String toString() { return "RETURN FROM " + getProcBegin() + (offset == 0 ? "" : " TO "+offset); } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java index d7c44f688d2f..eda49e64a3dc 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java @@ -27,6 +27,7 @@ public class ThrowToInstruction extends BranchingInstruction { super(offset, Role.END); } + @Override public String toString() { return "THROW_TO " + offset; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java index 3aee9db492bc..78d5ff423e00 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java @@ -11,6 +11,7 @@ public final class WriteVariableInstruction extends SimpleInstruction { this.variable = variable; } + @Override public String toString() { return "WRITE " + variable.getName(); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java index 3f1a2143bc02..e407c8d32fd4 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java @@ -12,6 +12,7 @@ public class PsiClassInitializerStubImpl extends StubBase i super(parent, JavaStubElementTypes.CLASS_INITIALIZER); } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiClassInitializerStub"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java index 5c6b3144c50a..f0af4db9928f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java @@ -12,6 +12,7 @@ public class PsiImportListStubImpl extends StubBase implements Ps super(parent, JavaStubElementTypes.IMPORT_LIST); } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiImportListStub"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java index d475256f21eb..55b528ec1126 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java @@ -20,6 +20,7 @@ public class PsiModifierListStubImpl extends StubBase implement return myMask; } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiModifierListStub[" + "mask=" + getModifiersMask() + "]"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java index 7bdc462b1b54..c80388585e6f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java @@ -12,6 +12,7 @@ public class PsiParameterListStubImpl extends StubBase impleme super(parent, JavaStubElementTypes.PARAMETER_LIST); } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiParameterListStub"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiRecordHeaderStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiRecordHeaderStubImpl.java index 0095f10115f0..d85314fa22f7 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiRecordHeaderStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiRecordHeaderStubImpl.java @@ -12,6 +12,7 @@ public class PsiRecordHeaderStubImpl extends StubBase implement super(parent, JavaStubElementTypes.RECORD_HEADER); } + @Override public String toString() { return "PsiRecordHeaderStub"; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java index 299f8d87ae9e..0be16346fd8c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java @@ -12,6 +12,7 @@ public class PsiTypeParameterListStubImpl extends StubBase super(parent, JavaStubElementTypes.TYPE_PARAMETER_LIST); } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiTypeParameterListStub"; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java index 8e359a4d8dd0..2b3f9a534722 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java @@ -26,6 +26,7 @@ public class PsiTypeParameterStubImpl extends StubBase impleme return myName; } + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public String toString() { return "PsiTypeParameter[" + myName + ']'; diff --git a/java/java-runtime/src/com/intellij/rt/ant/execution/SegmentedOutputStream.java b/java/java-runtime/src/com/intellij/rt/ant/execution/SegmentedOutputStream.java index c3fa7a853452..d92d5006a187 100644 --- a/java/java-runtime/src/com/intellij/rt/ant/execution/SegmentedOutputStream.java +++ b/java/java-runtime/src/com/intellij/rt/ant/execution/SegmentedOutputStream.java @@ -38,16 +38,19 @@ public class SegmentedOutputStream extends OutputStream implements PacketProcess } } + @Override public synchronized void write(int b) throws IOException { if (b == SegmentedStream.SPECIAL_SYMBOL && myStarted) writeNext(b); writeNext(b); flush(); } + @Override public synchronized void flush() throws IOException { myPrintStream.flush(); } + @Override public synchronized void close() throws IOException { myPrintStream.close(); } @@ -56,6 +59,7 @@ public class SegmentedOutputStream extends OutputStream implements PacketProcess myPrintStream.write(b); } + @Override public synchronized void processPacket(String packet) { if (!myStarted) sendStart(); diff --git a/java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java b/java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java index 70747339d1dd..81c7f3dccc1d 100644 --- a/java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java +++ b/java/java-runtime/src/com/intellij/rt/compiler/JavacResourcesReader.java @@ -136,6 +136,7 @@ public final class JavacResourcesReader { super(MSG_IGNORED, new String[]{"compiler.warn.warning", messageKey}); } + @Override public String getCategoryValue(ResourceBundle messagesBundle) { return messagesBundle.getString(keys[0]) + MessageFormat.format(messagesBundle.getString(keys[1]), ""); } diff --git a/java/java-runtime/src/com/intellij/rt/execution/junit/MapSerializerUtil.java b/java/java-runtime/src/com/intellij/rt/execution/junit/MapSerializerUtil.java index ef145662a815..f195abb7c446 100644 --- a/java/java-runtime/src/com/intellij/rt/execution/junit/MapSerializerUtil.java +++ b/java/java-runtime/src/com/intellij/rt/execution/junit/MapSerializerUtil.java @@ -29,6 +29,7 @@ public final class MapSerializerUtil { } public static final EscapeInfoProvider STD_ESCAPER = new EscapeInfoProvider() { + @Override public char escape(final char c) { switch (c) { case '\n': return 'n'; @@ -45,6 +46,7 @@ public final class MapSerializerUtil { } } + @Override public char escapeCharacter() { return '|'; } diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElementBase.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElementBase.java index 56b532fe2a69..9c3bfd8d84ad 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElementBase.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElementBase.java @@ -96,6 +96,7 @@ public abstract class JavaClassTreeElementBase extends return isInherited() ? "" : DEFAULT_LOCATION_SUFFIX; } + @Override public boolean equals(final Object o) { if (!super.equals(o)) return false; final JavaClassTreeElementBase that = (JavaClassTreeElementBase)o; diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java index 5ff2da591282..93fe8527f37b 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java @@ -124,11 +124,13 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce return myPropertyName + ": " + myTypeText; } + @Override public String toString() { return myPropertyName; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof PropertyGroup)) return false; @@ -136,6 +138,7 @@ public final class PropertyGroup implements Group, ColoredItemPresentation, Acce return myPropertyName.equals(((PropertyGroup)o).myPropertyName) && myTypeText.equals(((PropertyGroup)o).myTypeText); } + @Override public int hashCode() { return myPropertyName.hashCode() * 31 + myTypeText.hashCode(); } diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java index 4c63a5b6b449..d40ef95a683f 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java @@ -66,11 +66,13 @@ public class SuperTypeGroup implements Group, ItemPresentation, AccessLevelProvi return toString(); } + @Override public String toString() { final PsiClass superClass = getSuperClass(); return superClass != null ? superClass.getName() : StructureViewBundle.message("node.structureview.invalid"); } + @Override public boolean equals(Object o) { if (this == o) return true; return o instanceof SuperTypeGroup superTypeGroup && @@ -78,6 +80,7 @@ public class SuperTypeGroup implements Group, ItemPresentation, AccessLevelProvi Objects.equals(getSuperClass(), superTypeGroup.getSuperClass()); } + @Override public int hashCode() { final PsiClass superClass = getSuperClass(); return superClass != null ? superClass .hashCode() : 0; diff --git a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java index f1ffffa04a9b..a6c17dafe147 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java @@ -265,10 +265,12 @@ public class FindUsagesTest extends JavaPsiTestCase { return endOffset - o.endOffset; } + @Override public String toString() { return fileName + "[" + startOffset + ":" + endOffset + "]"; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; diff --git a/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java b/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java index 3e4fbc7eada7..9fa4974ad70c 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java +++ b/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java @@ -81,6 +81,7 @@ class SameNamesJoiner implements TreeStructureProvider { myFile = file; } + @Override public String toString() { return myFile.getVirtualFile().getNameWithoutExtension(); } @@ -89,6 +90,7 @@ class SameNamesJoiner implements TreeStructureProvider { return myFile; } + @Override public boolean equals(Object object) { if (!(object instanceof Joined)) return false; return myFile.getVirtualFile().getNameWithoutExtension() diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java index 13df48cf875b..207d0489194d 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java @@ -29,6 +29,7 @@ public class DummyGetterTestBean { /** * Hello Claus this is DummyGetterTestBean */ + @Override public String toString() { return "DummyGetterTestBean{" + "model=" + model + diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java index 41191d70dd79..cb2ef7a7e887 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java @@ -33,6 +33,7 @@ public abstract class DummyModelTestBean { return false; } + @Override public String toString() { return "MyInnerClass{" + "title='" + title + '\'' + @@ -69,6 +70,7 @@ public abstract class DummyModelTestBean { } + @Override public String toString() { return "DummyModelTestBean{" + "age='" + age + '\'' + diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java index c4150dc5813f..4189a1f9d2ec 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java @@ -32,6 +32,7 @@ public class DummySortTestBean { private DummyTestBean bean; + @Override public String toString() { return "DummySortTestBean{" + "age=" + age + diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java index 5e5cf7fb207d..e5130d1a071c 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java @@ -63,6 +63,7 @@ public class DummyTestBean extends Config implements Serializable { } + @Override public String toString() { return "DummyTestBean{" + "tran='" + tran + '\'' + diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java index 9bbae37545e5..8600f2cf16c3 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java @@ -76,6 +76,7 @@ public class Owner { this.zip = zip; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -92,6 +93,7 @@ public class Owner { return true; } + @Override public int hashCode() { int result; result = (firstName != null ? firstName.hashCode() : 0); diff --git a/java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java index 680617b9b59f..dacef24f7ec8 100644 --- a/java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java +++ b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java @@ -44,6 +44,7 @@ public class Pet { this.birthDay = birthDay; } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -57,6 +58,7 @@ public class Pet { return true; } + @Override public int hashCode() { int result; result = name.hashCode(); @@ -65,6 +67,7 @@ public class Pet { return result; } + @Override public String toString() { return "Pet{" + "name='" + name + '\'' + diff --git a/java/openapi/src/com/intellij/util/descriptors/ConfigFileInfo.java b/java/openapi/src/com/intellij/util/descriptors/ConfigFileInfo.java index 693dcc435d16..8f01b325e817 100644 --- a/java/openapi/src/com/intellij/util/descriptors/ConfigFileInfo.java +++ b/java/openapi/src/com/intellij/util/descriptors/ConfigFileInfo.java @@ -39,6 +39,7 @@ public class ConfigFileInfo { } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -51,6 +52,7 @@ public class ConfigFileInfo { return true; } + @Override public int hashCode() { int result; result = myMetaData.hashCode(); diff --git a/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java b/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java index 31c9b305037b..497b56f696f1 100644 --- a/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java +++ b/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java @@ -80,6 +80,7 @@ public final class ConfigFileMetaData { return versions; } + @Override public String toString() { return myTitle; } diff --git a/java/testFramework/src/com/intellij/debugger/mockJDI/values/MockClassLoaderReference.java b/java/testFramework/src/com/intellij/debugger/mockJDI/values/MockClassLoaderReference.java index 4794bb63874e..7faf4872872e 100644 --- a/java/testFramework/src/com/intellij/debugger/mockJDI/values/MockClassLoaderReference.java +++ b/java/testFramework/src/com/intellij/debugger/mockJDI/values/MockClassLoaderReference.java @@ -26,6 +26,7 @@ public class MockClassLoaderReference extends MockObjectReference implements Cla throw new UnsupportedOperationException("Not implemented: \"visibleClasses\" in " + getClass().getName()); } + @Override public boolean equals(Object obj) { // For now assume that all mocked class loaders are the same return obj instanceof MockClassLoaderReference; diff --git a/jps/antLayout/src/jetbrains/antlayout/datatypes/IdeaModuleBase.java b/jps/antLayout/src/jetbrains/antlayout/datatypes/IdeaModuleBase.java index 21ed3dbb166b..2c08575fd4fb 100644 --- a/jps/antLayout/src/jetbrains/antlayout/datatypes/IdeaModuleBase.java +++ b/jps/antLayout/src/jetbrains/antlayout/datatypes/IdeaModuleBase.java @@ -64,6 +64,7 @@ public abstract class IdeaModuleBase extends LayoutFileSet { protected abstract String getKind(); + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -72,6 +73,7 @@ public abstract class IdeaModuleBase extends LayoutFileSet { return getDir(getProject()).equals(that.getDir(getProject())); } + @Override public int hashCode() { return getDir(getProject()).hashCode(); } diff --git a/jps/antLayout/src/jetbrains/antlayout/tasks/LayoutTask.java b/jps/antLayout/src/jetbrains/antlayout/tasks/LayoutTask.java index 97748dba3fad..2d8e6db76c97 100755 --- a/jps/antLayout/src/jetbrains/antlayout/tasks/LayoutTask.java +++ b/jps/antLayout/src/jetbrains/antlayout/tasks/LayoutTask.java @@ -73,6 +73,7 @@ public class LayoutTask extends Task { root.build(new TempFileFactory() { int counter = 0; + @Override public File allocateTempFile(String name) { File localTmp = new File(tempDir, "_" + counter + "/"); counter++; diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/incremental/SingleCharSequence.java b/jps/jps-builders-6/src/org/jetbrains/jps/incremental/SingleCharSequence.java index 955ccaff2ca8..a109e43df46c 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/incremental/SingleCharSequence.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/incremental/SingleCharSequence.java @@ -26,6 +26,7 @@ final class SingleCharSequence implements CharSequence { throw new RuntimeException("Method subSequence not implemented"); } + @Override public String toString() { return String.valueOf(myCh); } diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/InputFileObject.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/InputFileObject.java index 629e57032622..58e80321021e 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/InputFileObject.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/InputFileObject.java @@ -4,8 +4,7 @@ package org.jetbrains.jps.javac; import com.intellij.openapi.util.io.FileUtilRt; import org.jetbrains.annotations.NotNull; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import javax.tools.*; import java.io.*; final class InputFileObject extends JpsFileObject { @@ -57,6 +56,7 @@ final class InputFileObject extends JpsFileObject { return myFile.delete(); } + @Override protected String inferBinaryName(Iterable path, final boolean caseSensitiveFS) { final String fPath = myFile.getPath(); for (File dir: path) { diff --git a/jps/jps-builders/src/org/jetbrains/jps/ModuleChunk.java b/jps/jps-builders/src/org/jetbrains/jps/ModuleChunk.java index d5365a1820d3..3d9f9f0fd9b0 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/ModuleChunk.java +++ b/jps/jps-builders/src/org/jetbrains/jps/ModuleChunk.java @@ -70,6 +70,7 @@ public final class ModuleChunk { return myTargets; } + @Override public String toString() { return getName(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModulePackageRepr.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModulePackageRepr.java index f1cbc540f160..57b98e646335 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModulePackageRepr.java +++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModulePackageRepr.java @@ -51,6 +51,7 @@ final class ModulePackageRepr extends Proto { RW.save(myModuleNames, INT_EXTERNALIZER, out); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -61,6 +62,7 @@ final class ModulePackageRepr extends Proto { return name == ((ModulePackageRepr)o).name; } + @Override public int hashCode() { return 31 * name; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModuleRequiresRepr.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModuleRequiresRepr.java index d282a3fbd998..67f631d198eb 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModuleRequiresRepr.java +++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ModuleRequiresRepr.java @@ -96,6 +96,7 @@ final class ModuleRequiresRepr extends Proto { }; } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -106,6 +107,7 @@ final class ModuleRequiresRepr extends Proto { return name == ((ModuleRequiresRepr)o).name; } + @Override public int hashCode() { return 31 * name; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/dependency/NodeSource.java b/jps/jps-builders/src/org/jetbrains/jps/dependency/NodeSource.java index dd1d1d077023..d5219320f736 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/dependency/NodeSource.java +++ b/jps/jps-builders/src/org/jetbrains/jps/dependency/NodeSource.java @@ -7,9 +7,12 @@ package org.jetbrains.jps.dependency; */ public interface NodeSource extends ExternalizableGraphElement { + @Override boolean equals(Object other); + @Override int hashCode(); + @Override String toString(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/dependency/ReferenceID.java b/jps/jps-builders/src/org/jetbrains/jps/dependency/ReferenceID.java index c01601d0a095..24f2b76d9d14 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/dependency/ReferenceID.java +++ b/jps/jps-builders/src/org/jetbrains/jps/dependency/ReferenceID.java @@ -6,7 +6,9 @@ package org.jetbrains.jps.dependency; * For example, is a Node represents a java class, a full qualified name of the class can be used as the Node's ReferenceID */ public interface ReferenceID extends ExternalizableGraphElement { + @Override boolean equals(Object other); + @Override int hashCode(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/dependency/Usage.java b/jps/jps-builders/src/org/jetbrains/jps/dependency/Usage.java index 5802ad17d458..84daadba5a53 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/dependency/Usage.java +++ b/jps/jps-builders/src/org/jetbrains/jps/dependency/Usage.java @@ -14,7 +14,9 @@ public interface Usage extends ExternalizableGraphElement { @NotNull ReferenceID getElementOwner(); + @Override boolean equals(Object other); + @Override int hashCode(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/dependency/java/TypeRepr.java b/jps/jps-builders/src/org/jetbrains/jps/dependency/java/TypeRepr.java index 444f18fa842e..6d0f814ce843 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/dependency/java/TypeRepr.java +++ b/jps/jps-builders/src/org/jetbrains/jps/dependency/java/TypeRepr.java @@ -13,8 +13,10 @@ public abstract class TypeRepr { public abstract @NotNull String getDescriptor(); + @Override public abstract boolean equals(Object o); + @Override public abstract int hashCode(); public Iterable getUsages() { diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ExplodedDestinationInfo.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ExplodedDestinationInfo.java index dc159eda8236..e006be404248 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ExplodedDestinationInfo.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ExplodedDestinationInfo.java @@ -10,6 +10,7 @@ public final class ExplodedDestinationInfo extends DestinationInfo { super(outputPath, outputPath); } + @Override public String toString() { return getOutputPath(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java index 7ad62a41c50c..935339a1e7a9 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java @@ -31,6 +31,7 @@ public final class JarDestinationInfo extends DestinationInfo { return myJarInfo; } + @Override public String toString() { return myPathInJar + "(" + getOutputPath() + ")"; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java index da3e5f6d573a..99195f2e0318 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/BuildMessage.java @@ -44,6 +44,7 @@ public abstract class BuildMessage { return myMessageText; } + @Override public String toString() { return getMessageText(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java index 9e4e183ce85e..e0446df20ad8 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/CompilerMessage.java @@ -97,6 +97,7 @@ public class CompilerMessage extends BuildMessage { return Collections.unmodifiableCollection(myModuleNames); } + @Override public String toString() { final StringBuilder builder = new StringBuilder(); builder.append(getCompilerName()).append(":").append(getKind().name()).append(":").append(super.toString()); diff --git a/jps/model-api/src/org/jetbrains/jps/model/library/JpsMavenRepositoryLibraryDescriptor.java b/jps/model-api/src/org/jetbrains/jps/model/library/JpsMavenRepositoryLibraryDescriptor.java index 2d6fed33a959..0ec17a069468 100644 --- a/jps/model-api/src/org/jetbrains/jps/model/library/JpsMavenRepositoryLibraryDescriptor.java +++ b/jps/model-api/src/org/jetbrains/jps/model/library/JpsMavenRepositoryLibraryDescriptor.java @@ -157,6 +157,7 @@ public class JpsMavenRepositoryLibraryDescriptor { return myPackaging; } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -173,6 +174,7 @@ public class JpsMavenRepositoryLibraryDescriptor { Objects.equals(myJarRepositoryId, that.myJarRepositoryId); } + @Override public int hashCode() { return Objects.hash(myMavenId, myPackaging, myIncludeTransitiveDependencies, myExcludedDependencies, myArtifactsVerification, myJarRepositoryId); diff --git a/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java b/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java index 78b18d86a826..7374d9e3f6ce 100644 --- a/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java +++ b/jps/model-impl/src/com/intellij/openapi/fileTypes/WildcardFileNameMatcher.java @@ -102,6 +102,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher { } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -111,6 +112,7 @@ public class WildcardFileNameMatcher implements FileNameMatcher { return myPattern.equals(that.myPattern); } + @Override public int hashCode() { return myPattern.hashCode(); } diff --git a/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java b/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java index c6aed459d3c2..04e667065839 100644 --- a/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java +++ b/jps/model-serialization/src/com/intellij/openapi/components/PathMacroMap.java @@ -87,6 +87,7 @@ public abstract class PathMacroMap { return substitute(text, caseSensitive); } + @Override @ApiStatus.Internal public abstract int hashCode(); } diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectImpl.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectImpl.java index 2da228beaa78..a34e3770a853 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectImpl.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObjectImpl.java @@ -283,6 +283,7 @@ public class JsonSchemaObjectImpl extends JsonSchemaObject { }; } + @Override public @Nullable JsonSchemaType mergeTypes(@Nullable JsonSchemaType selfType, @Nullable JsonSchemaType otherType, @Nullable Set otherTypeVariants) { @@ -314,6 +315,7 @@ public class JsonSchemaObjectImpl extends JsonSchemaObject { return subtypeOfBoth; } + @Override public Set mergeTypeVariantSets(@Nullable Set self, @Nullable Set other) { if (self == null) return other; if (other == null) return self; diff --git a/libraries/microba/src/com/michaelbaranov/microba/common/MicrobaComponent.java b/libraries/microba/src/com/michaelbaranov/microba/common/MicrobaComponent.java index 59f8e266cd8a..1e7957184903 100644 --- a/libraries/microba/src/com/michaelbaranov/microba/common/MicrobaComponent.java +++ b/libraries/microba/src/com/michaelbaranov/microba/common/MicrobaComponent.java @@ -24,6 +24,7 @@ public class MicrobaComponent extends JComponent { protected Map colorOverrideMap; + @Override public ComponentUI getUI() { return ui; } @@ -32,6 +33,7 @@ public class MicrobaComponent extends JComponent { * Sets the UI delegate of this component to the corresponding UI delegate * taken from UIManager. */ + @Override public void updateUI() { ComponentUI delegate = UIManager.getUI(this); setUI(delegate); diff --git a/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java b/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java index 3a947f707668..b44870514da4 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/CharTailType.java @@ -33,6 +33,7 @@ public class CharTailType extends TailType { return insertChar(editor, tailOffset, myChar, myOverwrite); } + @Override public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof CharTailType that)) return false; @@ -42,10 +43,12 @@ public class CharTailType extends TailType { return true; } + @Override public int hashCode() { return myChar; } + @Override public @NonNls String toString() { return "CharTailType:'" + myChar + "'"; } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/TailType.java b/platform/analysis-api/src/com/intellij/codeInsight/TailType.java index 6dd43039d62c..24e016829d6b 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/TailType.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/TailType.java @@ -83,6 +83,7 @@ public abstract class TailType { return tailOffset; } + @Override public String toString() { return "NONE"; } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/TailTypes.java b/platform/analysis-api/src/com/intellij/codeInsight/TailTypes.java index 376da611ea13..cb47f8a3d72d 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/TailTypes.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/TailTypes.java @@ -16,6 +16,7 @@ public final class TailTypes { return tailOffset; } + @Override public String toString() { return "UNKNOWN"; } @@ -27,6 +28,7 @@ public final class TailTypes { return tailOffset; } + @Override public String toString() { return "NONE"; } @@ -79,6 +81,7 @@ public final class TailTypes { return moveCaret(editor, tailOffset, 3); } + @Override public String toString() { return "COND_EXPR_COLON"; } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/completion/OffsetKey.java b/platform/analysis-api/src/com/intellij/codeInsight/completion/OffsetKey.java index 4ff5871eab08..6c6c03150fc6 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/completion/OffsetKey.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/completion/OffsetKey.java @@ -12,6 +12,7 @@ public final class OffsetKey { myMovableToRight = movableToRight; } + @Override public String toString() { return myName; } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java index 9925538ac97f..55e5a11443b6 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java @@ -196,6 +196,7 @@ public final class HighlightDisplayKey { } } + @Override public String toString() { return myShortName; } diff --git a/platform/analysis-api/src/com/intellij/codeInsight/template/Result.java b/platform/analysis-api/src/com/intellij/codeInsight/template/Result.java index eddec8b5f7c1..a508166d726a 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/template/Result.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/template/Result.java @@ -10,6 +10,7 @@ import org.jetbrains.annotations.NonNls; public interface Result { boolean equalsToText (@NonNls String text, PsiElement context); + @Override String toString(); void handleFocused(final PsiFile psiFile, final Document document, final int segmentStart, final int segmentEnd); diff --git a/platform/analysis-api/src/com/intellij/codeInsight/template/TextResult.java b/platform/analysis-api/src/com/intellij/codeInsight/template/TextResult.java index e57d3046e514..911d02bdd7e2 100644 --- a/platform/analysis-api/src/com/intellij/codeInsight/template/TextResult.java +++ b/platform/analysis-api/src/com/intellij/codeInsight/template/TextResult.java @@ -24,6 +24,7 @@ public class TextResult implements Result{ return text.equals(myText); } + @Override public String toString() { return myText; } diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/QuickFixWrapper.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/QuickFixWrapper.java index f466b7285b88..3ba2df9f1183 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/ex/QuickFixWrapper.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/QuickFixWrapper.java @@ -202,6 +202,7 @@ public final class QuickFixWrapper implements IntentionAction, PriorityAction, C return element != null ? element.getContainingFile() : null; } + @Override public String toString() { return getText(); } diff --git a/platform/analysis-api/src/com/intellij/lang/annotation/Annotation.java b/platform/analysis-api/src/com/intellij/lang/annotation/Annotation.java index 242bb6fcf335..409f940412e1 100644 --- a/platform/analysis-api/src/com/intellij/lang/annotation/Annotation.java +++ b/platform/analysis-api/src/com/intellij/lang/annotation/Annotation.java @@ -471,6 +471,7 @@ public final class Annotation implements Segment { myProblemGroup = problemGroup; } + @Override public @NonNls String toString() { return "Annotation(" + "message='" + myMessage + "'" + diff --git a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java index 43571dbd1bb9..bc2bc14303b5 100644 --- a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java +++ b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyRule.java @@ -53,6 +53,7 @@ public final class DependencyRule { : AnalysisBundle.message("scope.display.name.allow.scope", toScopeName, fromScopeName); } + @Override public boolean equals(Object o) { if (!(o instanceof DependencyRule other)) return false; return getDisplayText().equals(other.getDisplayText()) && @@ -71,6 +72,7 @@ public final class DependencyRule { return null; } + @Override public int hashCode() { return getDisplayText().hashCode(); } diff --git a/platform/analysis-api/src/com/intellij/psi/Weigher.java b/platform/analysis-api/src/com/intellij/psi/Weigher.java index c8257a36736c..a4b2084c0580 100644 --- a/platform/analysis-api/src/com/intellij/psi/Weigher.java +++ b/platform/analysis-api/src/com/intellij/psi/Weigher.java @@ -21,6 +21,7 @@ public abstract class Weigher { myDebugName = debugName; } + @Override public String toString() { return myDebugName == null ? super.toString() : myDebugName; } diff --git a/platform/analysis-api/src/com/intellij/psi/WeighingComparable.java b/platform/analysis-api/src/com/intellij/psi/WeighingComparable.java index f390b65bc22e..76e9d92e40c2 100644 --- a/platform/analysis-api/src/com/intellij/psi/WeighingComparable.java +++ b/platform/analysis-api/src/com/intellij/psi/WeighingComparable.java @@ -89,6 +89,7 @@ public final class WeighingComparable implements ComparablegetFile().getTextRange()); } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java b/platform/analysis-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java index 6cb1603065ab..31bcb8cc9768 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/intention/EmptyIntentionAction.java @@ -38,6 +38,7 @@ public final class EmptyIntentionAction extends AbstractEmptyIntentionAction imp return true; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -47,6 +48,7 @@ public final class EmptyIntentionAction extends AbstractEmptyIntentionAction imp return myName.equals(that.myName); } + @Override public int hashCode() { return myName.hashCode(); } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/CommaTailType.java b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/CommaTailType.java index b0908fc2ca8b..55001907c7f0 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/CommaTailType.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/CommaTailType.java @@ -24,6 +24,7 @@ public class CommaTailType extends TailType { return tailOffset; } + @Override public String toString() { return "COMMA"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/LookupItem.java b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/LookupItem.java index 1edc3ad1b5df..324404073723 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/lookup/LookupItem.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/lookup/LookupItem.java @@ -60,6 +60,7 @@ public class LookupItem extends MutableLookupElement implements Comparable extends MutableLookupElement implements Comparable instructions = myInstructions; diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DfaInstructionState.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DfaInstructionState.java index d94a28f37c68..b40c9a42f85b 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DfaInstructionState.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DfaInstructionState.java @@ -39,6 +39,7 @@ public class DfaInstructionState implements Comparable { return myBeforeMemoryState; } + @Override public String toString() { return getInstruction().getIndex() + " " + getInstruction() + ": " + getMemoryState(); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DupInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DupInstruction.java index bde8aff4b9fd..b3a0f735ee1e 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DupInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/DupInstruction.java @@ -15,6 +15,7 @@ public class DupInstruction extends Instruction { return nextStates(interpreter, memState); } + @Override public String toString() { return "DUP"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushFieldsInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushFieldsInstruction.java index 653573b3b9b9..ce5823e8eca9 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushFieldsInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushFieldsInstruction.java @@ -16,6 +16,7 @@ public class FlushFieldsInstruction extends Instruction { return nextStates(interpreter, stateBefore); } + @Override public String toString() { return "FLUSH_ALL_FIELDS"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushVariableInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushVariableInstruction.java index 38b7055f5fdc..78489f14863a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushVariableInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/FlushVariableInstruction.java @@ -36,6 +36,7 @@ public class FlushVariableInstruction extends Instruction { return nextStates(interpreter, stateBefore); } + @Override public String toString() { return "FLUSH " + myVariable; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/GotoInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/GotoInstruction.java index 9b332e4ea25a..002a5aaa9370 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/GotoInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/GotoInstruction.java @@ -44,6 +44,7 @@ public class GotoInstruction extends Instruction { return new DfaInstructionState[]{new DfaInstructionState(nextInstruction, stateBefore)}; } + @Override public String toString() { return "GOTO " + getOffset(); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PopInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PopInstruction.java index 5a3a988116ae..f61c6ca2c735 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PopInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PopInstruction.java @@ -17,6 +17,7 @@ public class PopInstruction extends Instruction { return nextStates(interpreter, stateBefore); } + @Override public String toString() { return "POP"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushInstruction.java index fded2ff8b662..5c10c1ce7e6f 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushInstruction.java @@ -41,6 +41,7 @@ public class PushInstruction extends EvalInstruction { return myValue; } + @Override public String toString() { return "PUSH " + myValue; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushValueInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushValueInstruction.java index 910390ef6840..e2ded05e9177 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushValueInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/PushValueInstruction.java @@ -33,6 +33,7 @@ public class PushValueInstruction extends EvalInstruction { return factory.fromDfType(myValue); } + @Override public String toString() { return "PUSH_VAL " + myValue; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ResultOfInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ResultOfInstruction.java index 0890764fb304..4ea8b483cb3c 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ResultOfInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/ResultOfInstruction.java @@ -23,6 +23,7 @@ public class ResultOfInstruction extends EvalInstruction { return arguments[0]; } + @Override public String toString() { return "RESULT_OF " + getDfaAnchor(); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SpliceInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SpliceInstruction.java index 1c553474671a..daf4690d4da4 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SpliceInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SpliceInstruction.java @@ -30,6 +30,7 @@ public class SpliceInstruction extends Instruction { return new DfaInstructionState[]{new DfaInstructionState(nextInstruction, stateBefore)}; } + @Override public String toString() { return "SPLICE [" + myCount + "] -> " + Arrays.toString(myReplacement); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SwapInstruction.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SwapInstruction.java index 2dd6bafeb145..a845896e7772 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SwapInstruction.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/lang/ir/SwapInstruction.java @@ -20,6 +20,7 @@ public class SwapInstruction extends Instruction { return nextStates(interpreter, stateBefore); } + @Override public String toString() { return "SWAP"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java index 06e936fd0c18..f825eaf016b6 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/memory/DfaMemoryStateImpl.java @@ -92,6 +92,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { return copy; } + @Override public boolean equals(Object obj) { if (obj == this) return true; if (!(obj instanceof DfaMemoryStateImpl that)) return false; @@ -120,6 +121,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { } private Integer myCachedHash; + @Override public int hashCode() { if (myCachedHash != null) return myCachedHash; @@ -129,6 +131,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState { return myCachedHash = hash; } + @Override public String toString() { StringBuilder result = new StringBuilder(); result.append('<'); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaControlTransferValue.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaControlTransferValue.java index 57737137690e..ba22360a6744 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaControlTransferValue.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaControlTransferValue.java @@ -8,7 +8,6 @@ import com.intellij.psi.PsiElement; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.FList; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import one.util.streamex.StreamEx; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; @@ -30,6 +29,7 @@ public final class DfaControlTransferValue extends DfaValue { this.target = target; } + @Override public String toString() { return target + (traps.isEmpty() ? "" : " " + traps); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelation.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelation.java index 4b5a8c69ae15..e7c16715740a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelation.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelation.java @@ -49,6 +49,7 @@ public record DfaRelation(@NotNull DfaValue leftOperand, @NotNull DfaValue right return relationType == RelationType.EQ; } + @Override public @NonNls String toString() { return leftOperand + " " + relationType + " " + rightOperand; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java index 428f268ba41d..be43f8ad7150 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java @@ -103,10 +103,12 @@ public abstract class DfaValue { return false; } + @Override public boolean equals(Object obj) { return obj instanceof DfaValue && getID() == ((DfaValue)obj).getID(); } + @Override public int hashCode() { return getID(); } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java index 5b1f47338c27..2486dece9838 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java @@ -124,6 +124,7 @@ public final class DfaVariableValue extends DfaValue { return newQualifier == myQualifier ? this : myFactory.getVarFactory().createVariableValue(myDescriptor, newQualifier); } + @Override public String toString() { return (myQualifier == null ? "" : myQualifier + ".") + myDescriptor; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaWrappedValue.java b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaWrappedValue.java index 07d1816babf3..1af6bf8c876b 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaWrappedValue.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaWrappedValue.java @@ -28,6 +28,7 @@ public final class DfaWrappedValue extends DfaValue { myType = type; } + @Override public @NonNls String toString() { return myType + " [with " + myDerivedVariableDescriptor + "=" + myWrappedValue + "]"; } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java index 9bead75f8737..19d7eed05b52 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefEntityImpl.java @@ -195,6 +195,7 @@ public abstract class RefEntityImpl extends UserDataHolderBase implements RefEnt } } + @Override public String toString() { return getName(); } diff --git a/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java b/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java index 316786e3be93..abb9c7a91f44 100644 --- a/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java +++ b/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java @@ -166,6 +166,7 @@ public class PsiDynaReference extends PsiReferenceBase return list.toArray(LocalQuickFix.EMPTY_ARRAY); } + @Override public String toString() { //noinspection HardCodedStringLiteral return "PsiDynaReference containing " + myReferences; diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java index 7cd1076faf92..3136460c2c27 100644 --- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java +++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java @@ -177,6 +177,7 @@ public class FileReferenceSet implements FileReferenceSetParameters { reparse(); } + @Override public @NotNull PsiElement getElement() { return myElement; } diff --git a/platform/code-style-api/src/com/intellij/formatting/Indent.java b/platform/code-style-api/src/com/intellij/formatting/Indent.java index 20cfb7b0afcc..83a7d99e813b 100644 --- a/platform/code-style-api/src/com/intellij/formatting/Indent.java +++ b/platform/code-style-api/src/com/intellij/formatting/Indent.java @@ -1,9 +1,9 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.formatting; +import org.jetbrains.annotations.ApiStatus.Experimental; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.ApiStatus.Experimental; /** * The indent setting for a formatting model block. Indicates how the block is indented @@ -309,6 +309,7 @@ public abstract class Indent { @Experimental public static final Type OUTDENT_SPACES = new Type("OUTDENT_SPACES"); + @Override public String toString() { return myName; } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index 3838c3e59fa5..90781aee3a12 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -141,6 +141,7 @@ public class CodeStyleSettings extends LegacyCodeStyleSettings implements Clonea * For short-lived temporary settings use {@code CodeStyle.doWithTemporarySettings(project,baseSettings,modifier,runnable}, * for permanently created settings use {@link CodeStyleSettingsManager#cloneSettings(CodeStyleSettings)} */ + @Override @Deprecated public CodeStyleSettings clone() { CodeStyleSettings clone = new CodeStyleSettings(true, true); diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/ExcludedFiles.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/ExcludedFiles.java index 995d4f88dbcb..a0358906e16c 100644 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/ExcludedFiles.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/ExcludedFiles.java @@ -76,6 +76,7 @@ public class ExcludedFiles { }); } + @Override public boolean equals(@NotNull Object o) { return o instanceof ExcludedFiles && myDescriptors.equals(((ExcludedFiles)o).myDescriptors); } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntry.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntry.java index 84344f959ad8..c7f14ebd4150 100755 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntry.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntry.java @@ -42,6 +42,7 @@ public class PackageEntry { return false; } + @Override public boolean equals(Object obj) { if (!(obj instanceof PackageEntry entry)) { return false; @@ -51,6 +52,7 @@ public class PackageEntry { && Objects.equals(entry.myPackageName, myPackageName); } + @Override public int hashCode() { return myPackageName.hashCode(); } diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java index fd62d50ebf97..60ebc032ef9c 100755 --- a/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java +++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java @@ -29,6 +29,7 @@ import java.util.List; public class PackageEntryTable implements JDOMExternalizable, Cloneable { private final List myEntries = new ArrayList<>(); + @Override public boolean equals(Object obj) { if (!(obj instanceof PackageEntryTable other)) { return false; @@ -46,6 +47,7 @@ public class PackageEntryTable implements JDOMExternalizable, Cloneable { return true; } + @Override public int hashCode() { if (!myEntries.isEmpty() && myEntries.get(0) != null) { return myEntries.get(0).hashCode(); diff --git a/platform/code-style-impl/src/com/intellij/formatting/IndentInside.java b/platform/code-style-impl/src/com/intellij/formatting/IndentInside.java index 58cd550974f2..444346b4a065 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/IndentInside.java +++ b/platform/code-style-impl/src/com/intellij/formatting/IndentInside.java @@ -21,6 +21,7 @@ public final class IndentInside { this.tabs = tabs; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -31,6 +32,7 @@ public final class IndentInside { return whiteSpaces == indent.whiteSpaces; } + @Override public int hashCode() { int result; result = whiteSpaces; diff --git a/platform/code-style-impl/src/com/intellij/formatting/WrapImpl.java b/platform/code-style-impl/src/com/intellij/formatting/WrapImpl.java index 1a7d5885ed66..5ef21f25b5be 100644 --- a/platform/code-style-impl/src/com/intellij/formatting/WrapImpl.java +++ b/platform/code-style-impl/src/com/intellij/formatting/WrapImpl.java @@ -190,6 +190,7 @@ public final class WrapImpl extends Wrap { return (myFlags & ACTIVE_MASK) != 0; } + @Override public String toString() { return getType().toString(); } diff --git a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java index 115cabff8525..7587381f5215 100644 --- a/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java +++ b/platform/code-style-impl/src/com/intellij/psi/impl/source/codeStyle/IndentImpl.java @@ -29,6 +29,7 @@ public final class IndentImpl implements Indent{ return mySpaceCount; } + @Override public boolean equals(Object o) { if (!(o instanceof IndentImpl indent)) return false; @@ -39,6 +40,7 @@ public final class IndentImpl implements Indent{ return true; } + @Override public int hashCode() { return myIndentLevel + mySpaceCount; } diff --git a/platform/core-api/src/com/intellij/model/Symbol.java b/platform/core-api/src/com/intellij/model/Symbol.java index a8d1bc53563a..5fd46d80a12a 100644 --- a/platform/core-api/src/com/intellij/model/Symbol.java +++ b/platform/core-api/src/com/intellij/model/Symbol.java @@ -29,7 +29,9 @@ public interface Symbol { * The platform will also check the equality when several concurrent computations * return different instances but only one instance should be cached. */ + @Override boolean equals(Object obj); + @Override int hashCode(); } diff --git a/platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileContentChangeEvent.java b/platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileContentChangeEvent.java index ba624751f72e..81e9a8cf837d 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileContentChangeEvent.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/newvfs/events/VFileContentChangeEvent.java @@ -87,6 +87,7 @@ public final class VFileContentChangeEvent extends VFileEvent { myOldLength != UNDEFINED_TIMESTAMP_OR_LENGTH || myNewLength != UNDEFINED_TIMESTAMP_OR_LENGTH; } + @Override public String toString() { return "VfsEvent[update: " + myFile.getPresentableUrl() + ", oldTimestamp:" + myOldTimestamp + ", newTimestamp:" + myNewTimestamp + @@ -110,6 +111,7 @@ public final class VFileContentChangeEvent extends VFileEvent { return myFile.isValid() && myFile.getModificationStamp() == myOldModificationStamp; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -123,6 +125,7 @@ public final class VFileContentChangeEvent extends VFileEvent { return true; } + @Override public int hashCode() { int result = myFile.hashCode(); result = 31 * result + Long.hashCode(myOldModificationStamp); diff --git a/platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java b/platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java index 95d08c4c3402..71487f0dbca9 100644 --- a/platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java +++ b/platform/core-api/src/com/intellij/patterns/ElementPatternCondition.java @@ -28,6 +28,7 @@ public final class ElementPatternCondition { conditions.add(condition); } + @Override public String toString() { StringBuilder builder = new StringBuilder(); append(builder, ""); diff --git a/platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java b/platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java index 6de3268f7ba3..10c3b589a3b3 100644 --- a/platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java +++ b/platform/core-api/src/com/intellij/patterns/InitialPatternCondition.java @@ -21,6 +21,7 @@ public abstract class InitialPatternCondition { return myAcceptedClass.isInstance(o); } + @Override public final @NonNls String toString() { StringBuilder builder = new StringBuilder(); append(builder, ""); diff --git a/platform/core-api/src/com/intellij/patterns/ObjectPattern.java b/platform/core-api/src/com/intellij/patterns/ObjectPattern.java index 0695f920eae3..a8cbb60a831d 100644 --- a/platform/core-api/src/com/intellij/patterns/ObjectPattern.java +++ b/platform/core-api/src/com/intellij/patterns/ObjectPattern.java @@ -214,6 +214,7 @@ public abstract class ObjectPattern> impl }); } + @Override public String toString() { return getCondition().toString(); } diff --git a/platform/core-api/src/com/intellij/patterns/PatternCondition.java b/platform/core-api/src/com/intellij/patterns/PatternCondition.java index 9fa7c0759dac..bfab9e116038 100644 --- a/platform/core-api/src/com/intellij/patterns/PatternCondition.java +++ b/platform/core-api/src/com/intellij/patterns/PatternCondition.java @@ -56,6 +56,7 @@ public abstract class PatternCondition { public abstract boolean accepts(@NotNull T t, final ProcessingContext context); + @Override public @NonNls String toString() { final StringBuilder builder = new StringBuilder(); append(builder, ""); diff --git a/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java b/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java index 1e1605b5e866..0ccfe8282d5d 100644 --- a/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java +++ b/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java @@ -39,6 +39,7 @@ public class PsiElementResolveResult implements ResolveResult{ return myValidResult; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -50,10 +51,12 @@ public class PsiElementResolveResult implements ResolveResult{ return true; } + @Override public int hashCode() { return myElement.hashCode(); } + @Override public @NonNls String toString() { return "PsiElementResolveResult with " + myElement.getClass() + ": " + (myElement instanceof PsiNamedElement ? ((PsiNamedElement)myElement).getName() : myElement.getText()); diff --git a/platform/core-api/src/com/intellij/psi/filters/ElementFilter.java b/platform/core-api/src/com/intellij/psi/filters/ElementFilter.java index ad5fd0bac967..1552367c1b02 100644 --- a/platform/core-api/src/com/intellij/psi/filters/ElementFilter.java +++ b/platform/core-api/src/com/intellij/psi/filters/ElementFilter.java @@ -39,5 +39,6 @@ public interface ElementFilter { boolean isClassAcceptable(Class hintClass); // To be used only for debug purposes! + @Override String toString(); } \ No newline at end of file diff --git a/platform/core-api/src/com/intellij/psi/filters/position/FilterPattern.java b/platform/core-api/src/com/intellij/psi/filters/position/FilterPattern.java index 28c5b33d1a2c..a50fed94a85e 100644 --- a/platform/core-api/src/com/intellij/psi/filters/position/FilterPattern.java +++ b/platform/core-api/src/com/intellij/psi/filters/position/FilterPattern.java @@ -24,6 +24,7 @@ public class FilterPattern extends ObjectPattern { myFilter = filter; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof FilterPattern)) return false; @@ -35,6 +36,7 @@ public class FilterPattern extends ObjectPattern { return true; } + @Override public int hashCode() { return myFilter != null ? myFilter.hashCode() : 0; } diff --git a/platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java b/platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java index bea0d2325632..e1a00ef76e3b 100644 --- a/platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java +++ b/platform/core-api/src/com/intellij/psi/filters/position/PatternFilter.java @@ -37,6 +37,7 @@ public class PatternFilter implements ElementFilter { //throw new UnsupportedOperationException("Method isClassAcceptable is not yet implemented in " + getClass().getName()); } + @Override public String toString() { return myPattern.toString(); } diff --git a/platform/core-impl/src/com/intellij/codeInsight/controlflow/impl/InstructionBaseImpl.java b/platform/core-impl/src/com/intellij/codeInsight/controlflow/impl/InstructionBaseImpl.java index d5a0b5117926..0dd79228b708 100644 --- a/platform/core-impl/src/com/intellij/codeInsight/controlflow/impl/InstructionBaseImpl.java +++ b/platform/core-impl/src/com/intellij/codeInsight/controlflow/impl/InstructionBaseImpl.java @@ -35,6 +35,7 @@ public abstract class InstructionBaseImpl implements Instruction { return myPred; } + @Override public @NotNull String toString() { final StringBuilder builder = new StringBuilder(id()); builder.append("("); diff --git a/platform/core-impl/src/com/intellij/ide/highlighter/custom/SyntaxTable.java b/platform/core-impl/src/com/intellij/ide/highlighter/custom/SyntaxTable.java index f5e36ceb6a4e..607dfa431250 100644 --- a/platform/core-impl/src/com/intellij/ide/highlighter/custom/SyntaxTable.java +++ b/platform/core-impl/src/com/intellij/ide/highlighter/custom/SyntaxTable.java @@ -154,6 +154,7 @@ public final class SyntaxTable implements Cloneable { myHasBraces = hasBraces; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof SyntaxTable)) return false; @@ -180,6 +181,7 @@ public final class SyntaxTable implements Cloneable { return true; } + @Override public int hashCode() { return myKeywords1.hashCode(); } diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java index 65fb1e0d9309..d836ddb8f910 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ModalityStateEx.java @@ -87,6 +87,7 @@ public final class ModalityStateEx extends ModalityState { } } + @Override @SuppressWarnings("deprecation") public @NonNls String toString() { return this == NON_MODAL diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java index b6386e26b9b2..a9f31f60743d 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java @@ -238,6 +238,7 @@ abstract class IntervalTreeImpl extends RedBlackTree implements IntervalTr } } + @Override public void setRange(long scalarRange) { myRange = scalarRange; } diff --git a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java index 6b2edaf7f7e8..f01b220ac278 100644 --- a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java +++ b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java @@ -144,6 +144,7 @@ public class TreeChangeEventImpl implements TreeChangeEvent{ } } + @Override public String toString() { return new ArrayList<>(myChangedElements.values()).toString(); } diff --git a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeImpl.java b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeImpl.java index a8991969b24b..1639c22ca4d7 100644 --- a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeImpl.java +++ b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeImpl.java @@ -160,6 +160,7 @@ public class TreeChangeImpl implements TreeChange, Comparable { return new ArrayList<>(myInitialLengths.keySet()); } + @Override public String toString() { return myParent + ": " + getAllChanges().values(); } diff --git a/platform/core-impl/src/com/intellij/psi/PsiAnchor.java b/platform/core-impl/src/com/intellij/psi/PsiAnchor.java index b7f704cf7d57..820d2b9642c7 100644 --- a/platform/core-impl/src/com/intellij/psi/PsiAnchor.java +++ b/platform/core-impl/src/com/intellij/psi/PsiAnchor.java @@ -221,6 +221,7 @@ public abstract class PsiAnchor implements Pointer { return myEndOffset; } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof TreeRangeReference)) return false; @@ -233,6 +234,7 @@ public abstract class PsiAnchor implements Pointer { myVirtualFile.equals(that.myVirtualFile); } + @Override public int hashCode() { int result = myInfo.hashCode(); result = 31 * result + myStartOffset; @@ -277,6 +279,7 @@ public abstract class PsiAnchor implements Pointer { } + @Override public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof HardReference)) return false; @@ -286,6 +289,7 @@ public abstract class PsiAnchor implements Pointer { return myElement.equals(that.myElement); } + @Override public int hashCode() { return myElement.hashCode(); } diff --git a/platform/core-impl/src/com/intellij/psi/ReferenceProviderType.java b/platform/core-impl/src/com/intellij/psi/ReferenceProviderType.java index b47afa5952af..fe9a067d859d 100644 --- a/platform/core-impl/src/com/intellij/psi/ReferenceProviderType.java +++ b/platform/core-impl/src/com/intellij/psi/ReferenceProviderType.java @@ -33,6 +33,7 @@ public final class ReferenceProviderType { return new CompositePsiReferenceProvider(this); } + @Override public String toString() { return myId; } diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java index 77336695bbee..bd4395edd96b 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java +++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java @@ -41,12 +41,14 @@ public abstract class PsiPackageBase extends PsiElementBase implements PsiDirect myQualifiedName = qualifiedName; } + @Override public boolean equals(Object o) { return o != null && getClass() == o.getClass() && myManager == ((PsiPackageBase)o).myManager && myQualifiedName.equals(((PsiPackageBase)o).myQualifiedName); } + @Override public int hashCode() { return myQualifiedName.hashCode(); } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizableReferenceProvider.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizableReferenceProvider.java index 763496b2fe34..f765b44f7adc 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizableReferenceProvider.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizableReferenceProvider.java @@ -44,6 +44,7 @@ public interface CustomizableReferenceProvider { myOptionDescription = optionDescription; } + @Override public String toString() { return myOptionDescription; } /** @noinspection unchecked*/ diff --git a/platform/core-impl/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java b/platform/core-impl/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java index 23b2a05e9bd0..53dee59c28bd 100644 --- a/platform/core-impl/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java +++ b/platform/core-impl/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java @@ -43,6 +43,7 @@ final class CachingConstructorInjectionComponentAdapter implements ComponentAdap return componentImplementation; } + @Override public String toString() { return getClass().getName() + "[" + key + "]"; } diff --git a/platform/core-impl/src/com/intellij/util/pico/DefaultPicoContainer.java b/platform/core-impl/src/com/intellij/util/pico/DefaultPicoContainer.java index 73028f52d399..bfc1ee77fd1e 100644 --- a/platform/core-impl/src/com/intellij/util/pico/DefaultPicoContainer.java +++ b/platform/core-impl/src/com/intellij/util/pico/DefaultPicoContainer.java @@ -255,6 +255,7 @@ public class DefaultPicoContainer implements MutablePicoContainer { return componentInstance.getClass(); } + @Override public String toString() { return getClass().getName() + "[" + getComponentKey() + "]"; } diff --git a/platform/core-ui/src/ui/OffsetIcon.java b/platform/core-ui/src/ui/OffsetIcon.java index efee5847506f..f4d09f9c7636 100644 --- a/platform/core-ui/src/ui/OffsetIcon.java +++ b/platform/core-ui/src/ui/OffsetIcon.java @@ -69,10 +69,12 @@ public final class OffsetIcon extends JBCachingScalableIcon { return myOffset; } + @Override public int hashCode() { return myOffset + myIcon.hashCode(); } + @Override public boolean equals(Object obj) { if (obj == this) return true; if (obj instanceof OffsetIcon icon) { diff --git a/platform/core-ui/src/ui/SimpleColoredText.java b/platform/core-ui/src/ui/SimpleColoredText.java index 843515508941..6aaaac71a78a 100644 --- a/platform/core-ui/src/ui/SimpleColoredText.java +++ b/platform/core-ui/src/ui/SimpleColoredText.java @@ -52,6 +52,7 @@ public class SimpleColoredText implements ColoredTextContainer { } } + @Override public @Nls String toString() { if (myCachedToString == null) { myCachedToString = String.join("", myTexts); diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java index 96096b36ebe3..0bb04a1602ba 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java @@ -546,6 +546,7 @@ public final class DiffDividerDrawUtil { } } + @Override public String toString() { return "<" + myStart1 + ", " + myEnd1 + " : " + myStart2 + ", " + myEnd2 + "> " + myFillColor + ", " + myBorderColor; } @@ -573,6 +574,7 @@ public final class DiffDividerDrawUtil { DiffLineSeparatorRenderer.drawConnectorLine(g, 0, width, myStart1, myStart2, myEnd1 - myStart1, myIsHovered, myScheme); } + @Override public String toString() { return "<" + myStart1 + ", " + myEnd1 + " : " + myStart2 + ", " + myEnd2 + "> "; } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java index b5e023cfd33b..78218d0e514d 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/util/PsiFragment.java @@ -189,6 +189,7 @@ public abstract class PsiFragment { } //debug only + @Override public String toString() { StringBuilder buffer = new StringBuilder(); @@ -203,6 +204,7 @@ public abstract class PsiFragment { return buffer.toString(); } + @Override public boolean equals(Object o) { if (o == this) return true; if (!(o instanceof PsiFragment other)) return false; @@ -212,6 +214,7 @@ public abstract class PsiFragment { Comparing.equal(other.getFile(), getFile()); } + @Override public int hashCode() { int result = getStartOffset(); result += 31 * result + getEndOffset(); diff --git a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java index b0a12fc19b59..d57fc4823685 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java +++ b/platform/editor-ui-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java @@ -47,6 +47,7 @@ public interface Sorter extends TreeAction { return true; } + @Override public @NonNls String toString() { return getName(); } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/LogicalPosition.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/LogicalPosition.java index 91b3ab32dde2..6f059798c598 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/LogicalPosition.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/LogicalPosition.java @@ -74,16 +74,19 @@ public class LogicalPosition implements Comparable { return new LogicalPosition(line, column, value); } + @Override public boolean equals(Object o) { if (!(o instanceof LogicalPosition logicalPosition)) return false; return column == logicalPosition.column && line == logicalPosition.line; } + @Override public int hashCode() { return 29 * line + column; } + @Override public @NonNls String toString() { return "LogicalPosition: (" + line + ", " + column + ")" + (leansForward ? "; leans forward" : ""); diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java index d3d1e1e83ff8..edd0598defe8 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/VisualPosition.java @@ -74,6 +74,7 @@ public final class VisualPosition { return new VisualPosition(line, column, value); } + @Override public @NonNls String toString() { return "VisualPosition: (" + line + ", " + column + ")" + (leansRight ? " leans right" : ""); } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorMouseEventArea.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorMouseEventArea.java index b37496e319f3..00b0fe45f540 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorMouseEventArea.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/event/EditorMouseEventArea.java @@ -16,6 +16,7 @@ public final class EditorMouseEventArea { myDebugName = debugName; } + @Override public @NonNls String toString() { return myDebugName; } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusImpl.java b/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusImpl.java index d128f3405300..2ae671c1837a 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusImpl.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/vcs/FileStatusImpl.java @@ -24,6 +24,7 @@ final class FileStatusImpl implements FileStatus { myTextSupplier = textSupplier; } + @Override public @NonNls String toString() { return myStatus; } diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java index 6863cea3114b..a7b4df9ea35f 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java @@ -338,6 +338,7 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement return this; } + @Override public @NonNls String toString() { return getName(); } diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java index 0accf868a7dd..1fda30f4ce5d 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternOccurrenceImpl.java @@ -47,10 +47,12 @@ final class IndexPatternOccurrenceImpl implements IndexPatternOccurrence { return myPattern; } + @Override public int hashCode(){ return myFile.hashCode()+myStartOffset+myEndOffset+myPattern.hashCode(); } + @Override public boolean equals(Object obj){ if(!(obj instanceof IndexPatternOccurrenceImpl todoItem)){ return false; diff --git a/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java b/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java index 4e72c1279ac1..cad308a5de34 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java @@ -308,6 +308,7 @@ public class StopAction extends DumbAwareAction implements ActionRemotePermissio this.hasSeparator = hasSeparator; } + @Override public String toString() { return displayName; } diff --git a/platform/execution-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java b/platform/execution-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java index 6f91631962ca..7182f6bd2c82 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java @@ -84,6 +84,7 @@ public final class UnknownBeforeRunTaskProvider extends BeforeRunTaskProvider> implements Clone } } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -81,6 +82,7 @@ public abstract class BeforeRunTask> implements Clone return true; } + @Override public int hashCode() { return 31 * myProviderId.hashCode() + (myIsEnabled ? 1 : 0); } diff --git a/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java b/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java index 02af671b6df2..9bcd292b81f2 100644 --- a/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java +++ b/platform/execution/src/com/intellij/execution/RunnerAndConfigurationSettings.java @@ -279,5 +279,6 @@ public interface RunnerAndConfigurationSettings { */ @Nullable String getFolderName(); + @Override @NlsSafe String toString(); } diff --git a/platform/execution/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/execution/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java index f11144e4b87c..6fd8cb46e07e 100644 --- a/platform/execution/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java +++ b/platform/execution/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java @@ -237,10 +237,12 @@ public abstract class ModuleBasedConfiguration= myColumn && cell < myColumn + myColSpan; } + @Override public String toString() { //noinspection HardCodedStringLiteral return "GridConstraints (row=" + myRow + ", col=" + myColumn + ", rowspan=" + myRowSpan + ", colspan=" + myColSpan + ")"; diff --git a/platform/forms_rt/src/com/intellij/uiDesigner/core/GridLayoutManager.java b/platform/forms_rt/src/com/intellij/uiDesigner/core/GridLayoutManager.java index 746edeb9a374..8443ee1e0a7d 100644 --- a/platform/forms_rt/src/com/intellij/uiDesigner/core/GridLayoutManager.java +++ b/platform/forms_rt/src/com/intellij/uiDesigner/core/GridLayoutManager.java @@ -129,6 +129,7 @@ public final class GridLayoutManager extends AbstractLayout { mySameSizeVertically = sameSizeVertically; } + @Override public void addLayoutComponent(final Component comp, final Object constraints) { final GridConstraints c = (GridConstraints)constraints; final int row = c.getRow(); @@ -205,10 +206,12 @@ public final class GridLayoutManager extends AbstractLayout { myColumnStretches[columnIndex] = stretch; } + @Override public Dimension maximumLayoutSize(final Container target) { return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); } + @Override public Dimension minimumLayoutSize(final Container container) { validateInfos(container); @@ -259,6 +262,7 @@ public final class GridLayoutManager extends AbstractLayout { return widths; } + @Override public Dimension preferredLayoutSize(final Container container) { validateInfos(container); @@ -385,6 +389,7 @@ public final class GridLayoutManager extends AbstractLayout { return true; } + @Override public void layoutContainer(final Container container) { validateInfos(container); @@ -568,6 +573,7 @@ public final class GridLayoutManager extends AbstractLayout { return skipLayout; } + @Override public void invalidateLayout(final Container container) { myLayoutState = null; myHorizontalInfo = null; diff --git a/platform/forms_rt/src/com/intellij/uiDesigner/core/HorizontalInfo.java b/platform/forms_rt/src/com/intellij/uiDesigner/core/HorizontalInfo.java index 76a736c3330b..34b367dacc06 100644 --- a/platform/forms_rt/src/com/intellij/uiDesigner/core/HorizontalInfo.java +++ b/platform/forms_rt/src/com/intellij/uiDesigner/core/HorizontalInfo.java @@ -20,34 +20,42 @@ final class HorizontalInfo extends DimensionInfo{ super(layoutState, gap); } + @Override protected int getOriginalCell(final GridConstraints constraints){ return constraints.getColumn(); } + @Override protected int getOriginalSpan(final GridConstraints constraints){ return constraints.getColSpan(); } + @Override int getSizePolicy(final int componentIndex){ return myLayoutState.getConstraints(componentIndex).getHSizePolicy(); } + @Override int getChildLayoutCellCount(final GridLayoutManager childLayout) { return childLayout.getColumnCount(); } + @Override public int getMinimumWidth(final int componentIndex){ return getMinimumSize(componentIndex).width; } + @Override public DimensionInfo getDimensionInfo(GridLayoutManager grid) { return grid.myHorizontalInfo; } + @Override public int getCellCount(){ return myLayoutState.getColumnCount(); } + @Override public int getPreferredWidth(final int componentIndex){ return getPreferredSize(componentIndex).width; } diff --git a/platform/forms_rt/src/com/intellij/uiDesigner/core/Spacer.java b/platform/forms_rt/src/com/intellij/uiDesigner/core/Spacer.java index 66cc537748fe..b79572073276 100644 --- a/platform/forms_rt/src/com/intellij/uiDesigner/core/Spacer.java +++ b/platform/forms_rt/src/com/intellij/uiDesigner/core/Spacer.java @@ -19,10 +19,12 @@ import javax.swing.*; import java.awt.*; public class Spacer extends JComponent{ + @Override public Dimension getMinimumSize(){ return new Dimension(0, 0); } + @Override public final Dimension getPreferredSize(){ return getMinimumSize(); } diff --git a/platform/forms_rt/src/com/intellij/uiDesigner/core/VerticalInfo.java b/platform/forms_rt/src/com/intellij/uiDesigner/core/VerticalInfo.java index 8f35c553a391..f373d0976063 100644 --- a/platform/forms_rt/src/com/intellij/uiDesigner/core/VerticalInfo.java +++ b/platform/forms_rt/src/com/intellij/uiDesigner/core/VerticalInfo.java @@ -20,34 +20,42 @@ final class VerticalInfo extends DimensionInfo { super(layoutState, gap); } + @Override protected int getOriginalCell(final GridConstraints constraints){ return constraints.getRow(); } + @Override protected int getOriginalSpan(final GridConstraints constraints){ return constraints.getRowSpan(); } + @Override int getSizePolicy(final int componentIndex){ return myLayoutState.getConstraints(componentIndex).getVSizePolicy(); } + @Override int getChildLayoutCellCount(final GridLayoutManager childLayout) { return childLayout.getRowCount(); } + @Override public int getMinimumWidth(final int componentIndex){ return getMinimumSize(componentIndex).height; } + @Override public DimensionInfo getDimensionInfo(GridLayoutManager grid) { return grid.myVerticalInfo; } + @Override public int getCellCount(){ return myLayoutState.getRowCount(); } + @Override public int getPreferredWidth(final int componentIndex){ return getPreferredSize(componentIndex).height; } diff --git a/platform/ide-core/src/com/intellij/execution/ui/ConsoleViewContentType.java b/platform/ide-core/src/com/intellij/execution/ui/ConsoleViewContentType.java index 2dffb47dd12c..c1b85df00abc 100644 --- a/platform/ide-core/src/com/intellij/execution/ui/ConsoleViewContentType.java +++ b/platform/ide-core/src/com/intellij/execution/ui/ConsoleViewContentType.java @@ -72,6 +72,7 @@ public class ConsoleViewContentType { return myName; } + @Override public String toString() { return myName; } diff --git a/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryDownloadInfo.java b/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryDownloadInfo.java index aabd623c34ba..ec254362cef1 100644 --- a/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryDownloadInfo.java +++ b/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryDownloadInfo.java @@ -86,6 +86,7 @@ public class LibraryDownloadInfo { return myPresentableUrl != null ? myPresentableUrl : mirror; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -101,6 +102,7 @@ public class LibraryDownloadInfo { return true; } + @Override public int hashCode() { int result = myRemoteRepository != null ? myRemoteRepository.hashCode() : 0; result = 31 * result + (myRelativeDownloadUrl != null ? myRelativeDownloadUrl.hashCode() : 0); diff --git a/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryInfo.java b/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryInfo.java index 887049ab30f5..9f0c038c9002 100644 --- a/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryInfo.java +++ b/platform/ide-core/src/com/intellij/facet/ui/libraries/LibraryInfo.java @@ -53,6 +53,7 @@ public class LibraryInfo { return myDownloadInfo; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -66,6 +67,7 @@ public class LibraryInfo { return true; } + @Override public int hashCode() { int result; result = (myDownloadInfo != null ? myDownloadInfo.hashCode() : 0); diff --git a/platform/ide-core/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java b/platform/ide-core/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java index 24f1802d1cfa..6fd48a637b70 100644 --- a/platform/ide-core/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java +++ b/platform/ide-core/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java @@ -36,6 +36,7 @@ public class RemoteRepositoryInfo { return myMirrors[0]; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -45,6 +46,7 @@ public class RemoteRepositoryInfo { } + @Override public int hashCode() { return myId.hashCode(); } diff --git a/platform/ide-core/src/com/intellij/openapi/fileEditor/TextEditorLocation.java b/platform/ide-core/src/com/intellij/openapi/fileEditor/TextEditorLocation.java index 51be09392cba..20f3be09a27b 100644 --- a/platform/ide-core/src/com/intellij/openapi/fileEditor/TextEditorLocation.java +++ b/platform/ide-core/src/com/intellij/openapi/fileEditor/TextEditorLocation.java @@ -38,6 +38,7 @@ public final class TextEditorLocation implements FileEditorLocation { return myPosition.compareTo(otherLocation.myPosition); } + @Override public String toString() { return myPosition.toString(); } diff --git a/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowAnchor.java b/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowAnchor.java index 76407af2f3b7..3c978dcadef2 100644 --- a/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowAnchor.java +++ b/platform/ide-core/src/com/intellij/openapi/wm/ToolWindowAnchor.java @@ -33,6 +33,7 @@ public final class ToolWindowAnchor { myText = text; } + @Override public @NotNull String toString() { return myText; } diff --git a/platform/indexing-api/src/com/intellij/lang/cacheBuilder/WordOccurrence.java b/platform/indexing-api/src/com/intellij/lang/cacheBuilder/WordOccurrence.java index ea28863d3a19..291823511325 100644 --- a/platform/indexing-api/src/com/intellij/lang/cacheBuilder/WordOccurrence.java +++ b/platform/indexing-api/src/com/intellij/lang/cacheBuilder/WordOccurrence.java @@ -92,6 +92,7 @@ public final class WordOccurrence { myName = name; } + @Override @NonNls public String toString() { return "WordOccurrence.Kind(" + myName + ")"; diff --git a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java index 92bc37b0fa4c..2ed8895026b3 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java +++ b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java @@ -77,10 +77,12 @@ public final class TodoPattern implements Cloneable { element.setAttribute(PATTERN_ATT, myIndexPattern.getPatternString()); } + @Override public boolean equals(Object o) { return this == o || o instanceof TodoPattern that && myIndexPattern.equals(that.myIndexPattern) && myAttributes.equals(that.myAttributes); } + @Override public int hashCode() { return myIndexPattern.hashCode() * 31 + myAttributes.hashCode(); } diff --git a/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java b/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java index 3286b087e3af..ca3683b051f5 100644 --- a/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java +++ b/platform/indexing-api/src/com/intellij/util/xml/XmlFileHeader.java @@ -48,11 +48,13 @@ public class XmlFileHeader { return mySystemId; } + @Override @NonNls public String toString() { return "XmlFileHeader: name=" + myRootTagLocalName + "; namespace=" + myRootTagNamespace + "; publicId=" + myPublicId + "; systemId=" + mySystemId; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (!(o instanceof XmlFileHeader header)) return false; @@ -67,6 +69,7 @@ public class XmlFileHeader { return true; } + @Override public int hashCode() { int result; result = (myRootTagLocalName != null ? myRootTagLocalName.hashCode() : 0); diff --git a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java index df0673d10293..c481a47b2094 100644 --- a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java +++ b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java @@ -138,10 +138,12 @@ public final class TodoFilter implements Cloneable { } } + @Override public int hashCode() { return myName.hashCode() * 31 + myTodoPatterns.hashCode(); } + @Override public boolean equals(Object obj) { return obj instanceof TodoFilter filter && myName.equals(filter.myName) && diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java index bfcd9cab6830..cafabe82e48b 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndexEntry.java @@ -18,6 +18,7 @@ public final class TodoIndexEntry { this.caseSensitive = caseSensitive; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -27,6 +28,7 @@ public final class TodoIndexEntry { return caseSensitive == that.caseSensitive && pattern.equals(that.pattern); } + @Override public int hashCode() { int result = pattern.hashCode(); result = 31 * result + (caseSensitive ? 1 : 0); diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java index a5af3dac6547..8e16695db9cf 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/TodoItemImpl.java @@ -48,10 +48,12 @@ public final class TodoItemImpl implements TodoItem { return myPattern; } + @Override public int hashCode() { return myFile.hashCode() + myStartOffset + myEndOffset + (myPattern != null ? myPattern.hashCode() : 0); } + @Override public boolean equals(Object obj){ if(!(obj instanceof TodoItemImpl todoItem)){ return false; diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/diagnostic/IndexLookupTimingsReporting.java b/platform/indexing-impl/src/com/intellij/util/indexing/diagnostic/IndexLookupTimingsReporting.java index 5424d2a89b87..cbd5de01b428 100644 --- a/platform/indexing-impl/src/com/intellij/util/indexing/diagnostic/IndexLookupTimingsReporting.java +++ b/platform/indexing-impl/src/com/intellij/util/indexing/diagnostic/IndexLookupTimingsReporting.java @@ -412,6 +412,7 @@ public final class IndexLookupTimingsReporting { return typeSafeThis(); } + @Override public String toString() { return getClass().getSimpleName() + "{indexId=" + indexId + diff --git a/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineRange.java b/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineRange.java index 19d22746d680..8b30f7973b8c 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineRange.java +++ b/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineRange.java @@ -37,6 +37,7 @@ public class LineRange { this(element, element); } + @Override public @NonNls String toString() { return "line range: ["+startLine+"-"+endLine+"]"; } diff --git a/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObject.java b/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObject.java index 0e41e179207a..47b3d8ec6988 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObject.java +++ b/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObject.java @@ -26,7 +26,9 @@ public interface MemberChooserObject { @NlsContexts.Label @NotNull String getText(); + @Override boolean equals(Object o); + @Override int hashCode(); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/generation/PsiElementMemberChooserObject.java b/platform/lang-api/src/com/intellij/codeInsight/generation/PsiElementMemberChooserObject.java index 48b157919741..5006ead9e077 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/generation/PsiElementMemberChooserObject.java +++ b/platform/lang-api/src/com/intellij/codeInsight/generation/PsiElementMemberChooserObject.java @@ -36,6 +36,7 @@ public class PsiElementMemberChooserObject extends MemberChooserObjectBase { element; } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -45,6 +46,7 @@ public class PsiElementMemberChooserObject extends MemberChooserObjectBase { return myPsiElementPointer.equals(that.myPsiElementPointer); } + @Override public int hashCode() { return myPsiElementPointer.hashCode(); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/offline/OfflineProblemDescriptor.java b/platform/lang-api/src/com/intellij/codeInspection/offline/OfflineProblemDescriptor.java index 500014719c50..14cbde709712 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/offline/OfflineProblemDescriptor.java +++ b/platform/lang-api/src/com/intellij/codeInspection/offline/OfflineProblemDescriptor.java @@ -83,6 +83,7 @@ public class OfflineProblemDescriptor { return ReadAction.compute(() -> refManager.getProject().isDisposed() ? null : refManager.getReference(myType, myFQName)); } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -100,6 +101,7 @@ public class OfflineProblemDescriptor { return true; } + @Override public int hashCode() { int result; result = Objects.hashCode(myType); diff --git a/platform/lang-api/src/com/intellij/framework/detection/DetectedFrameworkDescription.java b/platform/lang-api/src/com/intellij/framework/detection/DetectedFrameworkDescription.java index e89c7cce8479..5d3bf443187d 100644 --- a/platform/lang-api/src/com/intellij/framework/detection/DetectedFrameworkDescription.java +++ b/platform/lang-api/src/com/intellij/framework/detection/DetectedFrameworkDescription.java @@ -46,7 +46,9 @@ public abstract class DetectedFrameworkDescription { */ public abstract void setupFramework(@NotNull ModifiableModelsProvider modifiableModelsProvider, @NotNull ModulesProvider modulesProvider); + @Override public abstract boolean equals(Object obj); + @Override public abstract int hashCode(); } diff --git a/platform/lang-core/src/com/intellij/facet/Facet.java b/platform/lang-core/src/com/intellij/facet/Facet.java index 562a1869c2f3..5a8322fa39c7 100644 --- a/platform/lang-core/src/com/intellij/facet/Facet.java +++ b/platform/lang-core/src/com/intellij/facet/Facet.java @@ -88,10 +88,12 @@ public class Facet extends UserDataHolderBase impl disposeFacet(); } + @Override public final int hashCode() { return super.hashCode(); } + @Override public final boolean equals(Object obj) { return super.equals(obj); } diff --git a/platform/lang-core/src/com/intellij/facet/FacetTypeId.java b/platform/lang-core/src/com/intellij/facet/FacetTypeId.java index 0565d57b79fe..15e596f52bd4 100644 --- a/platform/lang-core/src/com/intellij/facet/FacetTypeId.java +++ b/platform/lang-core/src/com/intellij/facet/FacetTypeId.java @@ -11,6 +11,7 @@ public final class FacetTypeId { myDebugName = debugName; } + @Override public String toString() { return myDebugName; } diff --git a/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java index 44bc19c27fb3..e09547efc335 100644 --- a/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java @@ -72,6 +72,7 @@ public abstract class ModuleType { return myId; } + @Override public final boolean equals(Object o) { if (this == o) return true; if (!(o instanceof ModuleType moduleType)) return false; @@ -79,10 +80,12 @@ public abstract class ModuleType { return myId.equals(moduleType.myId); } + @Override public final int hashCode() { return myId.hashCode(); } + @Override public String toString() { return getName(); } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java index 12f162f436ac..de16c1def77c 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java @@ -126,6 +126,7 @@ final class PageSizes { public String name; public String visualName; + @Override public String toString() { return visualName; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/TailTypeEx.java b/platform/lang-impl/src/com/intellij/codeInsight/TailTypeEx.java index 0d96568ccd66..830621dba7d8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/TailTypeEx.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/TailTypeEx.java @@ -14,6 +14,7 @@ public final class TailTypeEx { return moveCaret(editor, insertChar(editor, tailOffset, ')'), -1); } + @Override public @NonNls String toString() { return "SMART_LPARENTH"; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UnresolvedReferenceQuickFixUpdaterImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UnresolvedReferenceQuickFixUpdaterImpl.java index cdade7e931d7..27dc58ffa45c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UnresolvedReferenceQuickFixUpdaterImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UnresolvedReferenceQuickFixUpdaterImpl.java @@ -51,6 +51,7 @@ public final class UnresolvedReferenceQuickFixUpdaterImpl implements UnresolvedR myProject = project; } + @Override public void waitQuickFixesSynchronously(@NotNull PsiFile file, @NotNull Editor editor, @NotNull List infos) { ApplicationManager.getApplication().assertIsNonDispatchThread(); ThreadingAssertions.assertNoOwnReadAccess(); // have to be able to wait over the write action to finish, must not hold RA for that @@ -87,6 +88,7 @@ public final class UnresolvedReferenceQuickFixUpdaterImpl implements UnresolvedR } } + @Override public void registerQuickFixesLater(@NotNull PsiReference ref, @NotNull HighlightInfo.Builder info) { ((HighlightInfoB)info).setUnresolvedReference(ref); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueFactory.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueFactory.java index 1868988413db..83f3ebfc19a1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueFactory.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueFactory.java @@ -49,6 +49,7 @@ public final class LookupValueFactory { return getPresentation().hashCode(); } + @Override public boolean equals(Object a) { return a != null && a.getClass() == getClass() && ((PresentableLookupValue)a).getPresentation().equals(getPresentation()); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java index 95a9deaedeb7..49400df785c6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java @@ -114,6 +114,7 @@ public abstract class NavigationGutterIconRenderer extends GutterIconRenderer return dumbService.computeWithAlternativeResolveEnabled(() -> ContainerUtil.mapNotNull(pointers, smartPsiElementPointer -> smartPsiElementPointer.getElement())); } + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; @@ -127,6 +128,7 @@ public abstract class NavigationGutterIconRenderer extends GutterIconRenderer return true; } + @Override public int hashCode() { int result; result = myPopupTitle != null ? myPopupTitle.hashCode() : 0; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/InvokeActionResult.java b/platform/lang-impl/src/com/intellij/codeInsight/template/InvokeActionResult.java index dfe60dcf1aac..0b2a1168b23e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/InvokeActionResult.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/InvokeActionResult.java @@ -23,6 +23,7 @@ public final class InvokeActionResult implements Result{ return true; //no text result will be provided anyway } + @Override public String toString() { return ""; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/PsiElementResult.java b/platform/lang-impl/src/com/intellij/codeInsight/template/PsiElementResult.java index 5848be05bfcb..a5dd3ad8be2c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/PsiElementResult.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/PsiElementResult.java @@ -26,6 +26,7 @@ public class PsiElementResult implements Result { return text.equals(toString()); } + @Override public String toString() { PsiElement element = getElement(); if (element != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java index b3fb7284ed21..67a7c7c2c29d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java @@ -149,6 +149,7 @@ public final class TemplateSettings implements PersistentStateComponent