From 3b1b909eb4e708318f17f92bbceec48f0987d52f Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 19 Apr 2013 12:30:45 +0400 Subject: [PATCH] @Override --- .../options/IndentOptionsEditor.java | 1 + .../options/SmartIndentOptionsEditor.java | 6 ++++ .../intellij/codeInsight/CharTailType.java | 1 + .../codeInsight/PsiEquivalenceUtil.java | 1 + .../com/intellij/codeInsight/TailType.java | 5 +++ .../completion/CompletionContributor.java | 6 ++-- .../completion/CompletionService.java | 5 +-- .../completion/CompletionStatistician.java | 1 + .../completion/CompletionWeigher.java | 1 + .../completion/DummyIdentifierPatcher.java | 1 + .../codeInsight/completion/OffsetMap.java | 1 + .../util/ParenthesesInsertHandler.java | 3 ++ .../editorActions/moveUpDown/LineMover.java | 1 + .../generation/MemberChooserObjectBase.java | 2 ++ .../DefaultImplementationTextSelectioner.java | 2 ++ .../intention/AbstractIntentionAction.java | 3 ++ .../intention/IntentionActionBean.java | 1 + .../lookup/LookupElementBuilder.java | 1 + .../lookup/LookupElementDecorator.java | 4 ++- .../lookup/MutableLookupElement.java | 1 + .../codeInsight/template/TextResult.java | 2 ++ .../codeInspection/GlobalInspectionTool.java | 1 + .../codeInspection/LocalInspectionEP.java | 2 +- .../codeInspection/reference/RefFile.java | 1 + .../codeInspection/ui/ListEditForm.java | 1 + .../intellij/codeInspection/ui/ListTable.java | 3 ++ .../ui/ListWrappingTableModel.java | 3 ++ .../ui/MultipleCheckboxOptionsPanel.java | 1 + .../ui/SingleCheckboxOptionsPanel.java | 1 + .../ui/SingleIntegerFieldOptionsPanel.java | 1 + .../logging/AdditionalTabComponent.java | 1 + .../logging/LogConsolePreferences.java | 7 +++++ .../diagnostic/logging/LogFilter.java | 2 ++ .../com/intellij/execution/BeforeRunTask.java | 3 +- .../execution/DefaultExecutionResult.java | 7 ++++- .../com/intellij/execution/PsiLocation.java | 7 +++++ .../RunConfigurationConfigurableAdapter.java | 2 ++ .../actions/PreferredProducerFind.java | 3 ++ .../EnvironmentVariablesComponent.java | 5 +++ .../configurations/CommandLineState.java | 14 +++++++-- .../ConfigurationPerRunnerSettings.java | 2 ++ .../configurations/ConfigurationTypeBase.java | 5 +++ .../configurations/LogFileOptions.java | 2 ++ .../configurations/MockCommandLineState.java | 1 + .../ModuleBasedConfiguration.java | 5 +++ .../configurations/PredefinedLogFile.java | 2 ++ .../configurations/RunConfigurationBase.java | 11 +++++++ .../RunConfigurationModule.java | 2 ++ .../configurations/RunnerSettings.java | 2 ++ .../configurations/RuntimeConfiguration.java | 7 +++++ .../UnknownConfigurationType.java | 5 +++ .../UnknownRunConfiguration.java | 19 ++++++++++++ .../executors/DefaultRunExecutor.java | 10 ++++++ .../filters/OpenFileHyperlinkInfo.java | 3 ++ .../execution/filters/RegexpFilter.java | 1 + .../junit/RuntimeConfigurationProducer.java | 8 +++-- .../runners/ExecutionEnvironment.java | 1 + .../runners/GenericProgramRunner.java | 7 +++++ .../execution/ui/actions/BaseViewAction.java | 4 ++- .../execution/ui/actions/CloseAction.java | 2 ++ .../execution/ui/layout/CellTransform.java | 5 ++- .../ui/layout/LayoutAttractionPolicy.java | 6 ++++ .../execution/util/EnvVariablesTable.java | 6 ++++ .../execution/util/EnvironmentVariable.java | 3 ++ .../execution/util/ListTableWithButtons.java | 1 + .../execution/util/PathMappingTable.java | 6 ++++ .../execution/util/PathMappingsComponent.java | 5 +++ .../src/com/intellij/facet/Facet.java | 1 + .../intellij/facet/FacetConfiguration.java | 2 ++ .../intellij/facet/FacetManagerAdapter.java | 7 +++++ .../facet/ProjectWideFacetAdapter.java | 6 ++++ .../LibrariesDownloadAssistant.java | 1 + .../FacetBasedFrameworkSupportProvider.java | 5 +++ .../com/intellij/facet/ui/FacetEditorTab.java | 1 + .../src/com/intellij/find/FindModel.java | 1 + .../find/SearchInBackgroundOption.java | 2 ++ .../detection/FileContentPattern.java | 1 + .../ide/actions/CreateElementActionBase.java | 5 +++ .../intellij/ide/actions/ElementCreator.java | 1 + .../FileTemplateGroupDescriptor.java | 1 + .../ide/projectView/ProjectViewNode.java | 4 +++ .../ide/projectView/ViewSettings.java | 7 +++++ .../structureView/StructureViewModelBase.java | 1 + .../FrameworkSupportConfigurableBase.java | 7 ++++- .../FrameworkSupportProviderBase.java | 1 + .../ChooseByNamePopupComponent.java | 1 + .../projectWizard/EmptyModuleBuilder.java | 4 +++ .../util/projectWizard/ModuleWizardStep.java | 2 ++ .../lang/DefaultWordCompletionFilter.java | 1 + .../intellij/lang/LanguageDocumentation.java | 1 + .../lang/LanguageLiteralEscapers.java | 3 ++ .../lang/LanguageNamesValidation.java | 4 ++- .../src/com/intellij/lang/NodeStructure.java | 8 ++++- .../lang/cacheBuilder/CacheBuilderEP.java | 1 + .../CompositeDocumentationProvider.java | 14 ++++++--- .../lang/refactoring/InlineHandler.java | 1 + .../com/intellij/lexer/CompositeLexer.java | 8 +++++ .../src/com/intellij/lexer/FilterLexer.java | 5 +++ .../src/com/intellij/lexer/LayeredLexer.java | 10 +++++- .../intellij/lexer/StoppableLexerAdapter.java | 5 +++ .../intellij/lexer/StringLiteralLexer.java | 8 +++++ .../intellij/openapi/paths/PathReference.java | 2 ++ .../openapi/projectRoots/JdkUtil.java | 8 +++-- .../openapi/projectRoots/SdkType.java | 5 ++- .../projectRoots/impl/UnknownSdkType.java | 10 +++++- .../openapi/projectRoots/ui/PathEditor.java | 4 +++ .../roots/ProjectClasspathTraversing.java | 1 + .../openapi/roots/ProjectRootsTraversing.java | 10 ++++++ .../openapi/roots/RecursiveRootPolicy.java | 1 + .../openapi/roots/SearchingPolicy.java | 1 + .../roots/ui/OrderRootTypeUIFactory.java | 1 + .../configuration/DefaultModulesProvider.java | 4 +++ .../ui/configuration/ModulesProvider.java | 4 +++ .../patterns/IElementTypePattern.java | 1 + .../intellij/patterns/PsiElementPattern.java | 21 ++++++++++--- .../com/intellij/patterns/PsiFilePattern.java | 3 +- .../patterns/PsiNamePatternCondition.java | 1 + .../intellij/patterns/VirtualFilePattern.java | 9 ++++++ .../intellij/pom/PomDescriptionProvider.java | 1 + .../src/com/intellij/pom/PomIconProvider.java | 1 + .../profile/ApplicationProfileManager.java | 1 + .../psi/AbstractElementManipulator.java | 2 ++ .../com/intellij/psi/DelegatePsiTarget.java | 5 +++ .../intellij/psi/IntentionFilterOwner.java | 1 + .../com/intellij/psi/ManipulatableTarget.java | 4 +++ .../src/com/intellij/psi/PsiElementRef.java | 8 +++++ .../psi/PsiPolyVariantReferenceBase.java | 1 + .../psi/PsiRecursiveElementVisitor.java | 3 +- .../com/intellij/psi/PsiReferenceBase.java | 14 ++++++++- .../intellij/psi/PsiReferenceContributor.java | 1 + .../intellij/psi/PsiTreeChangeAdapter.java | 12 +++++++ .../intellij/psi/ReferenceProviderType.java | 1 + .../psi/RenameableDelegatePsiTarget.java | 3 ++ .../intellij/psi/WeigherExtensionPoint.java | 3 ++ .../com/intellij/psi/WeighingComparable.java | 3 ++ .../src/com/intellij/psi/WeighingService.java | 1 + .../psi/codeStyle/CodeStyleScheme.java | 1 + .../codeStyle/CustomCodeStyleSettings.java | 1 + .../psi/codeStyle/PackageEntryTable.java | 3 ++ .../std/StdArrangementSettings.java | 1 + .../psi/filters/ElementFilterBase.java | 2 ++ .../psi/filters/position/FilterPattern.java | 1 + .../intellij/psi/meta/PsiMetaDataTarget.java | 3 ++ .../psi/search/PsiReferenceProcessor.java | 2 ++ .../search/PsiReferenceProcessorAdapter.java | 1 + .../intellij/psi/search/TodoAttributes.java | 3 ++ .../com/intellij/psi/search/TodoPattern.java | 3 ++ .../search/scope/NonProjectFilesScope.java | 1 + .../psi/search/scope/ProjectFilesScope.java | 1 + .../search/scope/ProjectProductionScope.java | 1 + .../intellij/psi/search/scope/TestsScope.java | 1 + .../scope/packageSet/AbstractPackageSet.java | 2 ++ .../packageSet/ComplementPackageSet.java | 4 +++ .../packageSet/IntersectionPackageSet.java | 4 +++ .../packageSet/NamedPackageSetReference.java | 4 +++ .../scope/packageSet/NamedScopeManager.java | 2 ++ .../scope/packageSet/NamedScopesHolder.java | 4 ++- .../scope/packageSet/UnionPackageSet.java | 3 ++ .../com/intellij/psi/stubs/NamedStubBase.java | 1 + .../psi/targets/AliasingPsiTarget.java | 3 ++ .../TemplateDataHighlighterWrapper.java | 2 ++ .../TemplateLanguageFileViewProvider.java | 1 + .../com/intellij/psi/util/PsiMatcherImpl.java | 12 +++++++ .../com/intellij/psi/util/PsiUtilBase.java | 3 +- .../ChangeSignatureHandler.java | 1 + .../classMembers/MemberInfoBase.java | 1 + .../RefactoringElementListenerComposite.java | 2 ++ .../rename/RenameInputValidatorRegistry.java | 1 + .../refactoring/util/MoveRenameUsageInfo.java | 1 + .../refactoring/util/NonCodeUsageInfo.java | 1 + .../usageView/UsageTreeColorsScheme.java | 3 ++ .../src/com/intellij/util/ActionRunner.java | 5 +++ .../com/intellij/util/FileContentUtil.java | 1 + .../intellij/util/VirtualFileLogicalRoot.java | 2 ++ .../com/intellij/util/xml/NanoXmlUtil.java | 31 +++++++++++++++++++ .../AbstractConsoleRunnerWithHistory.java | 2 ++ .../util/StoringPropertyContainer.java | 3 ++ .../BookmarksFavoriteListProvider.java | 1 + 178 files changed, 614 insertions(+), 37 deletions(-) diff --git a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java index b4b859f9d841..f3ed6e353d13 100644 --- a/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java +++ b/platform/lang-api/src/com/intellij/application/options/IndentOptionsEditor.java @@ -31,6 +31,7 @@ public class IndentOptionsEditor extends OptionGroup { protected JLabel myTabSizeLabel; protected JLabel myIndentLabel; + @Override public JPanel createPanel() { addComponents(); diff --git a/platform/lang-api/src/com/intellij/application/options/SmartIndentOptionsEditor.java b/platform/lang-api/src/com/intellij/application/options/SmartIndentOptionsEditor.java index 42802e678558..f2bf50b8e6eb 100644 --- a/platform/lang-api/src/com/intellij/application/options/SmartIndentOptionsEditor.java +++ b/platform/lang-api/src/com/intellij/application/options/SmartIndentOptionsEditor.java @@ -31,6 +31,7 @@ public class SmartIndentOptionsEditor extends IndentOptionsEditor { private JTextField myContinuationIndentField; private JLabel myContinuationIndentLabel; + @Override protected void addTabOptions() { super.addTabOptions(); @@ -38,6 +39,7 @@ public class SmartIndentOptionsEditor extends IndentOptionsEditor { add(myCbSmartTabs, true); } + @Override protected void addComponents() { super.addComponents(); @@ -46,6 +48,7 @@ public class SmartIndentOptionsEditor extends IndentOptionsEditor { add(myContinuationIndentLabel, myContinuationIndentField); } + @Override public boolean isModified(final CodeStyleSettings settings, final CommonCodeStyleSettings.IndentOptions options) { boolean isModified = super.isModified(settings, options); isModified |= isFieldModified(myCbSmartTabs, options.SMART_TABS); @@ -53,18 +56,21 @@ public class SmartIndentOptionsEditor extends IndentOptionsEditor { return isModified; } + @Override public void apply(final CodeStyleSettings settings, final CommonCodeStyleSettings.IndentOptions options) { super.apply(settings, options); options.CONTINUATION_INDENT_SIZE = getFieldValue(myContinuationIndentField, 0, options.CONTINUATION_INDENT_SIZE); options.SMART_TABS = isSmartTabValid(options.INDENT_SIZE, options.TAB_SIZE) && myCbSmartTabs.isSelected(); } + @Override public void reset(@NotNull final CodeStyleSettings settings, @NotNull final CommonCodeStyleSettings.IndentOptions options) { super.reset(settings, options); myContinuationIndentField.setText(String.valueOf(options.CONTINUATION_INDENT_SIZE)); myCbSmartTabs.setSelected(options.SMART_TABS); } + @Override public void setEnabled(final boolean enabled) { super.setEnabled(enabled); diff --git a/platform/lang-api/src/com/intellij/codeInsight/CharTailType.java b/platform/lang-api/src/com/intellij/codeInsight/CharTailType.java index 6f294611450c..af75f64fde1f 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/CharTailType.java +++ b/platform/lang-api/src/com/intellij/codeInsight/CharTailType.java @@ -41,6 +41,7 @@ public class CharTailType extends TailType { return !context.shouldAddCompletionChar() || context.getCompletionChar() != myChar; } + @Override public int processTail(final Editor editor, final int tailOffset) { return insertChar(editor, tailOffset, myChar, myOverwrite); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java b/platform/lang-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java index 4da3f17387eb..40610f77351e 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java +++ b/platform/lang-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java @@ -116,6 +116,7 @@ public class PsiEquivalenceUtil { final List> result, PsiElement scope) { findChildRangeDuplicates(first, last, scope, new PairConsumer() { + @Override public void consume(final PsiElement start, final PsiElement end) { result.add(new Pair(start, end)); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/TailType.java b/platform/lang-api/src/com/intellij/codeInsight/TailType.java index 993b86eca70a..18b3bdee5e9a 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/TailType.java +++ b/platform/lang-api/src/com/intellij/codeInsight/TailType.java @@ -57,6 +57,7 @@ public abstract class TailType { } public static final TailType UNKNOWN = new TailType(){ + @Override public int processTail(final Editor editor, final int tailOffset) { return tailOffset; } @@ -68,6 +69,7 @@ public abstract class TailType { }; public static final TailType NONE = new TailType(){ + @Override public int processTail(final Editor editor, final int tailOffset) { return tailOffset; } @@ -81,6 +83,7 @@ public abstract class TailType { @Deprecated public static final TailType EXCLAMATION = new CharTailType('!'); public static final TailType COMMA = new TailType(){ + @Override public int processTail(final Editor editor, int tailOffset) { CommonCodeStyleSettings styleSettings = getLocalCodeStyleSettings(editor, tailOffset); if (styleSettings.SPACE_BEFORE_COMMA) tailOffset = insertChar(editor, tailOffset, ' '); @@ -149,6 +152,7 @@ public abstract class TailType { public static final TailType CASE_COLON = new CharTailType(':'); public static final TailType COND_EXPR_COLON = new TailType(){ + @Override public int processTail(final Editor editor, final int tailOffset) { Document document = editor.getDocument(); int textLength = document.getTextLength(); @@ -177,6 +181,7 @@ public abstract class TailType { return CodeStyleSettingsManager.getSettings(editor.getProject()).SPACE_AROUND_ASSIGNMENT_OPERATORS; } + @Override public int processTail(final Editor editor, int tailOffset) { Document document = editor.getDocument(); int textLength = document.getTextLength(); diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java index f2d05226f85c..6be87f73326d 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionContributor.java @@ -62,7 +62,7 @@ import java.util.List; * Most often this string is an identifier (see {@link com.intellij.codeInsight.completion.CompletionInitializationContext#DUMMY_IDENTIFIER}). * This is usually done to guarantee that there'll always be some non-empty element there, which will be easy to describe via {@link ElementPattern}s. * Also a reference can suddenly appear in that position, which will certainly help invoking its {@link PsiReference#getVariants()}. - * Dummy identifier string can be easily changed in {@link #beforeCompletion(CompletionInitializationContext)} method.

+ * Dummy identifier string can be easily changed in {@link #beforeCompletion(CompletionInitializationContext)} method.

* * Q: How do I get automatic lookup element filtering by prefix?
* A: When you return variants from reference ({@link PsiReference#getVariants()}), the filtering will be done @@ -119,7 +119,7 @@ import java.util.List; * If your contributor isn't even invoked, probably there was another contributor that said 'stop' to the system, and yours happened to be ordered after * that contributor. To test this hypothesis, put a breakpoint to * {@link CompletionService#getVariantsFromContributors(CompletionParameters, CompletionContributor, com.intellij.util.Consumer)}, - * to the 'return false' line.

+ * to the 'return false' line.

* * @author peter */ @@ -228,6 +228,7 @@ public abstract class CompletionContributor { public static List forParameters(final CompletionParameters parameters) { return ApplicationManager.getApplication().runReadAction(new Computable>() { + @Override public List compute() { return forLanguage(PsiUtilBase.getLanguageAtOffset(parameters.getPosition().getContainingFile(), parameters.getOffset())); } @@ -256,6 +257,7 @@ public abstract class CompletionContributor { return buildExtensions(allowed); } + @Override protected String keyToString(Language key) { return key.getID(); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionService.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionService.java index 74f53b5b933d..282082a0d4a4 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionService.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionService.java @@ -64,7 +64,7 @@ public abstract class CompletionService { /** * Run all contributors until any of them returns false or the list is exhausted. If from parameter is not null, contributors - * will be run starting from the next one after that. + * will be run starting from the next one after that. * @param parameters * @param from * @param consumer @@ -90,7 +90,7 @@ public abstract class CompletionService { /** * Create a {@link com.intellij.codeInsight.completion.CompletionResultSet} that will filter variants based on default camel-hump - * {@link com.intellij.codeInsight.completion.PrefixMatcher} and give the filtered variants to consumer. + * {@link com.intellij.codeInsight.completion.PrefixMatcher} and give the filtered variants to consumer. * @param parameters * @param consumer * @param contributor @@ -113,6 +113,7 @@ public abstract class CompletionService { final Collection lookupSet = new LinkedHashSet(); getVariantsFromContributors(parameters, null, new Consumer() { + @Override public void consume(final CompletionResult result) { if (lookupSet.add(result.getLookupElement())) { consumer.consume(result); diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionStatistician.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionStatistician.java index 1794ab26e188..9de8491a571e 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionStatistician.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionStatistician.java @@ -23,5 +23,6 @@ import com.intellij.psi.statistics.StatisticsInfo; * @author peter */ public abstract class CompletionStatistician extends Statistician { + @Override public abstract StatisticsInfo serialize(final LookupElement element, final CompletionLocation location); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java index a6148cb981b2..ff0164efc7fc 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/CompletionWeigher.java @@ -24,5 +24,6 @@ import org.jetbrains.annotations.NotNull; */ public abstract class CompletionWeigher extends Weigher { + @Override public abstract Comparable weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/DummyIdentifierPatcher.java b/platform/lang-api/src/com/intellij/codeInsight/completion/DummyIdentifierPatcher.java index 5f058270a5fb..950e7484a200 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/DummyIdentifierPatcher.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/DummyIdentifierPatcher.java @@ -30,6 +30,7 @@ public class DummyIdentifierPatcher extends FileCopyPatcher { myDummyIdentifier = dummyIdentifier; } + @Override public void patchFileCopy(@NotNull final PsiFile fileCopy, @NotNull final Document document, @NotNull final OffsetMap map) { if (StringUtil.isEmpty(myDummyIdentifier)) return; int startOffset = map.getOffset(CompletionInitializationContext.START_OFFSET); diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/OffsetMap.java b/platform/lang-api/src/com/intellij/codeInsight/completion/OffsetMap.java index 951faeb4bbd4..ef797faa556f 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/OffsetMap.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/OffsetMap.java @@ -114,6 +114,7 @@ public class OffsetMap implements Disposable { return myModified.contains(key); } + @Override public void dispose() { myDisposed = true; for (RangeMarker rangeMarker : myMap.values()) { diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/util/ParenthesesInsertHandler.java b/platform/lang-api/src/com/intellij/codeInsight/completion/util/ParenthesesInsertHandler.java index 41af4b29b6a9..149c6f850d72 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/util/ParenthesesInsertHandler.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/util/ParenthesesInsertHandler.java @@ -31,11 +31,13 @@ import org.jetbrains.annotations.Nullable; */ public abstract class ParenthesesInsertHandler implements InsertHandler { public static final ParenthesesInsertHandler WITH_PARAMETERS = new ParenthesesInsertHandler() { + @Override protected boolean placeCaretInsideParentheses(final InsertionContext context, final LookupElement item) { return true; } }; public static final ParenthesesInsertHandler NO_PARAMETERS = new ParenthesesInsertHandler() { + @Override protected boolean placeCaretInsideParentheses(final InsertionContext context, final LookupElement item) { return false; } @@ -87,6 +89,7 @@ public abstract class ParenthesesInsertHandler implemen protected abstract boolean placeCaretInsideParentheses(final InsertionContext context, final T item); + @Override public void handleInsert(final InsertionContext context, final T item) { final Editor editor = context.getEditor(); final Document document = editor.getDocument(); diff --git a/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineMover.java b/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineMover.java index d43d31b6f0f2..2f8949e3433d 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineMover.java +++ b/platform/lang-api/src/com/intellij/codeInsight/editorActions/moveUpDown/LineMover.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull; public class LineMover extends StatementUpDownMover { + @Override public boolean checkAvailable(@NotNull final Editor editor, @NotNull final PsiFile file, @NotNull final MoveInfo info, final boolean down) { LineRange range = StatementUpDownMover.getLineRangeFromSelection(editor); diff --git a/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObjectBase.java b/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObjectBase.java index c22c3e1d0e9c..4f58edae00d2 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObjectBase.java +++ b/platform/lang-api/src/com/intellij/codeInsight/generation/MemberChooserObjectBase.java @@ -38,11 +38,13 @@ public class MemberChooserObjectBase implements MemberChooserObject { myIcon = icon; } + @Override public void renderTreeNode(SimpleColoredComponent component, JTree tree) { SpeedSearchUtil.appendFragmentsForSpeedSearch(tree, getText(), getTextAttributes(tree), false, component); component.setIcon(myIcon); } + @Override public String getText() { return myText; } diff --git a/platform/lang-api/src/com/intellij/codeInsight/hint/DefaultImplementationTextSelectioner.java b/platform/lang-api/src/com/intellij/codeInsight/hint/DefaultImplementationTextSelectioner.java index e0fef5912c89..7cb13f0c6964 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/hint/DefaultImplementationTextSelectioner.java +++ b/platform/lang-api/src/com/intellij/codeInsight/hint/DefaultImplementationTextSelectioner.java @@ -28,12 +28,14 @@ import org.jetbrains.annotations.NotNull; public class DefaultImplementationTextSelectioner implements ImplementationTextSelectioner { private static final Logger LOG = Logger.getInstance("#" + DefaultImplementationTextSelectioner.class.getName()); + @Override public int getTextStartOffset(@NotNull final PsiElement parent) { final TextRange textRange = parent.getTextRange(); LOG.assertTrue(textRange != null, parent); return textRange.getStartOffset(); } + @Override public int getTextEndOffset(@NotNull PsiElement element) { final TextRange textRange = element.getTextRange(); LOG.assertTrue(textRange != null, element); diff --git a/platform/lang-api/src/com/intellij/codeInsight/intention/AbstractIntentionAction.java b/platform/lang-api/src/com/intellij/codeInsight/intention/AbstractIntentionAction.java index 1750be1547ff..cc98bb62b48e 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/intention/AbstractIntentionAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/intention/AbstractIntentionAction.java @@ -26,15 +26,18 @@ import com.intellij.psi.PsiFile; */ public abstract class AbstractIntentionAction implements IntentionAction { + @Override @NotNull public String getFamilyName() { return getText(); } + @Override public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { return true; } + @Override public boolean startInWriteAction() { return false; } diff --git a/platform/lang-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java b/platform/lang-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java index 0d80a49139ab..7be2dde69bb6 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java +++ b/platform/lang-api/src/com/intellij/codeInsight/intention/IntentionActionBean.java @@ -55,6 +55,7 @@ public class IntentionActionBean extends CustomLoadingExtensionPointBean { final String[] keys = categoryKey.split("/"); if (keys.length > 1) { return ContainerUtil.map2Array(keys, String.class, new Function() { + @Override public String fun(final String s) { return CommonBundle.message(bundle, s); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java index 4641b615a848..9238aae3a845 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java +++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementBuilder.java @@ -142,6 +142,7 @@ public final class LookupElementBuilder extends LookupElement { Collections.unmodifiableSet(set), myCaseSensitive); } + @Override public boolean isCaseSensitive() { return myCaseSensitive; } diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java index 00505b70d5ed..090f8699da5a 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java +++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/LookupElementDecorator.java @@ -37,6 +37,7 @@ public abstract class LookupElementDecorator extends Lo return myDelegate; } + @Override @NotNull public String getLookupString() { return myDelegate.getLookupString(); @@ -100,7 +101,8 @@ public abstract class LookupElementDecorator extends Lo final T t = super.as(conditionKey); return t == null ? myDelegate.as(conditionKey) : t; } - + + @Override public boolean isCaseSensitive() { return myDelegate.isCaseSensitive(); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/lookup/MutableLookupElement.java b/platform/lang-api/src/com/intellij/codeInsight/lookup/MutableLookupElement.java index 72b1446b7424..537e36414990 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/lookup/MutableLookupElement.java +++ b/platform/lang-api/src/com/intellij/codeInsight/lookup/MutableLookupElement.java @@ -26,6 +26,7 @@ import javax.swing.*; * @author peter */ public abstract class MutableLookupElement extends LookupElement{ + @Override @NotNull public abstract T getObject(); diff --git a/platform/lang-api/src/com/intellij/codeInsight/template/TextResult.java b/platform/lang-api/src/com/intellij/codeInsight/template/TextResult.java index 4cc4e32b3f8a..91e6fe6ee740 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/template/TextResult.java +++ b/platform/lang-api/src/com/intellij/codeInsight/template/TextResult.java @@ -33,6 +33,7 @@ public class TextResult implements Result{ return myText; } + @Override public boolean equalsToText(String text, PsiElement context) { return text.equals(myText); } @@ -41,6 +42,7 @@ public class TextResult implements Result{ return myText; } + @Override public void handleFocused(final PsiFile psiFile, final Document document, final int segmentStart, final int segmentEnd) { } } \ No newline at end of file diff --git a/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java b/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java index 9436f01c7426..81342d07bf15 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java +++ b/platform/lang-api/src/com/intellij/codeInspection/GlobalInspectionTool.java @@ -121,6 +121,7 @@ public abstract class GlobalInspectionTool extends InspectionProfileEntry { } + @Override public boolean isEnabledByDefault() { return true; } diff --git a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionEP.java b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionEP.java index 9c1f65a43fcd..db978a3a702f 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionEP.java +++ b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionEP.java @@ -24,7 +24,7 @@ import com.intellij.util.xmlb.annotations.Attribute; */ public class LocalInspectionEP extends InspectionEP implements LocalInspectionTool.LocalDefaultNameProvider { - public final static ExtensionPointName LOCAL_INSPECTION = ExtensionPointName.create("com.intellij.localInspection"); + public static final ExtensionPointName LOCAL_INSPECTION = ExtensionPointName.create("com.intellij.localInspection"); @Attribute("suppressId") public String id; diff --git a/platform/lang-api/src/com/intellij/codeInspection/reference/RefFile.java b/platform/lang-api/src/com/intellij/codeInspection/reference/RefFile.java index 56f75df57f7d..088785e0a45f 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/reference/RefFile.java +++ b/platform/lang-api/src/com/intellij/codeInspection/reference/RefFile.java @@ -29,5 +29,6 @@ public interface RefFile extends RefElement { * * @return the file for the node. */ + @Override PsiFile getElement(); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/ListEditForm.java b/platform/lang-api/src/com/intellij/codeInspection/ui/ListEditForm.java index 61513a26a583..4b34c9d51de2 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/ListEditForm.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/ListEditForm.java @@ -38,6 +38,7 @@ public class ListEditForm { final ListWrappingTableModel tableModel = table.getModel(); tableModel.addRow(); EventQueue.invokeLater(new Runnable() { + @Override public void run() { final int lastRowIndex = tableModel.getRowCount() - 1; final Rectangle rectangle = diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/ListTable.java b/platform/lang-api/src/com/intellij/codeInspection/ui/ListTable.java index 365aed6ffa8f..676bbaceca6a 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/ListTable.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/ListTable.java @@ -47,10 +47,12 @@ public class ListTable extends JBTable { setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); } + @Override public ListWrappingTableModel getModel() { return (ListWrappingTableModel) super.getModel(); } + @Override public void setModel(TableModel dataModel) { if (!(dataModel instanceof ListWrappingTableModel)) { throw new IllegalArgumentException( @@ -59,6 +61,7 @@ public class ListTable extends JBTable { super.setModel(dataModel); } + @Override public Component prepareRenderer(TableCellRenderer renderer, int row, int column) { final Component component = diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/ListWrappingTableModel.java b/platform/lang-api/src/com/intellij/codeInspection/ui/ListWrappingTableModel.java index ef52f6d5c57e..48db4531f747 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/ListWrappingTableModel.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/ListWrappingTableModel.java @@ -72,6 +72,7 @@ public class ListWrappingTableModel extends AbstractTableModel { return String.class; } + @Override public int getColumnCount() { return columnNames.size(); } @@ -84,6 +85,7 @@ public class ListWrappingTableModel extends AbstractTableModel { return null; } + @Override public int getRowCount() { final List column0 = list.get(0); if (column0 == null) { @@ -92,6 +94,7 @@ public class ListWrappingTableModel extends AbstractTableModel { return column0.size(); } + @Override public Object getValueAt(int rowIndex, int columnIndex) { return list.get(columnIndex).get(rowIndex); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/MultipleCheckboxOptionsPanel.java b/platform/lang-api/src/com/intellij/codeInspection/ui/MultipleCheckboxOptionsPanel.java index 30f2419a9569..da36da2926c1 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/MultipleCheckboxOptionsPanel.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/MultipleCheckboxOptionsPanel.java @@ -90,6 +90,7 @@ public class MultipleCheckboxOptionsPanel extends JPanel { this.model = model; } + @Override public void stateChanged(ChangeEvent e) { setPropertyValue(owner, property, model.isSelected()); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleCheckboxOptionsPanel.java b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleCheckboxOptionsPanel.java index 9d85c0836e35..141526896a57 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleCheckboxOptionsPanel.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleCheckboxOptionsPanel.java @@ -76,6 +76,7 @@ public class SingleCheckboxOptionsPanel extends JPanel { this.model = model; } + @Override public void stateChanged(ChangeEvent e) { setPropertyValue(owner, property, model.isSelected()); } diff --git a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java index d83e96b78f7f..a8a8022becc7 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java +++ b/platform/lang-api/src/com/intellij/codeInspection/ui/SingleIntegerFieldOptionsPanel.java @@ -93,6 +93,7 @@ public class SingleIntegerFieldOptionsPanel extends JPanel { textField.setValue(getPropertyValue(owner, property)); final Document document = textField.getDocument(); document.addDocumentListener(new DocumentAdapter() { + @Override public void textChanged(DocumentEvent e) { try { textField.commitEdit(); diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/AdditionalTabComponent.java b/platform/lang-api/src/com/intellij/diagnostic/logging/AdditionalTabComponent.java index 759bdbf7900c..b45abc181736 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/AdditionalTabComponent.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/AdditionalTabComponent.java @@ -43,6 +43,7 @@ public abstract class AdditionalTabComponent extends JPanel implements Component return null; } + @Override @NotNull public JComponent getComponent(){ return this; diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java index 222bf22230cd..e0c35f455f6f 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogConsolePreferences.java @@ -49,6 +49,7 @@ import java.util.regex.Pattern; @SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"}) public class LogConsolePreferences extends LogFilterRegistrar { private final SortedMap myRegisteredLogFilters = new TreeMap(new Comparator() { + @Override public int compare(final LogFilter o1, final LogFilter o2) { return -1; } @@ -143,6 +144,7 @@ public class LogConsolePreferences extends LogFilterRegistrar { return null; } + @Override public Element getState() { @NonNls Element element = new Element("LogFilters"); try { @@ -160,6 +162,7 @@ public class LogConsolePreferences extends LogFilterRegistrar { return element; } + @Override public void loadState(final Element object) { try { final List children = object.getChildren(FILTER); @@ -176,14 +179,17 @@ public class LogConsolePreferences extends LogFilterRegistrar { } } + @Override public void registerFilter(LogFilter filter) { myRegisteredLogFilters.put(filter, Boolean.FALSE); } + @Override public List getRegisteredLogFilters() { return new ArrayList(myRegisteredLogFilters.keySet()); } + @Override public boolean isFilterSelected(LogFilter filter) { final Boolean isSelected = myRegisteredLogFilters.get(filter); if (isSelected != null) { @@ -195,6 +201,7 @@ public class LogConsolePreferences extends LogFilterRegistrar { return false; } + @Override public void setFilterSelected(LogFilter filter, boolean state) { if (filter instanceof IndependentLogFilter) { ((IndependentLogFilter)filter).selectFilter(); diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java index 89486db4170a..ad01d50806ae 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java @@ -97,10 +97,12 @@ public class LogFilter implements JDOMExternalizable { return null; } + @Override public void readExternal(Element element) throws InvalidDataException { DefaultJDOMExternalizer.readExternal(this, element); } + @Override public void writeExternal(Element element) throws WriteExternalException { DefaultJDOMExternalizer.writeExternal(this, element); } diff --git a/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java b/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java index 15570727d458..08d3e4408c07 100644 --- a/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java +++ b/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java @@ -49,7 +49,7 @@ public abstract class BeforeRunTask implements Cloneabl public void writeExternal(Element element) { element.setAttribute("enabled", String.valueOf(myIsEnabled)); } - + public void readExternal(Element element) { String attribValue = element.getAttributeValue("enabled"); if (attribValue == null) { @@ -65,6 +65,7 @@ public abstract class BeforeRunTask implements Cloneabl return 1; } + @Override public BeforeRunTask clone() { try { return (BeforeRunTask)super.clone(); diff --git a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java index 669115a5bf01..64e950185dee 100644 --- a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java +++ b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java @@ -52,10 +52,12 @@ public class DefaultExecutionResult implements ExecutionResult { myActions = actions; } + @Override public ExecutionConsole getExecutionConsole() { return myConsole; } + @Override public AnAction[] getActions() { return myActions; } @@ -76,11 +78,12 @@ public class DefaultExecutionResult implements ExecutionResult { myStopActions.add(action); } - @NotNull + @NotNull public AnAction[] getAdditionalStopActions() { return myStopActions.toArray(new AnAction[myStopActions.size()]); } + @Override public ProcessHandler getProcessHandler() { return myProcessHandler; } @@ -94,6 +97,7 @@ public class DefaultExecutionResult implements ExecutionResult { myProcessHandler = processHandler; } + @Override public void actionPerformed(final AnActionEvent e) { if(myProcessHandler.detachIsDefault()) { myProcessHandler.detachProcess(); @@ -103,6 +107,7 @@ public class DefaultExecutionResult implements ExecutionResult { } } + @Override public void update(final AnActionEvent event) { event.getPresentation().setEnabled(!myProcessHandler.isProcessTerminating() && !myProcessHandler.isProcessTerminated()); } diff --git a/platform/lang-api/src/com/intellij/execution/PsiLocation.java b/platform/lang-api/src/com/intellij/execution/PsiLocation.java index e49595aadde0..308e99cdd5ad 100644 --- a/platform/lang-api/src/com/intellij/execution/PsiLocation.java +++ b/platform/lang-api/src/com/intellij/execution/PsiLocation.java @@ -44,11 +44,13 @@ public class PsiLocation extends Location { myModule = module; } + @Override @NotNull public E getPsiElement() { return myPsiElement; } + @Override @NotNull public Project getProject() { return myProject; @@ -59,15 +61,18 @@ public class PsiLocation extends Location { return myModule; } + @Override @NotNull public Iterator> getAncestors(@NotNull final Class ancestorClass, final boolean strict) { final T first = strict || !ancestorClass.isInstance(myPsiElement) ? findNext(myPsiElement, ancestorClass) : (T)myPsiElement; return new Iterator>() { private T myCurrent = first; + @Override public boolean hasNext() { return myCurrent != null; } + @Override public Location next() { if (myCurrent == null) throw new NoSuchElementException(); final PsiLocation psiLocation = new PsiLocation(myProject, myCurrent); @@ -75,12 +80,14 @@ public class PsiLocation extends Location { return psiLocation; } + @Override public void remove() { LOG.assertTrue(false); } }; } + @Override @NotNull public PsiLocation toPsiLocation() { return this; diff --git a/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java b/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java index 2eefd239cc25..345320e2d60d 100644 --- a/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java +++ b/platform/lang-api/src/com/intellij/execution/RunConfigurationConfigurableAdapter.java @@ -24,10 +24,12 @@ public class RunConfigurationConfigurableAdapter ex super(settingsEditor, configuration); } + @Override public String getDisplayName() { return getSettings().getName(); } + @Override public String getHelpTopic() { return null; } diff --git a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java index 4d2e848b2ad4..88fae918e688 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java +++ b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java @@ -114,10 +114,12 @@ class PreferredProducerFind { super(configurationType); } + @Override public PsiElement getSourceElement() { return myPsiElement; } + @Override @Nullable protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { myPsiElement = location.getPsiElement(); @@ -141,6 +143,7 @@ class PreferredProducerFind { return null; } + @Override public int compareTo(final Object o) { return PREFERED; } diff --git a/platform/lang-api/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java b/platform/lang-api/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java index 69947ca0aa39..2ecd338a6482 100644 --- a/platform/lang-api/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java +++ b/platform/lang-api/src/com/intellij/execution/configuration/EnvironmentVariablesComponent.java @@ -66,6 +66,7 @@ public class EnvironmentVariablesComponent extends LabeledComponent envs = new LinkedHashMap(); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java index 49fe0cecfd7e..6d9eda58b7ee 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable; public abstract class CommandLineState implements RunnableState { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.configurations.CommandLineState"); - private TextConsoleBuilder myConsoleBuilder; + private TextConsoleBuilder myConsoleBuilder; private final ExecutionEnvironment myEnvironment; @@ -47,10 +47,12 @@ public abstract class CommandLineState implements RunnableState { return myEnvironment; } + @Override public RunnerSettings getRunnerSettings() { return myEnvironment.getRunnerSettings(); } + @Override public ConfigurationPerRunnerSettings getConfigurationSettings() { return myEnvironment.getConfigurationSettings(); } @@ -60,6 +62,7 @@ public abstract class CommandLineState implements RunnableState { return myEnvironment.getExecutionTarget(); } + @Override @NotNull public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException { final ProcessHandler processHandler = startProcess(); @@ -73,8 +76,8 @@ public abstract class CommandLineState implements RunnableState { @Nullable protected ConsoleView createConsole(@NotNull final Executor executor) throws ExecutionException { final TextConsoleBuilder builder = getConsoleBuilder(); - - return builder != null ? builder.getConsole() + + return builder != null ? builder.getConsole() : null; } @@ -110,19 +113,23 @@ public abstract class CommandLineState implements RunnableState { myProcessHandler = processHandler; } + @Override public boolean isSelected(final AnActionEvent event) { return myConsole.isOutputPaused(); } + @Override public void setSelected(final AnActionEvent event, final boolean flag) { myConsole.setOutputPaused(flag); ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override public void run() { update(event); } }); } + @Override public void update(final AnActionEvent event) { super.update(event); final Presentation presentation = event.getPresentation(); @@ -141,6 +148,7 @@ public abstract class CommandLineState implements RunnableState { else { presentation.setEnabled(true); myConsole.performWhenNoDeferredOutput(new Runnable() { + @Override public void run() { update(event); } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationPerRunnerSettings.java b/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationPerRunnerSettings.java index 0ddbbf317608..32dccb124274 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationPerRunnerSettings.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationPerRunnerSettings.java @@ -37,12 +37,14 @@ public final class ConfigurationPerRunnerSettings implements JDOMExternalizable return mySettings; } + @Override public void readExternal(Element element) throws InvalidDataException { if (mySettings != null) { mySettings.readExternal(element); } } + @Override public void writeExternal(Element element) throws WriteExternalException { if (mySettings != null) { mySettings.writeExternal(element); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationTypeBase.java b/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationTypeBase.java index 4b269bd98f28..e47eb7877d32 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationTypeBase.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/ConfigurationTypeBase.java @@ -50,23 +50,28 @@ public abstract class ConfigurationTypeBase implements ConfigurationType { myFactories = newFactories.toArray(new ConfigurationFactory[newFactories.size()]); } + @Override public String getDisplayName() { return myDisplayName; } + @Override public String getConfigurationTypeDescription() { return myDescription; } + @Override public Icon getIcon() { return myIcon; } + @Override @NotNull public String getId() { return myId; } + @Override public ConfigurationFactory[] getConfigurationFactories() { return myFactories; } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java b/platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java index 9897272472e6..d159fa03ac3a 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java @@ -177,6 +177,7 @@ public class LogFileOptions implements JDOMExternalizable { myCharset = charset; } + @Override public void readExternal(Element element) throws InvalidDataException { String file = element.getAttributeValue(PATH); if (file != null){ @@ -206,6 +207,7 @@ public class LogFileOptions implements JDOMExternalizable { } } + @Override public void writeExternal(Element element) throws WriteExternalException { element.setAttribute(PATH, FileUtil.toSystemIndependentName(getPathPattern())); element.setAttribute(CHECKED, String.valueOf(isEnabled())); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java index 92607dc5519a..87c07b2340cc 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/MockCommandLineState.java @@ -30,6 +30,7 @@ public class MockCommandLineState extends CommandLineState { super(env); } + @Override protected OSProcessHandler startProcess() throws ExecutionException { return null; } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java index d759ca12f91d..61a3a052ff54 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java @@ -55,9 +55,11 @@ public abstract class ModuleBasedConfiguration() { + @Override @SuppressWarnings({"ConstantConditions"}) public Module[] compute() { final Module module = getConfigurationModule().getModule(); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/PredefinedLogFile.java b/platform/lang-api/src/com/intellij/execution/configurations/PredefinedLogFile.java index 8cb531e6bb73..5a7aefe975de 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/PredefinedLogFile.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/PredefinedLogFile.java @@ -71,11 +71,13 @@ public class PredefinedLogFile implements JDOMExternalizable { } + @Override public void readExternal(Element element) throws InvalidDataException { myId = element.getAttributeValue(ID_ATTRIBUTE); myEnabled = Boolean.parseBoolean(element.getAttributeValue(ENABLED_ATTRIBUTE)); } + @Override public void writeExternal(Element element) throws WriteExternalException { element.setAttribute(ID_ATTRIBUTE, myId); element.setAttribute(ENABLED_ATTRIBUTE, String.valueOf(myEnabled)); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java index d891f0cde965..917a1b3d3ee1 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java @@ -64,31 +64,38 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements myIcon = factory.getIcon(); } + @Override public int getUniqueID() { return System.identityHashCode(this); } + @Override public final ConfigurationFactory getFactory() { return myFactory; } + @Override public final void setName(final String name) { myName = name; } + @Override public final Project getProject() { return myProject; } + @Override @NotNull public ConfigurationType getType() { return myFactory.getType(); } + @Override public Icon getIcon() { return myIcon; } + @Override public final String getName() { return myName; } @@ -104,6 +111,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements public void checkSettingsBeforeRun() throws RuntimeConfigurationException { } + @Override public boolean canRunOn(@NotNull ExecutionTarget target) { return true; } @@ -112,6 +120,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements return super.equals(obj); } + @Override public RunConfiguration clone() { final RunConfigurationBase runConfiguration = (RunConfigurationBase)super.clone(); runConfiguration.myLogFiles = new ArrayList(myLogFiles); @@ -176,6 +185,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements public void customizeLogConsole(LogConsole console) { } + @Override public void readExternal(Element element) throws InvalidDataException { myLogFiles.clear(); for (final Object o : element.getChildren(LOG_FILE)) { @@ -200,6 +210,7 @@ public abstract class RunConfigurationBase extends UserDataHolderBase implements myShowConsoleOnStdErr = Boolean.parseBoolean(element.getAttributeValue(SHOW_CONSOLE_ON_STD_ERR)); } + @Override public void writeExternal(Element element) throws WriteExternalException { for (final LogFileOptions options : myLogFiles) { Element logFile = new Element(LOG_FILE); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java index 1aed78cf5a53..c19a4bd9c5e8 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationModule.java @@ -42,6 +42,7 @@ public class RunConfigurationModule implements JDOMExternalizable { myProject = project; } + @Override @SuppressWarnings({"unchecked"}) public void readExternal(final Element element) throws InvalidDataException { final List modules = (List)element.getChildren(ELEMENT); @@ -55,6 +56,7 @@ public class RunConfigurationModule implements JDOMExternalizable { } } + @Override public void writeExternal(final Element parent) throws WriteExternalException { final Element element = new Element(ELEMENT); element.setAttribute(ATTRIBUTE, getModuleName()); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java index cb9c18c78cfb..c18bf0328d1f 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RunnerSettings.java @@ -37,12 +37,14 @@ public final class RunnerSettings implements JDOME return myConfig; } + @Override public void readExternal(Element element) throws InvalidDataException { if (myData != null) { myData.readExternal(element); } } + @Override public void writeExternal(Element element) throws WriteExternalException { if (myData != null) { myData.writeExternal(element); diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java index 36952a5b22d5..bc561a8676c9 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java @@ -33,31 +33,38 @@ public abstract class RuntimeConfiguration extends RunConfigurationBase implemen super(project, factory, name); } + @Override @NotNull public Module[] getModules() { return Module.EMPTY_ARRAY; } + @Override public void checkConfiguration() throws RuntimeConfigurationException { } + @Override public RuntimeConfiguration clone() { return (RuntimeConfiguration)super.clone(); } + @Override public JDOMExternalizable createRunnerSettings(ConfigurationInfoProvider provider) { return null; } + @Override public SettingsEditor getRunnerSettingsEditor(ProgramRunner runner) { return null; } + @Override public boolean isGeneratedName() { return false; } + @Override @NonNls public String suggestedName() { return null; } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java b/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java index 95c74e3cd1b3..77507362b63f 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java @@ -31,23 +31,28 @@ public class UnknownConfigurationType implements ConfigurationType { public static final String NAME = "Unknown"; + @Override public String getDisplayName() { return getId(); } + @Override public String getConfigurationTypeDescription() { return "Configuration which cannot be loaded due to some reasons"; } + @Override public Icon getIcon() { return AllIcons.RunConfigurations.Unknown; } + @Override @NotNull public String getId() { return NAME; } + @Override public ConfigurationFactory[] getConfigurationFactories() { return new ConfigurationFactory[] {new ConfigurationFactory(new UnknownConfigurationType()) { @Override diff --git a/platform/lang-api/src/com/intellij/execution/configurations/UnknownRunConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/UnknownRunConfiguration.java index defdc44907f2..6d4936b3e04d 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/UnknownRunConfiguration.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/UnknownRunConfiguration.java @@ -56,6 +56,7 @@ public class UnknownRunConfiguration implements RunConfiguration { myDoNotStore = b; } + @Override @Nullable public Icon getIcon() { return null; @@ -65,35 +66,43 @@ public class UnknownRunConfiguration implements RunConfiguration { return myDoNotStore; } + @Override public ConfigurationFactory getFactory() { return myFactory; } + @Override public void setName(final String name) { myName = name; } + @Override public SettingsEditor getConfigurationEditor() { return new UnknownSettingsEditor(); } + @Override public Project getProject() { return myProject; } + @Override @NotNull public ConfigurationType getType() { return UnknownConfigurationType.INSTANCE; } + @Override public JDOMExternalizable createRunnerSettings(final ConfigurationInfoProvider provider) { return null; } + @Override public SettingsEditor getRunnerSettingsEditor(final ProgramRunner runner) { return null; } + @Override public RunConfiguration clone() { try { final UnknownRunConfiguration cloned = (UnknownRunConfiguration) super.clone(); @@ -104,14 +113,17 @@ public class UnknownRunConfiguration implements RunConfiguration { } + @Override public int getUniqueID() { return System.identityHashCode(this); } + @Override public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException { return null; } + @Override public String getName() { if (myName == null) { myName = String.format("Unknown%s", myUniqueName.getAndAdd(1)); @@ -120,14 +132,17 @@ public class UnknownRunConfiguration implements RunConfiguration { return myName; } + @Override public void checkConfiguration() throws RuntimeConfigurationException { throw new RuntimeConfigurationException("Broken configuration due to unavailable plugin or invalid configuration data."); } + @Override public void readExternal(final Element element) throws InvalidDataException { myStoredElement = (Element) element.clone(); } + @Override public void writeExternal(final Element element) throws WriteExternalException { if (myStoredElement != null) { final List attributeList = myStoredElement.getAttributes(); @@ -154,17 +169,21 @@ public class UnknownRunConfiguration implements RunConfiguration { myPanel.add(new JLabel("This configuration cannot be edited", JLabel.CENTER)); } + @Override protected void resetEditorFrom(final UnknownRunConfiguration s) { } + @Override protected void applyEditorTo(final UnknownRunConfiguration s) throws ConfigurationException { } + @Override @NotNull protected JComponent createEditor() { return myPanel; } + @Override protected void disposeEditor() { } } diff --git a/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java b/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java index 4f7a50e79c1b..8c4be8858db0 100644 --- a/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java +++ b/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java @@ -33,46 +33,56 @@ import javax.swing.*; public class DefaultRunExecutor extends Executor { @NonNls public static final String EXECUTOR_ID = ToolWindowId.RUN; + @Override @NotNull public String getStartActionText() { return ExecutionBundle.message("default.runner.start.action.text"); } + @Override public String getToolWindowId() { return ToolWindowId.RUN; } + @Override public Icon getToolWindowIcon() { return AllIcons.Toolwindows.ToolWindowRun; } + @Override @NotNull public Icon getIcon() { return AllIcons.Actions.Execute; } + @Override public Icon getDisabledIcon() { return AllIcons.Process.DisabledRun; } + @Override public String getDescription() { return ExecutionBundle.message("standard.runner.description"); } + @Override @NotNull public String getActionName() { return UIBundle.message("tool.window.name.run"); } + @Override @NotNull public String getId() { return EXECUTOR_ID; } + @Override public String getContextActionId() { return "RunClass"; } + @Override public String getHelpId() { return "ideaInterface.run"; } diff --git a/platform/lang-api/src/com/intellij/execution/filters/OpenFileHyperlinkInfo.java b/platform/lang-api/src/com/intellij/execution/filters/OpenFileHyperlinkInfo.java index 9b7ef584162a..312112bf2239 100644 --- a/platform/lang-api/src/com/intellij/execution/filters/OpenFileHyperlinkInfo.java +++ b/platform/lang-api/src/com/intellij/execution/filters/OpenFileHyperlinkInfo.java @@ -50,6 +50,7 @@ public final class OpenFileHyperlinkInfo implements FileHyperlinkInfo { this(project, file, line, 0); } + @Override public OpenFileDescriptor getDescriptor() { if (!myFile.isValid()) { return null; @@ -63,8 +64,10 @@ public final class OpenFileHyperlinkInfo implements FileHyperlinkInfo { return new OpenFileDescriptor(myProject, myFile, myDocumentLine, myDocumentColumn); } + @Override public void navigate(final Project project) { ApplicationManager.getApplication().runReadAction(new Runnable() { + @Override public void run() { final VirtualFile file = myFile; if (file.isValid()) { diff --git a/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java b/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java index 33b6fa914cf4..1f05008ba151 100644 --- a/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java +++ b/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java @@ -135,6 +135,7 @@ public class RegexpFilter implements Filter { return expression; } + @Override public Result applyFilter(final String line, final int entireLength) { final Matcher matcher = myPattern.matcher(line); diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java index 40cf1f791019..37a2682f8404 100644 --- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Comparator; public abstract class RuntimeConfigurationProducer implements Comparable, Cloneable { - public static final ExtensionPointName RUNTIME_CONFIGURATION_PRODUCER = ExtensionPointName.create("com.intellij.configurationProducer"); + public static final ExtensionPointName RUNTIME_CONFIGURATION_PRODUCER = ExtensionPointName.create("com.intellij.configurationProducer"); public static final Comparator COMPARATOR = new ProducerComparator(); protected static final int PREFERED = -1; @@ -98,6 +98,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea return null; } + @Override public RuntimeConfigurationProducer clone() { assert !isClone; try { @@ -128,7 +129,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea public ConfigurationType getConfigurationType() { return myConfigurationFactory.getType(); } - + public void perform(ConfigurationContext context, Runnable performRunnable){ performRunnable.run(); } @@ -145,6 +146,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea } private static class ProducerComparator implements Comparator { + @Override public int compare(final RuntimeConfigurationProducer producer1, final RuntimeConfigurationProducer producer2) { final PsiElement psiElement1 = producer1.getSourceElement(); final PsiElement psiElement2 = producer2.getSourceElement(); @@ -170,6 +172,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea myConfig = config; } + @Override public SettingsEditor getConfigurationEditor() { return myConfig.getConfigurationEditor(); } @@ -180,6 +183,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea return new DelegatingRuntimeConfiguration((T)myConfig.clone()); } + @Override public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment env) throws ExecutionException { return myConfig.getState(executor, env); } diff --git a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java index e35609712c52..1a0b35b70aed 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java +++ b/platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java @@ -224,6 +224,7 @@ public class ExecutionEnvironment extends UserDataHolderBase { @Deprecated public DataContext getDataContext() { return new DataContext() { + @Override public Object getData(@NonNls String dataId) { return PlatformDataKeys.PROJECT.is(dataId) ? myProject : null; } diff --git a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java index c16363ba2d35..555422c38930 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java @@ -37,31 +37,38 @@ public abstract class GenericProgramRunner public static final DataKey CONTENT_TO_REUSE_DATA_KEY = DataKey.create("contentToReuse"); @Deprecated @NonNls public static final String CONTENT_TO_REUSE = CONTENT_TO_REUSE_DATA_KEY.getName(); + @Override @Nullable public Settings createConfigurationData(final ConfigurationInfoProvider settingsProvider) { return null; } + @Override public void checkConfiguration(final RunnerSettings settings, final ConfigurationPerRunnerSettings configurationPerRunnerSettings) throws RuntimeConfigurationException { } + @Override public void onProcessStarted(final RunnerSettings settings, final ExecutionResult executionResult) { } + @Override public AnAction[] createActions(final ExecutionResult executionResult) { return AnAction.EMPTY_ARRAY; } + @Override @Nullable public SettingsEditor getSettingsEditor(final Executor executor, final RunConfiguration configuration) { return null; } + @Override public void execute(@NotNull final Executor executor, @NotNull final ExecutionEnvironment environment) throws ExecutionException { execute(executor, environment, null); } + @Override public void execute(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env, @Nullable final Callback callback) throws ExecutionException { diff --git a/platform/lang-api/src/com/intellij/execution/ui/actions/BaseViewAction.java b/platform/lang-api/src/com/intellij/execution/ui/actions/BaseViewAction.java index 06c8cd55a7d7..b8bca20b8d88 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/actions/BaseViewAction.java +++ b/platform/lang-api/src/com/intellij/execution/ui/actions/BaseViewAction.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable; public abstract class BaseViewAction extends DumbAwareAction { + @Override public final void update(final AnActionEvent e) { ViewContext context = getViewFacade(e); Content[] content = getContent(e); @@ -55,13 +56,14 @@ public abstract class BaseViewAction extends DumbAwareAction { } + @Override public final void actionPerformed(final AnActionEvent e) { actionPerformed(e, getViewFacade(e), getContent(e)); } protected abstract void actionPerformed(AnActionEvent e, ViewContext context, Content[] content); - + @Nullable private ViewContext getViewFacade(final AnActionEvent e) { diff --git a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java index 4c01de3fdd9f..888647851475 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java +++ b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java @@ -40,6 +40,7 @@ public class CloseAction extends AnAction implements DumbAware { templatePresentation.setDescription(null); } + @Override public void actionPerformed(AnActionEvent e) { final RunContentDescriptor contentDescriptor = getContentDescriptor(); if (contentDescriptor == null) { @@ -60,6 +61,7 @@ public class CloseAction extends AnAction implements DumbAware { return myExecutor; } + @Override public void update(AnActionEvent e) { e.getPresentation().setEnabled(myContentDescriptor != null); } diff --git a/platform/lang-api/src/com/intellij/execution/ui/layout/CellTransform.java b/platform/lang-api/src/com/intellij/execution/ui/layout/CellTransform.java index b9c7b21da197..6ca574195417 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/layout/CellTransform.java +++ b/platform/lang-api/src/com/intellij/execution/ui/layout/CellTransform.java @@ -34,11 +34,13 @@ public interface CellTransform { myActions.add(restore); } + @Override public ActionCallback restoreInGrid() { myRestoringNow = true; if (myActions.size() == 0) return new ActionCallback.Done(); final ActionCallback topCallback = restore(0); return topCallback.doWhenDone(new Runnable() { + @Override public void run() { myActions.clear(); myRestoringNow = false; @@ -51,6 +53,7 @@ public interface CellTransform { final Restore action = myActions.get(index); final ActionCallback actionCalback = action.restoreInGrid(); actionCalback.doWhenDone(new Runnable() { + @Override public void run() { if (index < myActions.size() - 1) { restore(index + 1).notifyWhenDone(result); @@ -73,5 +76,5 @@ public interface CellTransform { interface Facade { void minimize(Content content, Restore restore); } - + } diff --git a/platform/lang-api/src/com/intellij/execution/ui/layout/LayoutAttractionPolicy.java b/platform/lang-api/src/com/intellij/execution/ui/layout/LayoutAttractionPolicy.java index cb28328bbfc4..fca79d48e073 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/layout/LayoutAttractionPolicy.java +++ b/platform/lang-api/src/com/intellij/execution/ui/layout/LayoutAttractionPolicy.java @@ -26,10 +26,12 @@ public abstract class LayoutAttractionPolicy { public abstract void clearAttraction(Content content, RunnerLayoutUi ui); public static class Bounce extends LayoutAttractionPolicy { + @Override public void attract(final Content content, final RunnerLayoutUi ui) { ui.setBouncing(content, true); } + @Override public void clearAttraction(final Content content, final RunnerLayoutUi ui) { ui.setBouncing(content, false); } @@ -48,6 +50,7 @@ public abstract class LayoutAttractionPolicy { myRequestFocus = requestFocus; } + @Override public void attract(final Content content, final RunnerLayoutUi ui) { if (!myWasAttracted) { myWasAttracted = true; @@ -57,16 +60,19 @@ public abstract class LayoutAttractionPolicy { } } + @Override public void clearAttraction(final Content content, final RunnerLayoutUi ui) { ui.setBouncing(content, false); } } public static class FocusAlways extends LayoutAttractionPolicy { + @Override public void attract(final Content content, final RunnerLayoutUi ui) { ui.selectAndFocus(content, true, true); } + @Override public void clearAttraction(final Content content, final RunnerLayoutUi ui) { } } diff --git a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java index 04dcf3e43db1..be4db4d892a4 100644 --- a/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java +++ b/platform/lang-api/src/com/intellij/execution/util/EnvVariablesTable.java @@ -26,14 +26,17 @@ public class EnvVariablesTable extends ListTableWithButtons @Override protected ListTableModel createListModel() { final ColumnInfo name = new ElementsColumnInfoBase("Name") { + @Override public String valueOf(EnvironmentVariable environmentVariable) { return environmentVariable.getName(); } + @Override public boolean isCellEditable(EnvironmentVariable environmentVariable) { return environmentVariable.getNameIsWriteable(); } + @Override public void setValue(EnvironmentVariable environmentVariable, String s) { if (s.equals(valueOf(environmentVariable))) { return; @@ -49,14 +52,17 @@ public class EnvVariablesTable extends ListTableWithButtons }; final ColumnInfo value = new ElementsColumnInfoBase("Value") { + @Override public String valueOf(EnvironmentVariable environmentVariable) { return environmentVariable.getValue(); } + @Override public boolean isCellEditable(EnvironmentVariable environmentVariable) { return !environmentVariable.getIsPredefined(); } + @Override public void setValue(EnvironmentVariable environmentVariable, String s) { if (s.equals(valueOf(environmentVariable))) { return; diff --git a/platform/lang-api/src/com/intellij/execution/util/EnvironmentVariable.java b/platform/lang-api/src/com/intellij/execution/util/EnvironmentVariable.java index 33e58872134b..00745d42d0bf 100644 --- a/platform/lang-api/src/com/intellij/execution/util/EnvironmentVariable.java +++ b/platform/lang-api/src/com/intellij/execution/util/EnvironmentVariable.java @@ -62,10 +62,12 @@ public class EnvironmentVariable implements JDOMExternalizable, Cloneable { return IS_PREDEFINED; } + @Override public void readExternal(Element element) throws InvalidDataException { DefaultJDOMExternalizer.readExternal(this, element); } + @Override public void writeExternal(Element element) throws WriteExternalException { DefaultJDOMExternalizer.writeExternal(this, element); } @@ -74,6 +76,7 @@ public class EnvironmentVariable implements JDOMExternalizable, Cloneable { return true; } + @Override public EnvironmentVariable clone() { try { return (EnvironmentVariable)super.clone(); diff --git a/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java b/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java index be93f582fc38..2b310e788516 100644 --- a/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java +++ b/platform/lang-api/src/com/intellij/execution/util/ListTableWithButtons.java @@ -51,6 +51,7 @@ public abstract class ListTableWithButtons extends Observable { myTableView.stopEditing(); setModified(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { myElements.add(createElement()); myTableView.getTableViewModel().setItems(myElements); diff --git a/platform/lang-api/src/com/intellij/execution/util/PathMappingTable.java b/platform/lang-api/src/com/intellij/execution/util/PathMappingTable.java index 431702249ca3..715263265f17 100644 --- a/platform/lang-api/src/com/intellij/execution/util/PathMappingTable.java +++ b/platform/lang-api/src/com/intellij/execution/util/PathMappingTable.java @@ -24,14 +24,17 @@ final class PathMappingTable extends ListTableWithButtons("Local path") { + @Override public String valueOf(PathMappingSettings.PathMapping pathMapping) { return pathMapping.getLocalRoot(); } + @Override public boolean isCellEditable(PathMappingSettings.PathMapping pathMapping) { return canDeleteElement(pathMapping); } + @Override public void setValue(PathMappingSettings.PathMapping pathMapping, String s) { if (s.equals(valueOf(pathMapping))) { return; @@ -47,14 +50,17 @@ final class PathMappingTable extends ListTableWithButtons("Remote path") { + @Override public String valueOf(PathMappingSettings.PathMapping pathMapping) { return pathMapping.getRemoteRoot(); } + @Override public boolean isCellEditable(PathMappingSettings.PathMapping pathMapping) { return canDeleteElement(pathMapping); } + @Override public void setValue(PathMappingSettings.PathMapping pathMapping, String s) { if (s.equals(valueOf(pathMapping))) { return; diff --git a/platform/lang-api/src/com/intellij/execution/util/PathMappingsComponent.java b/platform/lang-api/src/com/intellij/execution/util/PathMappingsComponent.java index a46402bbfae9..2bea81ae9ea7 100644 --- a/platform/lang-api/src/com/intellij/execution/util/PathMappingsComponent.java +++ b/platform/lang-api/src/com/intellij/execution/util/PathMappingsComponent.java @@ -34,6 +34,7 @@ public final class PathMappingsComponent extends LabeledComponent extends UserDataHolderBase impl public void disposeFacet() { } + @Override public final void dispose() { assert !isDisposed; isDisposed = true; diff --git a/platform/lang-api/src/com/intellij/facet/FacetConfiguration.java b/platform/lang-api/src/com/intellij/facet/FacetConfiguration.java index 8b5e8ae25537..c84c64880e13 100644 --- a/platform/lang-api/src/com/intellij/facet/FacetConfiguration.java +++ b/platform/lang-api/src/com/intellij/facet/FacetConfiguration.java @@ -46,12 +46,14 @@ public interface FacetConfiguration extends JDOMExternalizable { /** * @deprecated implement {@link com.intellij.openapi.components.PersistentStateComponent#loadState(Object)} instead */ + @Override @Deprecated void readExternal(final Element element) throws InvalidDataException; /** * @deprecated implement {@link com.intellij.openapi.components.PersistentStateComponent#getState()} instead */ + @Override @Deprecated void writeExternal(final Element element) throws WriteExternalException; } diff --git a/platform/lang-api/src/com/intellij/facet/FacetManagerAdapter.java b/platform/lang-api/src/com/intellij/facet/FacetManagerAdapter.java index f86c5a041894..57f84302c734 100644 --- a/platform/lang-api/src/com/intellij/facet/FacetManagerAdapter.java +++ b/platform/lang-api/src/com/intellij/facet/FacetManagerAdapter.java @@ -22,24 +22,31 @@ import org.jetbrains.annotations.NotNull; * @author nik */ public abstract class FacetManagerAdapter implements FacetManagerListener { + @Override public void beforeFacetAdded(@NotNull Facet facet) { } + @Override public void beforeFacetRemoved(@NotNull Facet facet) { } + @Override public void beforeFacetRenamed(@NotNull final Facet facet) { } + @Override public void facetRenamed(@NotNull final Facet facet, @NotNull final String oldName) { } + @Override public void facetAdded(@NotNull Facet facet) { } + @Override public void facetRemoved(@NotNull Facet facet) { } + @Override public void facetConfigurationChanged(@NotNull Facet facet) { } } diff --git a/platform/lang-api/src/com/intellij/facet/ProjectWideFacetAdapter.java b/platform/lang-api/src/com/intellij/facet/ProjectWideFacetAdapter.java index d7a25205c6c1..53697efd2ad2 100644 --- a/platform/lang-api/src/com/intellij/facet/ProjectWideFacetAdapter.java +++ b/platform/lang-api/src/com/intellij/facet/ProjectWideFacetAdapter.java @@ -20,21 +20,27 @@ package com.intellij.facet; * @author nik */ public abstract class ProjectWideFacetAdapter implements ProjectWideFacetListener { + @Override public void firstFacetAdded() { } + @Override public void facetAdded(final F facet) { } + @Override public void facetConfigurationChanged(final F facet) { } + @Override public void beforeFacetRemoved(final F facet) { } + @Override public void facetRemoved(final F facet) { } + @Override public void allFacetsRemoved() { } } diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java index ddc7987e124e..460a1fdaf102 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java @@ -105,6 +105,7 @@ public class LibrariesDownloadAssistant { @Nullable private static Artifact findVersion(@Nullable Artifact[] versions, @NotNull final String versionId) { return versions == null ? null : ContainerUtil.find(versions, new Condition() { + @Override public boolean value(final Artifact springVersion) { return versionId.equals(springVersion.getVersion()); } diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java b/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java index 380afcbc6286..89d33e1b54ae 100644 --- a/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java +++ b/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java @@ -71,6 +71,7 @@ public abstract class FacetBasedFrameworkSupportProvider extend return getProviderId(type); } + @Override @Nullable public String getUnderlyingFrameworkId() { FacetTypeId typeId = myFacetType.getUnderlyingFacetType(); @@ -81,18 +82,22 @@ public abstract class FacetBasedFrameworkSupportProvider extend } + @Override public boolean isEnabledForModuleType(@NotNull final ModuleType moduleType) { return myFacetType.isSuitableModuleType(moduleType); } + @Override public boolean isSupportAlreadyAdded(@NotNull final Module module, @NotNull FacetsProvider facetsProvider) { return !facetsProvider.getFacetsByType(module, myFacetType.getId()).isEmpty(); } + @Override public Icon getIcon() { return myFacetType.getIcon(); } + @Override protected void addSupport(@NotNull final Module module, @NotNull final ModifiableRootModel rootModel, final FrameworkVersion version, final @Nullable Library library) { FacetManager facetManager = FacetManager.getInstance(module); ModifiableFacetModel model = facetManager.createModifiableModel(); diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java index 322c995a98cd..fbb52d5875a8 100644 --- a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java +++ b/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java @@ -32,6 +32,7 @@ import javax.swing.*; */ public abstract class FacetEditorTab implements Configurable { + @Override @Nullable @NonNls public String getHelpTopic() { diff --git a/platform/lang-api/src/com/intellij/find/FindModel.java b/platform/lang-api/src/com/intellij/find/FindModel.java index c149c2754ae2..a09070c1ed24 100644 --- a/platform/lang-api/src/com/intellij/find/FindModel.java +++ b/platform/lang-api/src/com/intellij/find/FindModel.java @@ -657,6 +657,7 @@ public class FindModel extends UserDataHolderBase implements Cloneable { } } + @Override public Object clone() { return super.clone(); } diff --git a/platform/lang-api/src/com/intellij/find/SearchInBackgroundOption.java b/platform/lang-api/src/com/intellij/find/SearchInBackgroundOption.java index bc4bcf79a46b..a538da036cd4 100644 --- a/platform/lang-api/src/com/intellij/find/SearchInBackgroundOption.java +++ b/platform/lang-api/src/com/intellij/find/SearchInBackgroundOption.java @@ -23,10 +23,12 @@ import com.intellij.openapi.progress.PerformInBackgroundOption; * @author max */ public class SearchInBackgroundOption implements PerformInBackgroundOption { + @Override public boolean shouldStartInBackground() { return GeneralSettings.getInstance().isSearchInBackground(); } + @Override public void processSentToBackground() { GeneralSettings.getInstance().setSearchInBackground(true); } diff --git a/platform/lang-api/src/com/intellij/framework/detection/FileContentPattern.java b/platform/lang-api/src/com/intellij/framework/detection/FileContentPattern.java index 423160a5dfad..c2f53e537bd5 100644 --- a/platform/lang-api/src/com/intellij/framework/detection/FileContentPattern.java +++ b/platform/lang-api/src/com/intellij/framework/detection/FileContentPattern.java @@ -86,6 +86,7 @@ public class FileContentPattern extends ObjectPattern namespacePattern) { return with(new PatternCondition("xmlWithRootTagNamespace") { + @Override public boolean accepts(@NotNull final FileContent fileContent, final ProcessingContext context) { try { String rootTagNamespace = parseHeaderWithException(fileContent).getRootTagNamespace(); diff --git a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java index 702cb13ab934..7a00df63d88e 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java +++ b/platform/lang-api/src/com/intellij/ide/actions/CreateElementActionBase.java @@ -61,6 +61,7 @@ public abstract class CreateElementActionBase extends AnAction { protected abstract String getActionName(PsiDirectory directory, String newName); + @Override public final void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); @@ -80,6 +81,7 @@ public abstract class CreateElementActionBase extends AnAction { } } + @Override public void update(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); final Presentation presentation = e.getPresentation(); @@ -90,6 +92,7 @@ public abstract class CreateElementActionBase extends AnAction { presentation.setEnabled(enabled); } + @Override public boolean isDumbAware() { return false; } @@ -130,6 +133,7 @@ public abstract class CreateElementActionBase extends AnAction { myDirectory = directory; } + @Override public boolean checkInput(final String inputString) { return true; } @@ -144,6 +148,7 @@ public abstract class CreateElementActionBase extends AnAction { return CreateElementActionBase.this.getActionName(myDirectory, newName); } + @Override public boolean canClose(final String inputString) { myCreatedElements = tryCreate(inputString); return myCreatedElements.length > 0; diff --git a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java index 0992221826a0..1579ecb634fa 100644 --- a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java +++ b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java @@ -64,6 +64,7 @@ public abstract class ElementCreator { final String commandName = getActionName(inputString); new WriteCommandAction(myProject, commandName) { + @Override protected void run(Result result) throws Throwable { LocalHistoryAction action = LocalHistoryAction.NULL; try { diff --git a/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateGroupDescriptor.java b/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateGroupDescriptor.java index 77b4939d3dfd..a15c6fb8eb5a 100644 --- a/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateGroupDescriptor.java +++ b/platform/lang-api/src/com/intellij/ide/fileTemplates/FileTemplateGroupDescriptor.java @@ -46,6 +46,7 @@ public class FileTemplateGroupDescriptor extends FileTemplateDescriptor { return myTemplates.toArray(new FileTemplateDescriptor[myTemplates.size()]); } + @Override public String getDisplayName() { return getTitle(); } diff --git a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java index cb8047482843..ad18061f8750 100644 --- a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java +++ b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java @@ -73,6 +73,7 @@ public abstract class ProjectViewNode extends AbstractTreeNode im * * @return the virtual file instance, or null if the project view node doesn't represent a virtual file. */ + @Override @Nullable public VirtualFile getVirtualFile() { return null; @@ -162,6 +163,7 @@ public abstract class ProjectViewNode extends AbstractTreeNode im return false; } + @Override public Collection getRoots() { Value value = getValue(); @@ -182,10 +184,12 @@ public abstract class ProjectViewNode extends AbstractTreeNode im } + @Override protected boolean hasProblemFileBeneath() { if (!Registry.is("projectView.showHierarchyErrors")) return false; return WolfTheProblemSolver.getInstance(getProject()).hasProblemFilesBeneath(new Condition() { + @Override public boolean value(final VirtualFile virtualFile) { return contains(virtualFile) // in case of flattened packages, when package node a.b.c contains error file, node a.b might not. diff --git a/platform/lang-api/src/com/intellij/ide/projectView/ViewSettings.java b/platform/lang-api/src/com/intellij/ide/projectView/ViewSettings.java index 2181388e2138..bc11154a08ad 100644 --- a/platform/lang-api/src/com/intellij/ide/projectView/ViewSettings.java +++ b/platform/lang-api/src/com/intellij/ide/projectView/ViewSettings.java @@ -26,30 +26,37 @@ public interface ViewSettings extends NodeOptions { * The default view settings for the project view. */ ViewSettings DEFAULT = new ViewSettings() { + @Override public boolean isShowMembers() { return false; } + @Override public boolean isAbbreviatePackageNames() { return false; } + @Override public boolean isFlattenPackages() { return false; } + @Override public boolean isHideEmptyMiddlePackages() { return false; } + @Override public boolean isShowLibraryContents() { return false; } + @Override public boolean isStructureView() { return false; } + @Override public boolean isShowModules() { return true; } diff --git a/platform/lang-api/src/com/intellij/ide/structureView/StructureViewModelBase.java b/platform/lang-api/src/com/intellij/ide/structureView/StructureViewModelBase.java index 04b1d416fb0f..00d9f5134253 100644 --- a/platform/lang-api/src/com/intellij/ide/structureView/StructureViewModelBase.java +++ b/platform/lang-api/src/com/intellij/ide/structureView/StructureViewModelBase.java @@ -33,6 +33,7 @@ public class StructureViewModelBase extends TextEditorBasedStructureViewModel { myRoot = root; } + @Override @NotNull public StructureViewTreeElement getRoot() { return myRoot; diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java index 35d78cb5f3b4..9cf56217a49c 100644 --- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java +++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportConfigurableBase.java @@ -62,6 +62,7 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab }); updateAvailableVersions(versions); myVersionComboBox.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { fireFrameworkVersionChanged(); } @@ -92,10 +93,11 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab myVersionComboBox.setVisible(hasMoreThanOneVersion); } + @Override public JComponent getComponent() { return myVersions.size() > 1 ? myMainPanel : null; } - + protected void reloadVersions(List frameworkVersions) { myVersions.clear(); for (FrameworkVersion version : frameworkVersions) { @@ -103,6 +105,7 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab } } + @Override @NotNull public List getVersions() { return myVersions; @@ -113,10 +116,12 @@ public class FrameworkSupportConfigurableBase extends FrameworkSupportConfigurab return getSelectedVersion().getLibraries(); } + @Override public void addSupport(@NotNull final Module module, @NotNull final ModifiableRootModel rootModel, final @Nullable Library library) { myFrameworkSupportProvider.addSupport(module, rootModel, getSelectedVersion(), library); } + @Override public FrameworkVersion getSelectedVersion() { return (FrameworkVersion)myVersionComboBox.getSelectedItem(); } diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderBase.java b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderBase.java index 07d859395e61..2c07fc110628 100644 --- a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderBase.java +++ b/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportProviderBase.java @@ -46,6 +46,7 @@ public abstract class FrameworkSupportProviderBase extends FrameworkSupportProvi return "Version:"; } + @Override @NotNull public FrameworkSupportConfigurableBase createConfigurable(final @NotNull FrameworkSupportModel model) { return new FrameworkSupportConfigurableBase(this, model, getVersions(), getVersionLabelText()); diff --git a/platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNamePopupComponent.java b/platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNamePopupComponent.java index eb2fc32004ee..951cae80e93f 100644 --- a/platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNamePopupComponent.java +++ b/platform/lang-api/src/com/intellij/ide/util/gotoByName/ChooseByNamePopupComponent.java @@ -39,6 +39,7 @@ public interface ChooseByNamePopupComponent { * @author Konstantin Bulenkov */ abstract class MultiElementsCallback extends Callback { + @Override public final void elementChosen(Object element){} public abstract void elementsChosen(List elements); } diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/EmptyModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/EmptyModuleBuilder.java index 0a9f827e37d0..38bb9642b563 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/EmptyModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/EmptyModuleBuilder.java @@ -25,18 +25,22 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.roots.ModifiableRootModel; public class EmptyModuleBuilder extends ModuleBuilder{ + @Override public boolean isOpenProjectSettingsAfter() { return true; } + @Override public boolean canCreateModule() { return false; } + @Override public void setupRootModel(ModifiableRootModel modifiableRootModel) throws ConfigurationException { //do nothing } + @Override public ModuleType getModuleType() { return ModuleType.EMPTY; } diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java index e8857c07e88c..314607cb65a0 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java @@ -31,6 +31,7 @@ public abstract class ModuleWizardStep extends StepAdapter { protected static final Icon ICON = IconLoader.getIcon("/addmodulewizard.png"); public static final ModuleWizardStep[] EMPTY_ARRAY = new ModuleWizardStep[0]; + @Override public abstract JComponent getComponent(); public abstract void updateDataModel(); @@ -50,6 +51,7 @@ public abstract class ModuleWizardStep extends StepAdapter { // empty by default } + @Override public Icon getIcon() { return ICON; } diff --git a/platform/lang-api/src/com/intellij/lang/DefaultWordCompletionFilter.java b/platform/lang-api/src/com/intellij/lang/DefaultWordCompletionFilter.java index 10748cde4272..85ea7f77f0ee 100644 --- a/platform/lang-api/src/com/intellij/lang/DefaultWordCompletionFilter.java +++ b/platform/lang-api/src/com/intellij/lang/DefaultWordCompletionFilter.java @@ -24,6 +24,7 @@ import com.intellij.codeInsight.completion.CompletionService; import com.intellij.psi.tree.IElementType; public class DefaultWordCompletionFilter implements WordCompletionElementFilter { + @Override public boolean isWordCompletionEnabledIn(final IElementType element) { final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(element.getLanguage()); return parserDefinition != null && parserDefinition.getCommentTokens().contains(element); diff --git a/platform/lang-api/src/com/intellij/lang/LanguageDocumentation.java b/platform/lang-api/src/com/intellij/lang/LanguageDocumentation.java index d67283065d98..f50d0c8966b8 100644 --- a/platform/lang-api/src/com/intellij/lang/LanguageDocumentation.java +++ b/platform/lang-api/src/com/intellij/lang/LanguageDocumentation.java @@ -32,6 +32,7 @@ public class LanguageDocumentation extends LanguageExtension providers = allForLanguage(l); if (providers.size() < 2) { diff --git a/platform/lang-api/src/com/intellij/lang/LanguageLiteralEscapers.java b/platform/lang-api/src/com/intellij/lang/LanguageLiteralEscapers.java index 7941a013ae75..1ed7d41f74e6 100644 --- a/platform/lang-api/src/com/intellij/lang/LanguageLiteralEscapers.java +++ b/platform/lang-api/src/com/intellij/lang/LanguageLiteralEscapers.java @@ -26,14 +26,17 @@ public class LanguageLiteralEscapers extends LanguageExtension { private LanguageLiteralEscapers() { super("com.intellij.lang.literalEscaper", new LiteralEscaper() { + @Override public String getEscapedText(final PsiElement context, final String originalText) { return originalText; } + @Override public String escapeText(String originalText) { return originalText; } + @Override public String unescapeText(String originalText) { return originalText; } diff --git a/platform/lang-api/src/com/intellij/lang/LanguageNamesValidation.java b/platform/lang-api/src/com/intellij/lang/LanguageNamesValidation.java index d66441ff19c4..5a2ec6c42095 100644 --- a/platform/lang-api/src/com/intellij/lang/LanguageNamesValidation.java +++ b/platform/lang-api/src/com/intellij/lang/LanguageNamesValidation.java @@ -28,8 +28,9 @@ public class LanguageNamesValidation extends LanguageExtension { private LanguageNamesValidation() { super("com.intellij.lang.namesValidator", new DefaultNamesValidator()); } - + protected static class DefaultNamesValidator implements NamesValidator { + @Override public boolean isIdentifier(final String name, final Project project) { final int len = name.length(); if (len == 0) return false; @@ -43,6 +44,7 @@ public class LanguageNamesValidation extends LanguageExtension { return true; } + @Override public boolean isKeyword(final String name, final Project project) { return false; } diff --git a/platform/lang-api/src/com/intellij/lang/NodeStructure.java b/platform/lang-api/src/com/intellij/lang/NodeStructure.java index 39683c12c4b4..fc990b4cbf18 100644 --- a/platform/lang-api/src/com/intellij/lang/NodeStructure.java +++ b/platform/lang-api/src/com/intellij/lang/NodeStructure.java @@ -23,14 +23,17 @@ import com.intellij.psi.tree.IElementType; public interface NodeStructure { NodeStructure LIGHTER_NODE_STRUCTURE = new NodeStructure() { + @Override public int getStartOffset(LighterASTNode node) { return node.getStartOffset(); } + @Override public int getEndOffset(LighterASTNode node) { return node.getEndOffset(); } + @Override public IElementType getTokenType(LighterASTNode node) { return node.getTokenType(); } @@ -38,19 +41,22 @@ public interface NodeStructure { NodeStructure AST_NODE_STRUCTURE = new NodeStructure() { + @Override public int getStartOffset(ASTNode node) { return node.getTextRange().getStartOffset(); } + @Override public int getEndOffset(ASTNode node) { return node.getTextRange().getEndOffset(); } + @Override public IElementType getTokenType(ASTNode node) { return node.getElementType(); } }; - + int getStartOffset(T node); int getEndOffset(T node); IElementType getTokenType(T node); diff --git a/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java b/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java index 0f8345b9ea53..e26f17147f3d 100644 --- a/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java +++ b/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java @@ -47,6 +47,7 @@ public class CacheBuilderEP implements PluginAware { } + @Override public void setPluginDescriptor(PluginDescriptor pluginDescriptor) { myPluginDescriptor = pluginDescriptor; } diff --git a/platform/lang-api/src/com/intellij/lang/documentation/CompositeDocumentationProvider.java b/platform/lang-api/src/com/intellij/lang/documentation/CompositeDocumentationProvider.java index b134ace65d15..a486696ff482 100644 --- a/platform/lang-api/src/com/intellij/lang/documentation/CompositeDocumentationProvider.java +++ b/platform/lang-api/src/com/intellij/lang/documentation/CompositeDocumentationProvider.java @@ -64,7 +64,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return true; } } - + return false; } @@ -75,7 +75,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return true; } } - + return false; } @@ -86,7 +86,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return true; } } - + return false; } @@ -98,10 +98,11 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return ((ExternalDocumentationHandler)provider).fetchExternalDocumentation(link, project); } } - + throw new IllegalStateException("Unable to find a provider to fetch documentation link!"); } + @Override public String getQuickNavigateInfo(PsiElement element, PsiElement originalElement) { for ( DocumentationProvider provider : myProviders ) { String result = provider.getQuickNavigateInfo(element, originalElement); @@ -114,6 +115,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return null; } + @Override public List getUrlFor(PsiElement element, PsiElement originalElement) { for ( DocumentationProvider provider : myProviders ) { List result = provider.getUrlFor(element,originalElement); @@ -126,6 +128,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return null; } + @Override public String generateDoc(PsiElement element, PsiElement originalElement) { for ( DocumentationProvider provider : myProviders ) { String result = provider.generateDoc(element,originalElement); @@ -138,6 +141,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return null; } + @Override public PsiElement getDocumentationElementForLookupItem(PsiManager psiManager, Object object, PsiElement element) { for ( DocumentationProvider provider : myProviders ) { PsiElement result = provider.getDocumentationElementForLookupItem(psiManager,object,element); @@ -150,6 +154,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return null; } + @Override public PsiElement getDocumentationElementForLink(PsiManager psiManager, String link, PsiElement context) { for ( DocumentationProvider provider : myProviders ) { PsiElement result = provider.getDocumentationElementForLink(psiManager,link,context); @@ -173,6 +178,7 @@ public class CompositeDocumentationProvider extends DocumentationProviderEx impl return null; } + @Override public String fetchExternalDocumentation(Project project, PsiElement element, List docUrls) { for (DocumentationProvider provider : myProviders) { if (provider instanceof ExternalDocumentationProvider) { diff --git a/platform/lang-api/src/com/intellij/lang/refactoring/InlineHandler.java b/platform/lang-api/src/com/intellij/lang/refactoring/InlineHandler.java index 773e9e9d2235..aba46c62bbb0 100644 --- a/platform/lang-api/src/com/intellij/lang/refactoring/InlineHandler.java +++ b/platform/lang-api/src/com/intellij/lang/refactoring/InlineHandler.java @@ -46,6 +46,7 @@ public interface InlineHandler { * Special settings for the case when inline cannot be performed due to already reported (by error hint) problem */ Settings CANNOT_INLINE_SETTINGS = new Settings() { + @Override public boolean isOnlyOneReferenceToInline() { return false; } diff --git a/platform/lang-api/src/com/intellij/lexer/CompositeLexer.java b/platform/lang-api/src/com/intellij/lexer/CompositeLexer.java index 72f6972595b0..74937ac0baf5 100644 --- a/platform/lang-api/src/com/intellij/lexer/CompositeLexer.java +++ b/platform/lang-api/src/com/intellij/lexer/CompositeLexer.java @@ -29,16 +29,19 @@ public abstract class CompositeLexer extends LexerBase { protected abstract IElementType getCompositeTokenType(IElementType type1, IElementType type2); + @Override public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) { myLexer1.start(buffer, startOffset, endOffset, (initialState >> 16) & 0xFFFF); myLexer2.start(buffer, startOffset, endOffset, initialState & 0xFFFF); myCurOffset = startOffset; } + @Override public CharSequence getBufferSequence() { return myLexer1.getBufferSequence(); } + @Override public int getState() { final int state = myLexer1.getState(); final int state2 = myLexer2.getState(); @@ -51,6 +54,7 @@ public abstract class CompositeLexer extends LexerBase { return 0; } + @Override public IElementType getTokenType() { IElementType type1 = myLexer1.getTokenType(); if (type1 == null) return null; @@ -58,14 +62,17 @@ public abstract class CompositeLexer extends LexerBase { return getCompositeTokenType(type1, type2); } + @Override public int getTokenStart() { return myCurOffset; } + @Override public int getTokenEnd() { return Math.min(myLexer1.getTokenEnd(), myLexer2.getTokenEnd()); } + @Override public void advance() { int end1 = myLexer1.getTokenEnd(); int end2 = myLexer2.getTokenEnd(); @@ -78,6 +85,7 @@ public abstract class CompositeLexer extends LexerBase { } } + @Override public int getBufferEnd() { return myLexer1.getBufferEnd(); } diff --git a/platform/lang-api/src/com/intellij/lexer/FilterLexer.java b/platform/lang-api/src/com/intellij/lexer/FilterLexer.java index 3ef6b4031b94..f3e3cd70d4ec 100644 --- a/platform/lang-api/src/com/intellij/lexer/FilterLexer.java +++ b/platform/lang-api/src/com/intellij/lexer/FilterLexer.java @@ -34,6 +34,7 @@ public class FilterLexer extends DelegateLexer { mySet = set; } + @Override public boolean reject(IElementType type) { return mySet.contains(type); } @@ -53,6 +54,7 @@ public class FilterLexer extends DelegateLexer { return getDelegate(); } + @Override public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) { super.start(buffer, startOffset, endOffset, initialState); myPrevTokenEnd = -1; @@ -60,6 +62,7 @@ public class FilterLexer extends DelegateLexer { } + @Override public void advance() { myPrevTokenEnd = getDelegate().getTokenEnd(); super.advance(); @@ -70,10 +73,12 @@ public class FilterLexer extends DelegateLexer { return myPrevTokenEnd; } + @Override public LexerPosition getCurrentPosition() { return getDelegate().getCurrentPosition(); //To change body of overridden methods use File | Settings | File Templates. } + @Override public void restore(LexerPosition position) { getDelegate().restore(position); myPrevTokenEnd = -1; diff --git a/platform/lang-api/src/com/intellij/lexer/LayeredLexer.java b/platform/lang-api/src/com/intellij/lexer/LayeredLexer.java index dc8c2434ba80..eabb3555c462 100644 --- a/platform/lang-api/src/com/intellij/lexer/LayeredLexer.java +++ b/platform/lang-api/src/com/intellij/lexer/LayeredLexer.java @@ -73,7 +73,8 @@ public class LayeredLexer extends DelegateLexer { } } } - + + @Override public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) { LOG.assertTrue(initialState != IN_LAYER_STATE, "Restoring to layer is not supported."); myState = initialState; @@ -83,10 +84,12 @@ public class LayeredLexer extends DelegateLexer { activateLayerIfNecessary(); } + @Override public int getState() { return myState; } + @Override public IElementType getTokenType() { if (myState == IN_LAYER_LEXER_FINISHED_STATE) { return myCurrentBaseTokenType; @@ -94,6 +97,7 @@ public class LayeredLexer extends DelegateLexer { return isLayerActive() ? myCurrentLayerLexer.getTokenType() : super.getTokenType(); } + @Override public int getTokenStart() { if (myState == IN_LAYER_LEXER_FINISHED_STATE) { return myLayerLeftPart; @@ -101,6 +105,7 @@ public class LayeredLexer extends DelegateLexer { return isLayerActive() ? myCurrentLayerLexer.getTokenStart() : super.getTokenStart(); } + @Override public int getTokenEnd() { if (myState == IN_LAYER_LEXER_FINISHED_STATE) { return myBaseTokenEnd; @@ -108,6 +113,7 @@ public class LayeredLexer extends DelegateLexer { return isLayerActive() ? myCurrentLayerLexer.getTokenEnd() : super.getTokenEnd(); } + @Override public void advance() { if (myState == IN_LAYER_LEXER_FINISHED_STATE){ myState = super.getState(); @@ -151,10 +157,12 @@ public class LayeredLexer extends DelegateLexer { myState = isLayerActive() ? IN_LAYER_STATE : super.getState(); } + @Override public LexerPosition getCurrentPosition() { return new LexerPositionImpl(getTokenStart(), getState()); } + @Override public void restore(LexerPosition position) { start(getBufferSequence(), position.getOffset(), getBufferEnd(), position.getState()); } diff --git a/platform/lang-api/src/com/intellij/lexer/StoppableLexerAdapter.java b/platform/lang-api/src/com/intellij/lexer/StoppableLexerAdapter.java index c32fdc3d3cf8..f8fec840353f 100644 --- a/platform/lang-api/src/com/intellij/lexer/StoppableLexerAdapter.java +++ b/platform/lang-api/src/com/intellij/lexer/StoppableLexerAdapter.java @@ -36,6 +36,7 @@ public class StoppableLexerAdapter extends DelegateLexer { myStopped = myCondition.stopsAt(original.getTokenType(), original.getTokenStart(), original.getTokenEnd()); } + @Override public void advance() { if (myStopped) return; super.advance(); @@ -50,18 +51,22 @@ public class StoppableLexerAdapter extends DelegateLexer { return delegate instanceof StoppableLexerAdapter ? ((StoppableLexerAdapter)delegate).getPrevTokenEnd() : ((FilterLexer)delegate).getPrevTokenEnd(); } + @Override public int getTokenEnd() { return myStopped ? super.getTokenStart() : super.getTokenEnd(); } + @Override public IElementType getTokenType() { return myStopped ? null : super.getTokenType(); } + @Override public LexerPosition getCurrentPosition() { return getDelegate().getCurrentPosition(); } + @Override public void restore(LexerPosition position) { getDelegate().restore(position); } diff --git a/platform/lang-api/src/com/intellij/lexer/StringLiteralLexer.java b/platform/lang-api/src/com/intellij/lexer/StringLiteralLexer.java index 574f6e1f9b0a..978c01bd0f61 100644 --- a/platform/lang-api/src/com/intellij/lexer/StringLiteralLexer.java +++ b/platform/lang-api/src/com/intellij/lexer/StringLiteralLexer.java @@ -73,6 +73,7 @@ public class StringLiteralLexer extends LexerBase { myAllowHex = allowHex; } + @Override public void start(CharSequence buffer, int startOffset, int endOffset, int initialState) { myBuffer = buffer; myStart = startOffset; @@ -88,10 +89,12 @@ public class StringLiteralLexer extends LexerBase { mySeenEscapedSpacesOnly = true; } + @Override public int getState() { return myLastState; } + @Override public IElementType getTokenType() { if (myStart >= myEnd) return null; @@ -160,10 +163,12 @@ public class StringLiteralLexer extends LexerBase { return true; } + @Override public int getTokenStart() { return myStart; } + @Override public int getTokenEnd() { return myEnd; } @@ -237,16 +242,19 @@ public class StringLiteralLexer extends LexerBase { return i; } + @Override public void advance() { myLastState = myState; myStart = myEnd; myEnd = locateToken(myStart); } + @Override public CharSequence getBufferSequence() { return myBuffer; } + @Override public int getBufferEnd() { return myBufferEnd; } diff --git a/platform/lang-api/src/com/intellij/openapi/paths/PathReference.java b/platform/lang-api/src/com/intellij/openapi/paths/PathReference.java index dc94ea8a22ca..a8cabfcfcb8e 100644 --- a/platform/lang-api/src/com/intellij/openapi/paths/PathReference.java +++ b/platform/lang-api/src/com/intellij/openapi/paths/PathReference.java @@ -39,6 +39,7 @@ public class PathReference { public PathReference(@NotNull String path, final @NotNull Function icon) { myPath = path; myIcon = new NullableLazyValue() { + @Override protected Icon compute() { return icon.fun(PathReference.this); } @@ -84,6 +85,7 @@ public class PathReference { myDefaultIcon = defaultValue; } + @Override public Icon fun(final PathReference pathReference) { final PsiElement element = pathReference.resolve(); return element == null ? myDefaultIcon : element.getIcon(Iconable.ICON_FLAG_READ_STATUS); diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java index 0ee3953e7cc2..626181d5df0f 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java @@ -117,6 +117,7 @@ public class JdkUtil { if (!binPath.exists()) return false; FileFilter fileFilter = new FileFilter() { + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public boolean accept(File f) { if (f.isDirectory()) return false; @@ -136,6 +137,7 @@ public class JdkUtil { if (!binPath.exists()) return false; FileFilter fileFilter = new FileFilter() { + @Override @SuppressWarnings({"HardCodedStringLiteral"}) public boolean accept(File f) { return !f.isDirectory() && Comparing.strEqual(FileUtil.getNameWithoutExtension(f), "java"); @@ -210,7 +212,7 @@ public class JdkUtil { finally { writer.close(); } - + String classpath = PathUtil.getJarPathForClass(commandLineWrapper); final String utilRtPath = PathUtil.getJarPathForClass(StringUtilRt.class); if (!classpath.equals(utilRtPath)) { @@ -221,7 +223,7 @@ public class JdkUtil { classpath += File.pathSeparator + PathUtil.getJarPathForClass(ourUrlClassLoader); classpath += File.pathSeparator + PathUtil.getJarPathForClass(THashMap.class); } - + commandLine.addParameter("-classpath"); commandLine.addParameter(classpath); } @@ -229,7 +231,7 @@ public class JdkUtil { LOG.error(e); } } - + appendEncoding(javaParameters, commandLine, vmParametersList); if (classpathFile != null) { commandLine.addParameter(commandLineWrapper.getName()); diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java index 32f9a1673395..3750efcc8683 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java @@ -54,7 +54,7 @@ public abstract class SdkType implements SdkTypeId { /** * If a path selected in the file chooser is not a valid SDK home path, returns an adjusted version of the path that is again * checked for validity. - * + * * @param homePath the path selected in the file chooser. * @return the path to be used as the SDK home. */ @@ -99,6 +99,7 @@ public abstract class SdkType implements SdkTypeId { return null; } + @Override @Nullable public SdkAdditionalData loadAdditionalData(Sdk currentSdk, Element additional) { return loadAdditionalData(additional); @@ -109,6 +110,7 @@ public abstract class SdkType implements SdkTypeId { myName = name; } + @Override public String getName() { return myName; } @@ -150,6 +152,7 @@ public abstract class SdkType implements SdkTypeId { public FileChooserDescriptor getHomeChooserDescriptor() { final FileChooserDescriptor descriptor = new FileChooserDescriptor(false, true, false, false, false, false) { + @Override public void validateSelectedFiles(VirtualFile[] files) throws Exception { if (files.length != 0){ final String selectedPath = files[0].getPath(); diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java index 5904f8b7f61f..98633e3c3de7 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java @@ -44,26 +44,31 @@ public class UnknownSdkType extends SdkType{ if (instance == null) { instance = new UnknownSdkType(typeName); ourTypeNameToInstanceMap.put(typeName, instance); - } + } return instance; } + @Override public String suggestHomePath() { return null; } + @Override public boolean isValidSdkHome(String path) { return false; } + @Override public String getVersionString(String sdkHome) { return ""; } + @Override public String suggestSdkName(String currentSdkName, String sdkHome) { return currentSdkName; } + @Override public AdditionalDataConfigurable createAdditionalDataConfigurable(SdkModel sdkModel, SdkModificator sdkModificator) { return null; } @@ -80,13 +85,16 @@ public class UnknownSdkType extends SdkType{ return null; } + @Override public void saveAdditionalData(SdkAdditionalData additionalData, Element additional) { } + @Override public String getPresentableName() { return ProjectBundle.message("sdk.unknown.name"); } + @Override public Icon getIcon() { return AllIcons.Nodes.UnknownJdk; } diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java index 6ee1dfece77d..951f89c2be2c 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -292,6 +292,7 @@ public class PathEditor { final Object[] selectedItems = getSelectedRoots(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (selectedItems != null) { setSelectedRoots(selectedItems); @@ -320,6 +321,7 @@ public class PathEditor { private static boolean isJarFile(final VirtualFile file) { return ApplicationManager.getApplication().runReadAction(new Computable() { + @Override public Boolean compute() { VirtualFile tempFile = file; if ((file.getFileSystem() instanceof JarFileSystem) && file.getParent() == null) { @@ -366,6 +368,7 @@ public class PathEditor { private final class MyCellRenderer extends DefaultListCellRenderer { private String getPresentableString(final Object value) { return ApplicationManager.getApplication().runReadAction(new Computable() { + @Override public String compute() { //noinspection HardCodedStringLiteral return (value instanceof VirtualFile) ? ((VirtualFile)value).getPresentableUrl() : "UNKNOWN OBJECT"; @@ -373,6 +376,7 @@ public class PathEditor { }); } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, getPresentableString(value), index, isSelected, cellHasFocus); if (isSelected) { diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ProjectClasspathTraversing.java b/platform/lang-api/src/com/intellij/openapi/roots/ProjectClasspathTraversing.java index bae2d79b8e0f..39d71b57f425 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ProjectClasspathTraversing.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ProjectClasspathTraversing.java @@ -74,6 +74,7 @@ public class ProjectClasspathTraversing { myIncludeTests = includeTests; } + @Override public void visit(ModuleSourceOrderEntry sourceEntry, ProjectRootsTraversing.TraverseState traverseState, RootPolicy policy) { traverseState.addAllUrls(getOutputs(traverseState.getCurrentModuleManager().getModule())); } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootsTraversing.java b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootsTraversing.java index b748e0c63d61..54066df10255 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootsTraversing.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootsTraversing.java @@ -141,10 +141,12 @@ public class ProjectRootsTraversing { myCurrentModuleManager = restored; } + @Override public T getUserData(@NotNull Key key) { return myUserData.getUserData(key); } + @Override public void putUserData(@NotNull Key key, T value) { myUserData.putUserData(key, value); } @@ -174,6 +176,7 @@ public class ProjectRootsTraversing { myVisitModule = visitModule; } + @Override public TraverseState visitJdkOrderEntry(JdkOrderEntry jdkOrderEntry, TraverseState state) { Boolean jdkProcessed = state.getUserData(JDK_PROCESSED); if (jdkProcessed != null && jdkProcessed.booleanValue()) return state; @@ -182,17 +185,20 @@ public class ProjectRootsTraversing { return state; } + @Override public TraverseState visitLibraryOrderEntry(LibraryOrderEntry libraryOrderEntry, TraverseState traverseState) { if (myVisitLibrary != null) myVisitLibrary.visit(libraryOrderEntry, traverseState, this); return traverseState; } + @Override public TraverseState visitModuleSourceOrderEntry(ModuleSourceOrderEntry sourceEntry, TraverseState traverseState) { if (myVisitSource != null) myVisitSource.visit(sourceEntry, traverseState, this); return traverseState; } + @Override public TraverseState visitModuleOrderEntry(ModuleOrderEntry moduleOrderEntry, TraverseState traverseState) { if (myVisitModule != null) myVisitModule.visit(moduleOrderEntry, traverseState, this); return traverseState; @@ -222,12 +228,14 @@ public class ProjectRootsTraversing { public static final AddModuleSource PRODUCTION_SOURCES = new AddModuleSource(true); public static final Visit ADD_CLASSES = new Visit() { + @Override public void visit(OrderEntry orderEntry, TraverseState state, RootPolicy policy) { state.addAllUrls(orderEntry.getUrls(OrderRootType.CLASSES)); } }; public static final Visit ADD_CLASSES_WITHOUT_TESTS = new Visit() { + @Override public void visit(OrderEntry orderEntry, TraverseState state, RootPolicy policy) { if (orderEntry instanceof ExportableOrderEntry) { final DependencyScope scope = ((ExportableOrderEntry)orderEntry).getScope(); @@ -251,6 +259,7 @@ public class ProjectRootsTraversing { myExcludeTests = excludeTests; } + @Override public void visit(ModuleSourceOrderEntry orderEntry, TraverseState state, RootPolicy policy) { state.addAll(ModuleRootManager.getInstance(orderEntry.getOwnerModule()).getSourceRoots(!myExcludeTests)); } @@ -263,6 +272,7 @@ public class ProjectRootsTraversing { myIncludeTests = includeTests; } + @Override public void visit(ModuleOrderEntry moduleOrderEntry, TraverseState state, RootPolicy policy) { final DependencyScope scope = moduleOrderEntry.getScope(); if (!myIncludeTests && !scope.isForProductionCompile() && !scope.isForProductionRuntime()) return; diff --git a/platform/lang-api/src/com/intellij/openapi/roots/RecursiveRootPolicy.java b/platform/lang-api/src/com/intellij/openapi/roots/RecursiveRootPolicy.java index 6869a4dda22a..ed9c59331036 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/RecursiveRootPolicy.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/RecursiveRootPolicy.java @@ -30,6 +30,7 @@ import java.util.Set; public class RecursiveRootPolicy extends RootPolicy { private final Set myProcessedModules = new HashSet(); + @Override public R visitModuleOrderEntry(final ModuleOrderEntry moduleOrderEntry, final R value) { final Module module = moduleOrderEntry.getModule(); if (module != null && !myProcessedModules.contains(module)) { diff --git a/platform/lang-api/src/com/intellij/openapi/roots/SearchingPolicy.java b/platform/lang-api/src/com/intellij/openapi/roots/SearchingPolicy.java index 50c33db9cb6f..d7eceb78e427 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/SearchingPolicy.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/SearchingPolicy.java @@ -27,6 +27,7 @@ public class SearchingPolicy extends RootPolicy{ myCondition = condition; } + @Override public OrderEntry visitOrderEntry(OrderEntry orderEntry, OrderEntry found) { if (found != null) return found; if (myCondition.value(orderEntry)) return orderEntry; diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/OrderRootTypeUIFactory.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/OrderRootTypeUIFactory.java index 381f24e09adf..bddd099fc182 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/OrderRootTypeUIFactory.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/OrderRootTypeUIFactory.java @@ -29,6 +29,7 @@ import javax.swing.*; public interface OrderRootTypeUIFactory { KeyedExtensionFactory FACTORY = new KeyedExtensionFactory(OrderRootTypeUIFactory.class, "com.intellij.OrderRootTypeUI") { + @Override public String getKey(final OrderRootType key) { return key.name(); } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java index 51381e7dc81b..d4d16f61e693 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java @@ -41,19 +41,23 @@ public class DefaultModulesProvider implements ModulesProvider { myProject = project; } + @Override @NotNull public Module[] getModules() { return ModuleManager.getInstance(myProject).getModules(); } + @Override public Module getModule(String name) { return ModuleManager.getInstance(myProject).findModuleByName(name); } + @Override public ModuleRootModel getRootModel(@NotNull Module module) { return ModuleRootManager.getInstance(module); } + @Override public FacetModel getFacetModel(@NotNull Module module) { return FacetManager.getInstance(module); } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java index 22da06c3736d..711072f9d246 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java @@ -26,18 +26,22 @@ import org.jetbrains.annotations.Nullable; public interface ModulesProvider extends RootModelProvider { ModulesProvider EMPTY_MODULES_PROVIDER = new ModulesProvider() { + @Override @NotNull public Module[] getModules() { return Module.EMPTY_ARRAY; } + @Override public Module getModule(String name) { return null; } + @Override public ModuleRootModel getRootModel(@NotNull Module module) { return ModuleRootManager.getInstance(module); } + @Override public FacetModel getFacetModel(@NotNull Module module) { return FacetManager.getInstance(module); } diff --git a/platform/lang-api/src/com/intellij/patterns/IElementTypePattern.java b/platform/lang-api/src/com/intellij/patterns/IElementTypePattern.java index 655b135c7254..8c9948e2d50b 100644 --- a/platform/lang-api/src/com/intellij/patterns/IElementTypePattern.java +++ b/platform/lang-api/src/com/intellij/patterns/IElementTypePattern.java @@ -34,6 +34,7 @@ public class IElementTypePattern extends ObjectPattern("tokenSet") { + @Override public boolean accepts(@NotNull final IElementType type, final ProcessingContext context) { return tokenSet.contains(type); } diff --git a/platform/lang-api/src/com/intellij/patterns/PsiElementPattern.java b/platform/lang-api/src/com/intellij/patterns/PsiElementPattern.java index a4da312ef851..3ae54eec8b23 100644 --- a/platform/lang-api/src/com/intellij/patterns/PsiElementPattern.java +++ b/platform/lang-api/src/com/intellij/patterns/PsiElementPattern.java @@ -47,10 +47,12 @@ public abstract class PsiElementPattern pattern) { return afterLeafSkipping(psiElement().whitespaceCommentEmptyOrError(), pattern); } @@ -107,6 +109,7 @@ public abstract class PsiElementPattern filePattern) { return with(new PatternCondition("inFile") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { return filePattern.accepts(t.getContainingFile(), context); } @@ -115,14 +118,17 @@ public abstract class PsiElementPattern filePattern) { return with(new PatternCondition("inVirtualFile") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { return filePattern.accepts(t.getContainingFile().getViewProvider().getVirtualFile(), context); } }); } + @Override public Self equalTo(@NotNull final T o) { return with(new PatternCondition("equalTo") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { return t.getManager().areElementsEquivalent(t, o); } @@ -132,6 +138,7 @@ public abstract class PsiElementPattern pattern) { return with(new PatternCondition("withElementType") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { final ASTNode node = t.getNode(); return node != null && pattern.accepts(node.getElementType()); @@ -162,6 +169,7 @@ public abstract class PsiElementPattern("afterLeafSkipping") { + @Override public boolean accepts(@NotNull T t, final ProcessingContext context) { PsiElement element = t; while (true) { @@ -181,6 +189,7 @@ public abstract class PsiElementPattern("beforeLeafSkipping") { + @Override public boolean accepts(@NotNull T t, final ProcessingContext context) { PsiElement element = t; while (true) { @@ -200,6 +209,7 @@ public abstract class PsiElementPattern("atStartOf") { + @Override public boolean accepts(@NotNull T t, final ProcessingContext context) { PsiElement element = t; while (element != null) { @@ -258,6 +268,7 @@ public abstract class PsiElementPattern("withLanguage") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { return t.getLanguage().equals(language); } @@ -266,14 +277,16 @@ public abstract class PsiElementPattern metaDataPattern) { return with(new PatternCondition("withMetaData") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { return t instanceof PsiMetaOwner && metaDataPattern.accepts(((PsiMetaOwner)t).getMetaData(), context); } }); } - + public Self referencing(final ElementPattern targetPattern) { return with(new PatternCondition("referencing") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { final PsiReference[] references = t.getReferences(); for (final PsiReference reference : references) { @@ -288,7 +301,7 @@ public abstract class PsiElementPattern("compiled") { @Override @@ -306,7 +319,7 @@ public abstract class PsiElementPattern ancestor) { return with(new PatternCondition("insideStarting") { @Override diff --git a/platform/lang-api/src/com/intellij/patterns/PsiFilePattern.java b/platform/lang-api/src/com/intellij/patterns/PsiFilePattern.java index 8ef24bec536e..1a5743683c7f 100644 --- a/platform/lang-api/src/com/intellij/patterns/PsiFilePattern.java +++ b/platform/lang-api/src/com/intellij/patterns/PsiFilePattern.java @@ -37,6 +37,7 @@ public class PsiFilePattern("withParentDirectoryName") { + @Override public boolean accepts(@NotNull final T t, final ProcessingContext context) { PsiDirectory directory = t.getContainingDirectory(); return directory != null && namePattern.getCondition().accepts(directory.getName(), context); @@ -52,7 +53,7 @@ public class PsiFilePattern vFilePattern) { return with(new PatternCondition("withVirtualFile") { @Override diff --git a/platform/lang-api/src/com/intellij/patterns/PsiNamePatternCondition.java b/platform/lang-api/src/com/intellij/patterns/PsiNamePatternCondition.java index 7c8b8b85aa80..f7a2c6284287 100644 --- a/platform/lang-api/src/com/intellij/patterns/PsiNamePatternCondition.java +++ b/platform/lang-api/src/com/intellij/patterns/PsiNamePatternCondition.java @@ -33,6 +33,7 @@ public class PsiNamePatternCondition extends PropertyPatte return getValuePattern(); } + @Override public String getPropertyValue(@NotNull final Object o) { return o instanceof PsiNamedElement ? ((PsiNamedElement)o).getName() : null; } diff --git a/platform/lang-api/src/com/intellij/patterns/VirtualFilePattern.java b/platform/lang-api/src/com/intellij/patterns/VirtualFilePattern.java index 4515c6eb4a7f..16ff004ebc50 100644 --- a/platform/lang-api/src/com/intellij/patterns/VirtualFilePattern.java +++ b/platform/lang-api/src/com/intellij/patterns/VirtualFilePattern.java @@ -34,6 +34,7 @@ public class VirtualFilePattern extends TreeElementPattern("ofType") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { return type.equals(virtualFile.getFileType()); } @@ -46,6 +47,7 @@ public class VirtualFilePattern extends TreeElementPattern("withExtension") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { final String extension = virtualFile.getExtension(); for (String alternative : alternatives) { @@ -60,6 +62,7 @@ public class VirtualFilePattern extends TreeElementPattern("withExtension") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { return extension.equals(virtualFile.getExtension()); } @@ -68,6 +71,7 @@ public class VirtualFilePattern extends TreeElementPattern namePattern) { return with(new PatternCondition("withName") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { return namePattern.getCondition().accepts(virtualFile.getName(), context); } @@ -76,6 +80,7 @@ public class VirtualFilePattern extends TreeElementPattern pathPattern) { return with(new PatternCondition("withName") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { return pathPattern.accepts(virtualFile.getPath(), context); } @@ -84,6 +89,7 @@ public class VirtualFilePattern extends TreeElementPattern tagNamePattern) { return with(new PatternCondition("xmlWithRootTag") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { try { String tagName = NanoXmlUtil.parseHeaderWithException(virtualFile).getRootTagLocalName(); @@ -102,6 +108,7 @@ public class VirtualFilePattern extends TreeElementPattern namespacePattern) { return with(new PatternCondition("xmlWithRootTagNamespace") { + @Override public boolean accepts(@NotNull final VirtualFile virtualFile, final ProcessingContext context) { try { String rootTagNamespace = NanoXmlUtil.parseHeaderWithException(virtualFile).getRootTagNamespace(); @@ -114,10 +121,12 @@ public class VirtualFilePattern extends TreeElementPattern implements ElementManipulator { + @Override public T handleContentChange(final T element, final String newContent) throws IncorrectOperationException { return handleContentChange(element, getRangeInElement(element), newContent); } + @Override public TextRange getRangeInElement(final T element) { return new TextRange(0, element.getTextLength()); } diff --git a/platform/lang-api/src/com/intellij/psi/DelegatePsiTarget.java b/platform/lang-api/src/com/intellij/psi/DelegatePsiTarget.java index b10fa8ff403a..4f94492d93a2 100644 --- a/platform/lang-api/src/com/intellij/psi/DelegatePsiTarget.java +++ b/platform/lang-api/src/com/intellij/psi/DelegatePsiTarget.java @@ -44,6 +44,7 @@ public class DelegatePsiTarget implements PsiTarget { return myElement.getTextOffset(); } + @Override public void navigate(boolean requestFocus) { final int offset = getTextOffset(); final VirtualFile virtualFile = PsiUtilBase.getVirtualFile(myElement); @@ -52,14 +53,17 @@ public class DelegatePsiTarget implements PsiTarget { } } + @Override public boolean canNavigate() { return EditSourceUtil.canNavigate(myElement); } + @Override public boolean canNavigateToSource() { return EditSourceUtil.canNavigate(myElement); } + @Override @NotNull public final PsiElement getNavigationElement() { return myElement; @@ -82,6 +86,7 @@ public class DelegatePsiTarget implements PsiTarget { return myElement.hashCode(); } + @Override public boolean isValid() { return getNavigationElement().isValid(); } diff --git a/platform/lang-api/src/com/intellij/psi/IntentionFilterOwner.java b/platform/lang-api/src/com/intellij/psi/IntentionFilterOwner.java index bf2be294fee6..2970952e96ea 100644 --- a/platform/lang-api/src/com/intellij/psi/IntentionFilterOwner.java +++ b/platform/lang-api/src/com/intellij/psi/IntentionFilterOwner.java @@ -49,6 +49,7 @@ public interface IntentionFilterOwner { * This filter reports all intentions are available. */ IntentionActionsFilter EVERYTHING_AVAILABLE = new IntentionActionsFilter() { + @Override public boolean isAvailable(final IntentionAction intentionAction) { return true; } diff --git a/platform/lang-api/src/com/intellij/psi/ManipulatableTarget.java b/platform/lang-api/src/com/intellij/psi/ManipulatableTarget.java index 72039c5e65b5..207b23b433af 100644 --- a/platform/lang-api/src/com/intellij/psi/ManipulatableTarget.java +++ b/platform/lang-api/src/com/intellij/psi/ManipulatableTarget.java @@ -29,20 +29,24 @@ public class ManipulatableTarget extends DelegatePsiTarget implements PsiDeclare super(element); } + @Override public TextRange getNameIdentifierRange() { return ElementManipulators.getValueTextRange(getNavigationElement()); } + @Override public boolean isWritable() { return getNavigationElement().isWritable(); } + @Override @Nullable public Object setName(@NotNull String newName) { ElementManipulators.getManipulator(getNavigationElement()).handleContentChange(getNavigationElement(), newName); return null; } + @Override public String getName() { return ElementManipulators.getValueText(getNavigationElement()); } diff --git a/platform/lang-api/src/com/intellij/psi/PsiElementRef.java b/platform/lang-api/src/com/intellij/psi/PsiElementRef.java index eeddd9fcc236..dd1044582297 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiElementRef.java +++ b/platform/lang-api/src/com/intellij/psi/PsiElementRef.java @@ -98,11 +98,13 @@ public final class PsiElementRef { myElement = element; } + @Override @NotNull public T getPsiElement() { return myElement; } + @Override public boolean isValid() { return myElement.isValid(); } @@ -124,11 +126,13 @@ public final class PsiElementRef { return myElement.hashCode(); } + @Override @NotNull public Real makeReal() { return this; } + @Override @NotNull public PsiElement getRoot() { return myElement; @@ -144,10 +148,12 @@ public final class PsiElementRef { myCreator = creator; } + @Override public boolean isValid() { return myParent.isValid(); } + @Override public Child getPsiElement() { return null; } @@ -172,11 +178,13 @@ public final class PsiElementRef { return result; } + @Override @NotNull public Real makeReal() { return new Real(myCreator.createChild(myParent.ensurePsiElementExists())); } + @Override @NotNull public PsiElement getRoot() { return myParent.getRoot(); diff --git a/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java b/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java index ac6d87c27ca2..735a11bdfe25 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java +++ b/platform/lang-api/src/com/intellij/psi/PsiPolyVariantReferenceBase.java @@ -40,6 +40,7 @@ public abstract class PsiPolyVariantReferenceBase extends super(element, range, soft); } + @Override @Nullable public PsiElement resolve() { ResolveResult[] resolveResults = multiResolve(false); diff --git a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java index 000d3ee4037e..4fef3ac0abbe 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java +++ b/platform/lang-api/src/com/intellij/psi/PsiRecursiveElementVisitor.java @@ -21,7 +21,7 @@ import java.util.List; /** * Represents a PSI element visitor which recursively visits the children of the element - * on which the visit was started. + * on which the visit was started. */ public abstract class PsiRecursiveElementVisitor extends PsiElementVisitor { private final boolean myVisitAllFileRoots; @@ -34,6 +34,7 @@ public abstract class PsiRecursiveElementVisitor extends PsiElementVisitor { myVisitAllFileRoots = visitAllFileRoots; } + @Override public void visitElement(final PsiElement element) { ProgressIndicatorProvider.checkCanceled(); element.acceptChildren(this); diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java b/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java index aa8a585045ca..f075f9a58a54 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java +++ b/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java @@ -90,10 +90,12 @@ public abstract class PsiReferenceBase implements PsiRefer } + @Override public T getElement() { return myElement; } + @Override public TextRange getRangeInElement() { if (myRange == null) { myRange = calculateDefaultRangeInElement(); @@ -105,19 +107,23 @@ public abstract class PsiReferenceBase implements PsiRefer return getManipulator().getRangeInElement(myElement); } + @Override @NotNull public String getCanonicalText() { return getValue(); } + @Override public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException { return getManipulator().handleContentChange(myElement, getRangeInElement(), newElementName); - } + } + @Override public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException { throw new IncorrectOperationException("Rebind cannot be performed for " + getClass()); } + @Override public boolean isReferenceTo(PsiElement element) { return getElement().getManager().areElementsEquivalent(resolve(), element); } @@ -138,6 +144,7 @@ public abstract class PsiReferenceBase implements PsiRefer return manipulator; } + @Override public boolean isSoft() { return mySoft; } @@ -156,6 +163,7 @@ public abstract class PsiReferenceBase implements PsiRefer super(element, range, soft); } + @Override public boolean isReferenceTo(PsiElement element) { final ResolveResult[] results = multiResolve(false); for (ResolveResult result : results) { @@ -166,6 +174,7 @@ public abstract class PsiReferenceBase implements PsiRefer return false; } + @Override @Nullable public PsiElement resolve() { ResolveResult[] resolveResults = multiResolve(false); @@ -197,15 +206,18 @@ public abstract class PsiReferenceBase implements PsiRefer } //do nothing. the element will be renamed via PsiMetaData (com.intellij.refactoring.rename.RenameUtil.doRenameGenericNamedElement()) + @Override public PsiElement handleElementRename(final String newElementName) throws IncorrectOperationException { return getElement(); } + @Override @Nullable public PsiElement resolve() { return myResolveTo; } + @Override @NotNull public Object[] getVariants() { return EMPTY_ARRAY; diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceContributor.java b/platform/lang-api/src/com/intellij/psi/PsiReferenceContributor.java index 6d51637ff4db..2d9c675464c7 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiReferenceContributor.java +++ b/platform/lang-api/src/com/intellij/psi/PsiReferenceContributor.java @@ -30,6 +30,7 @@ public abstract class PsiReferenceContributor implements Disposable { public abstract void registerReferenceProviders(PsiReferenceRegistrar registrar); + @Override public void dispose() { } } diff --git a/platform/lang-api/src/com/intellij/psi/PsiTreeChangeAdapter.java b/platform/lang-api/src/com/intellij/psi/PsiTreeChangeAdapter.java index be19731f42b1..96c0ad5abb8b 100644 --- a/platform/lang-api/src/com/intellij/psi/PsiTreeChangeAdapter.java +++ b/platform/lang-api/src/com/intellij/psi/PsiTreeChangeAdapter.java @@ -21,39 +21,51 @@ import org.jetbrains.annotations.NotNull; * Default empty implementation of {@link PsiTreeChangeListener}. */ public abstract class PsiTreeChangeAdapter implements PsiTreeChangeListener { + @Override public void beforeChildAddition(@NotNull PsiTreeChangeEvent event) { } + @Override public void beforeChildRemoval(@NotNull PsiTreeChangeEvent event) { } + @Override public void beforeChildReplacement(@NotNull PsiTreeChangeEvent event) { } + @Override public void beforeChildMovement(@NotNull PsiTreeChangeEvent event) { } + @Override public void beforeChildrenChange(@NotNull PsiTreeChangeEvent event) { } + @Override public void beforePropertyChange(@NotNull PsiTreeChangeEvent event) { } + @Override public void childAdded(@NotNull PsiTreeChangeEvent event) { } + @Override public void childRemoved(@NotNull PsiTreeChangeEvent event) { } + @Override public void childReplaced(@NotNull PsiTreeChangeEvent event) { } + @Override public void childMoved(@NotNull PsiTreeChangeEvent event) { } + @Override public void childrenChanged(@NotNull PsiTreeChangeEvent event) { } + @Override public void propertyChanged(@NotNull PsiTreeChangeEvent event) { } } diff --git a/platform/lang-api/src/com/intellij/psi/ReferenceProviderType.java b/platform/lang-api/src/com/intellij/psi/ReferenceProviderType.java index f436fdabecbd..4ad9183d9ed2 100644 --- a/platform/lang-api/src/com/intellij/psi/ReferenceProviderType.java +++ b/platform/lang-api/src/com/intellij/psi/ReferenceProviderType.java @@ -30,6 +30,7 @@ public class ReferenceProviderType { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.ReferenceProviderType"); private static final KeyedExtensionCollector COLLECTOR = new KeyedExtensionCollector(EP_NAME) { + @Override protected String keyToString(final ReferenceProviderType key) { return key.myId; } diff --git a/platform/lang-api/src/com/intellij/psi/RenameableDelegatePsiTarget.java b/platform/lang-api/src/com/intellij/psi/RenameableDelegatePsiTarget.java index 6785c5895ee2..0c5ab09b255d 100644 --- a/platform/lang-api/src/com/intellij/psi/RenameableDelegatePsiTarget.java +++ b/platform/lang-api/src/com/intellij/psi/RenameableDelegatePsiTarget.java @@ -27,15 +27,18 @@ public class RenameableDelegatePsiTarget extends DelegatePsiTarget implements Po super(element); } + @Override public boolean isWritable() { return getNavigationElement().isWritable(); } + @Override public RenameableDelegatePsiTarget setName(@NotNull String newName) { ((PsiNamedElement)getNavigationElement()).setName(newName); return this; } + @Override @NotNull public String getName() { return StringUtil.notNullize(((PsiNamedElement)getNavigationElement()).getName()); diff --git a/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java b/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java index a0e62c4a2d52..2c38cd057b2b 100644 --- a/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java +++ b/platform/lang-api/src/com/intellij/psi/WeigherExtensionPoint.java @@ -39,6 +39,7 @@ public class WeigherExtensionPoint extends AbstractExtensionPointBean implements public String id; private final NotNullLazyValue myHandler = new NotNullLazyValue() { + @Override @NotNull protected final Weigher compute() { try { @@ -64,10 +65,12 @@ public class WeigherExtensionPoint extends AbstractExtensionPointBean implements } }; + @Override public Weigher getInstance() { return myHandler.getValue(); } + @Override public String getKey() { return key; } diff --git a/platform/lang-api/src/com/intellij/psi/WeighingComparable.java b/platform/lang-api/src/com/intellij/psi/WeighingComparable.java index 69b03fc2bb59..19832001975d 100644 --- a/platform/lang-api/src/com/intellij/psi/WeighingComparable.java +++ b/platform/lang-api/src/com/intellij/psi/WeighingComparable.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.Nullable; */ public class WeighingComparable implements Comparable>, ForceableComparable { private static final Comparable NULL = new Comparable() { + @Override public int compareTo(final Object o) { throw new UnsupportedOperationException("Method compareTo is not yet implemented in " + getClass().getName()); } @@ -42,6 +43,7 @@ public class WeighingComparable implements Comparable implements Comparable comparable) { if (myComputedWeighs == comparable.myComputedWeighs) return 0; diff --git a/platform/lang-api/src/com/intellij/psi/WeighingService.java b/platform/lang-api/src/com/intellij/psi/WeighingService.java index 35c182d0e4e7..88f542138f52 100644 --- a/platform/lang-api/src/com/intellij/psi/WeighingService.java +++ b/platform/lang-api/src/com/intellij/psi/WeighingService.java @@ -29,6 +29,7 @@ import java.util.List; */ public class WeighingService { private static final KeyedExtensionCollector COLLECTOR = new KeyedExtensionCollector("com.intellij.weigher") { + @Override protected String keyToString(final Key key) { return key.toString(); } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleScheme.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleScheme.java index 96eb4801f55e..0b96fa8dc9bb 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleScheme.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleScheme.java @@ -22,6 +22,7 @@ import com.intellij.openapi.options.Scheme; * Date: Jul 19, 2002 */ public interface CodeStyleScheme extends Scheme { + @Override String getName(); boolean isDefault(); CodeStyleSettings getCodeStyleSettings(); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CustomCodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CustomCodeStyleSettings.java index 7cd4fc4f4542..3ccfa1ca4e8c 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CustomCodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CustomCodeStyleSettings.java @@ -56,6 +56,7 @@ public abstract class CustomCodeStyleSettings implements Cloneable { } } + @Override public Object clone() { try { return super.clone(); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java b/platform/lang-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java index 15acfa85b27f..d92d05fc9552 100755 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/PackageEntryTable.java @@ -57,6 +57,7 @@ public class PackageEntryTable implements JDOMExternalizable, Cloneable { return 0; } + @Override public Object clone() throws CloneNotSupportedException { PackageEntryTable clon = new PackageEntryTable(); clon.copyFrom(this); @@ -104,6 +105,7 @@ public class PackageEntryTable implements JDOMExternalizable, Cloneable { return false; } + @Override public void readExternal(Element element) throws InvalidDataException { myEntries.clear(); List children = element.getChildren(); @@ -134,6 +136,7 @@ public class PackageEntryTable implements JDOMExternalizable, Cloneable { } } + @Override public void writeExternal(Element parentNode) throws WriteExternalException { for (PackageEntry entry : myEntries) { if (entry == PackageEntry.BLANK_LINE_ENTRY) { diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java index 21709d1729d3..9357b126efa8 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java @@ -54,6 +54,7 @@ public class StdArrangementSettings implements ArrangementSettings { return myRules; } + @Override @NotNull public List getGroupings() { return myGroupings; diff --git a/platform/lang-api/src/com/intellij/psi/filters/ElementFilterBase.java b/platform/lang-api/src/com/intellij/psi/filters/ElementFilterBase.java index e8654e37db61..9c46030c223e 100644 --- a/platform/lang-api/src/com/intellij/psi/filters/ElementFilterBase.java +++ b/platform/lang-api/src/com/intellij/psi/filters/ElementFilterBase.java @@ -27,12 +27,14 @@ public abstract class ElementFilterBase implements ElementFilter{ myClass = aClass; } + @Override public boolean isAcceptable(Object element, PsiElement context) { return isClassAcceptable(element.getClass()) && isElementAcceptable((T)element, context); } protected abstract boolean isElementAcceptable(T element, PsiElement context); + @Override public boolean isClassAcceptable(Class hintClass) { return myClass.isAssignableFrom(hintClass); } diff --git a/platform/lang-api/src/com/intellij/psi/filters/position/FilterPattern.java b/platform/lang-api/src/com/intellij/psi/filters/position/FilterPattern.java index 1d7789c4cef2..b1beaf4bd148 100644 --- a/platform/lang-api/src/com/intellij/psi/filters/position/FilterPattern.java +++ b/platform/lang-api/src/com/intellij/psi/filters/position/FilterPattern.java @@ -30,6 +30,7 @@ public class FilterPattern extends ObjectPattern { public FilterPattern(@Nullable final ElementFilter filter) { super(new InitialPatternCondition(Object.class) { + @Override public boolean accepts(@Nullable final Object o, final ProcessingContext context) { return filter == null || o != null && diff --git a/platform/lang-api/src/com/intellij/psi/meta/PsiMetaDataTarget.java b/platform/lang-api/src/com/intellij/psi/meta/PsiMetaDataTarget.java index 32024d27dafe..994348ff3c5f 100644 --- a/platform/lang-api/src/com/intellij/psi/meta/PsiMetaDataTarget.java +++ b/platform/lang-api/src/com/intellij/psi/meta/PsiMetaDataTarget.java @@ -30,15 +30,18 @@ public class PsiMetaDataTarget extends DelegatePsiTarget implements PomRenameabl myMetaData = metaData; } + @Override @NotNull public String getName() { return myMetaData.getName(); } + @Override public boolean isWritable() { return myMetaData instanceof PsiWritableMetaData && getNavigationElement().isWritable(); } + @Override public PsiMetaDataTarget setName(@NotNull String newName) { ((PsiWritableMetaData) myMetaData).setName(newName); return this; diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessor.java b/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessor.java index e6e7a929f71e..64b756bdaea2 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessor.java +++ b/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessor.java @@ -43,6 +43,7 @@ public interface PsiReferenceProcessor{ return myCollection.toArray(array); } + @Override public boolean execute(PsiReference element) { myCollection.add(element); return true; @@ -60,6 +61,7 @@ public interface PsiReferenceProcessor{ return myFoundElement; } + @Override public boolean execute(PsiReference element) { myFoundElement = element; return false; diff --git a/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java b/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java index 9deb822b0fe8..6c8bbd637711 100644 --- a/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java +++ b/platform/lang-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java @@ -29,6 +29,7 @@ public class PsiReferenceProcessorAdapter extends ReadActionProcessor getPredefinedScopes(){ return Collections.emptyList(); } - + @Nullable public NamedScope getPredefinedScope(String name) { return null; diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java index 896431e432a6..e0503942f43b 100644 --- a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java +++ b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/UnionPackageSet.java @@ -33,15 +33,18 @@ public class UnionPackageSet extends PackageSetBase { (mySecondSet instanceof PackageSetBase ? ((PackageSetBase)mySecondSet).contains(file, holder) : mySecondSet.contains(getPsiFile(file, holder), holder)); } + @Override @NotNull public PackageSet createCopy() { return new UnionPackageSet(myFirstSet.createCopy(), mySecondSet.createCopy()); } + @Override public int getNodePriority() { return 3; } + @Override @NotNull public String getText() { return myFirstSet.getText() + "||" + mySecondSet.getText(); diff --git a/platform/lang-api/src/com/intellij/psi/stubs/NamedStubBase.java b/platform/lang-api/src/com/intellij/psi/stubs/NamedStubBase.java index b39884216520..3e18e808759f 100644 --- a/platform/lang-api/src/com/intellij/psi/stubs/NamedStubBase.java +++ b/platform/lang-api/src/com/intellij/psi/stubs/NamedStubBase.java @@ -34,6 +34,7 @@ public abstract class NamedStubBase extends StubBase< this(parent, elementType, StringRef.fromString(name)); } + @Override public String getName() { return myName.getString(); } diff --git a/platform/lang-api/src/com/intellij/psi/targets/AliasingPsiTarget.java b/platform/lang-api/src/com/intellij/psi/targets/AliasingPsiTarget.java index a80b76ba0f4e..7375c5ce8fb5 100644 --- a/platform/lang-api/src/com/intellij/psi/targets/AliasingPsiTarget.java +++ b/platform/lang-api/src/com/intellij/psi/targets/AliasingPsiTarget.java @@ -29,14 +29,17 @@ public class AliasingPsiTarget extends DelegatePsiTarget implements PomRenameabl super(element); } + @Override public boolean isWritable() { return getNavigationElement().isWritable(); } + @Override public AliasingPsiTarget setName(@NotNull String newName) { return setAliasName(newName); } + @Override @NotNull public String getName() { return StringUtil.notNullize(getNameAlias(((PsiNamedElement)getNavigationElement()).getName())); diff --git a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateDataHighlighterWrapper.java b/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateDataHighlighterWrapper.java index f14ed9447dfa..bb6a5d1807d9 100644 --- a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateDataHighlighterWrapper.java +++ b/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateDataHighlighterWrapper.java @@ -18,11 +18,13 @@ public class TemplateDataHighlighterWrapper implements SyntaxHighlighter { myHighlighter = highlighter; } + @Override @NotNull public Lexer getHighlightingLexer() { return myHighlighter.getHighlightingLexer(); } + @Override @NotNull public TextAttributesKey[] getTokenHighlights(final IElementType tokenType) { if (tokenType == BAD_CHARACTER) { diff --git a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java b/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java index 9ba8f9191692..6265d80cd9d5 100644 --- a/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java +++ b/platform/lang-api/src/com/intellij/psi/templateLanguages/TemplateLanguageFileViewProvider.java @@ -28,6 +28,7 @@ public interface TemplateLanguageFileViewProvider extends FileViewProvider { * e.g. JSP * @return instanceof {@link com.intellij.psi.templateLanguages.TemplateLanguage} */ + @Override @NotNull Language getBaseLanguage(); diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiMatcherImpl.java b/platform/lang-api/src/com/intellij/psi/util/PsiMatcherImpl.java index 10ea81a34e7c..aac33e152c76 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiMatcherImpl.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiMatcherImpl.java @@ -24,12 +24,14 @@ public class PsiMatcherImpl implements PsiMatcher { myElement = element; } + @Override public PsiMatcher parent(PsiMatcherExpression e) { myElement = myElement.getParent(); if (myElement == null || (e != null && e.match(myElement) != Boolean.TRUE)) return NullPsiMatcherImpl.INSTANCE; return this; } + @Override public PsiMatcher firstChild(PsiMatcherExpression e) { final PsiElement[] children = myElement.getChildren(); for (PsiElement child : children) { @@ -41,6 +43,7 @@ public class PsiMatcherImpl implements PsiMatcher { return NullPsiMatcherImpl.INSTANCE; } + @Override public PsiMatcher ancestor(PsiMatcherExpression e) { while (myElement != null) { Boolean res = e == null ? Boolean.TRUE : e.match(myElement); @@ -52,6 +55,7 @@ public class PsiMatcherImpl implements PsiMatcher { return this; } + @Override public PsiMatcher descendant(PsiMatcherExpression e) { final PsiElement[] children = myElement.getChildren(); for (PsiElement child : children) { @@ -68,36 +72,44 @@ public class PsiMatcherImpl implements PsiMatcher { return NullPsiMatcherImpl.INSTANCE; } + @Override public PsiMatcher dot(PsiMatcherExpression e) { return e == null || e.match(myElement) == Boolean.TRUE ? this : NullPsiMatcherImpl.INSTANCE; } + @Override public PsiElement getElement() { return myElement; } private static class NullPsiMatcherImpl implements PsiMatcher { + @Override public PsiMatcher parent(PsiMatcherExpression e) { return this; } + @Override public PsiMatcher firstChild(PsiMatcherExpression e) { return this; } + @Override public PsiMatcher ancestor(PsiMatcherExpression e) { return this; } + @Override public PsiMatcher descendant(PsiMatcherExpression e) { return this; } + @Override public PsiMatcher dot(PsiMatcherExpression e) { return this; } + @Override public PsiElement getElement() { return null; } diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java index 06d41409bb64..23e58ac531e6 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java @@ -47,6 +47,7 @@ import java.util.*; public class PsiUtilBase extends PsiUtilCore { public static final PsiParser NULL_PARSER = new PsiParser() { + @Override @NotNull public ASTNode parse(IElementType root, PsiBuilder builder) { throw new IllegalAccessError(); @@ -239,7 +240,7 @@ public class PsiUtilBase extends PsiUtilCore { range = elt.getTextRange(); assert range != null : "Range is null for " + elt + "; " + elt.getClass(); } - + if (elt != null) { return elt.getLanguage(); } diff --git a/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java b/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java index 78be4e458ccc..1cb7f8f6b533 100644 --- a/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java +++ b/platform/lang-api/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java @@ -37,6 +37,7 @@ public interface ChangeSignatureHandler extends RefactoringActionHandler { @Nullable PsiElement findTargetMember(PsiElement element); + @Override void invoke(@NotNull Project project, @NotNull PsiElement[] elements, @Nullable DataContext dataContext); @Nullable diff --git a/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java b/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java index 128651978f09..924764ce3864 100644 --- a/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java +++ b/platform/lang-api/src/com/intellij/refactoring/classMembers/MemberInfoBase.java @@ -91,6 +91,7 @@ public abstract class MemberInfoBase { } public static class EmptyFilter implements Filter { + @Override public boolean includeMember(T member) { return true; } diff --git a/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java b/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java index 66f84a8d55ea..8d84817831d3 100644 --- a/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java +++ b/platform/lang-api/src/com/intellij/refactoring/listeners/RefactoringElementListenerComposite.java @@ -29,12 +29,14 @@ public class RefactoringElementListenerComposite implements RefactoringElementLi myListeners.add(listener); } + @Override public void elementMoved(@NotNull final PsiElement newElement){ for (RefactoringElementListener myListener : myListeners) { myListener.elementMoved(newElement); } } + @Override public void elementRenamed(@NotNull final PsiElement newElement){ for (RefactoringElementListener myListener : myListeners) { myListener.elementRenamed(newElement); diff --git a/platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java b/platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java index 6ea7a7bdd605..c5d7042322ac 100644 --- a/platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java +++ b/platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java @@ -36,6 +36,7 @@ public class RenameInputValidatorRegistry { final ProcessingContext context = new ProcessingContext(); if (validator.getPattern().accepts(element, context)) { return new Condition() { + @Override public boolean value(final String s) { return validator.isInputValid(s, element, context); } diff --git a/platform/lang-api/src/com/intellij/refactoring/util/MoveRenameUsageInfo.java b/platform/lang-api/src/com/intellij/refactoring/util/MoveRenameUsageInfo.java index 3413475fa477..cc96acee08ab 100644 --- a/platform/lang-api/src/com/intellij/refactoring/util/MoveRenameUsageInfo.java +++ b/platform/lang-api/src/com/intellij/refactoring/util/MoveRenameUsageInfo.java @@ -81,6 +81,7 @@ public class MoveRenameUsageInfo extends UsageInfo{ return myReferencedElement; } + @Override @Nullable public PsiReference getReference() { if (myReference != null) { diff --git a/platform/lang-api/src/com/intellij/refactoring/util/NonCodeUsageInfo.java b/platform/lang-api/src/com/intellij/refactoring/util/NonCodeUsageInfo.java index 903a91d501f6..913417c2e5be 100644 --- a/platform/lang-api/src/com/intellij/refactoring/util/NonCodeUsageInfo.java +++ b/platform/lang-api/src/com/intellij/refactoring/util/NonCodeUsageInfo.java @@ -55,6 +55,7 @@ public class NonCodeUsageInfo extends MoveRenameUsageInfo{ return new NonCodeUsageInfo(element, startOffset, endOffset, referencedElement, newText); } + @Override @Nullable public PsiReference getReference() { return null; diff --git a/platform/lang-api/src/com/intellij/usageView/UsageTreeColorsScheme.java b/platform/lang-api/src/com/intellij/usageView/UsageTreeColorsScheme.java index ef205b037478..442e9d117806 100644 --- a/platform/lang-api/src/com/intellij/usageView/UsageTreeColorsScheme.java +++ b/platform/lang-api/src/com/intellij/usageView/UsageTreeColorsScheme.java @@ -44,6 +44,7 @@ public class UsageTreeColorsScheme implements NamedComponent, JDOMExternalizable return ServiceManager.getService(UsageTreeColorsScheme.class); } + @Override @NotNull public String getComponentName() { return "FindViewColorsScheme"; @@ -53,6 +54,7 @@ public class UsageTreeColorsScheme implements NamedComponent, JDOMExternalizable return myColorsScheme; } + @Override public void readExternal(Element element) throws InvalidDataException { if (myColorsScheme == null){ Color color = UIUtil.getTreeTextBackground(); @@ -66,6 +68,7 @@ public class UsageTreeColorsScheme implements NamedComponent, JDOMExternalizable myColorsScheme.readExternal(element); } + @Override public void writeExternal(Element element) throws WriteExternalException { throw new WriteExternalException(); } diff --git a/platform/lang-api/src/com/intellij/util/ActionRunner.java b/platform/lang-api/src/com/intellij/util/ActionRunner.java index 8364d64b9201..4a0993953250 100644 --- a/platform/lang-api/src/com/intellij/util/ActionRunner.java +++ b/platform/lang-api/src/com/intellij/util/ActionRunner.java @@ -26,8 +26,10 @@ public abstract class ActionRunner { public static void runInsideWriteAction(final InterruptibleRunnable runnable) throws Exception { final Exception[] exception = new Exception[1]; Runnable swingRunnable = new Runnable() { + @Override public void run() { ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override public void run() { try { runnable.run(); @@ -63,8 +65,10 @@ public abstract class ActionRunner { final Throwable[] exception = new Throwable[]{null}; final T[] result = (T[])new Object[1]; Runnable swingRunnable = new Runnable() { + @Override public void run() { ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override public void run() { try { result[0] = runnable.run(); @@ -92,6 +96,7 @@ public abstract class ActionRunner { public static void runInsideReadAction(final InterruptibleRunnable runnable) throws Exception { Throwable exception = ApplicationManager.getApplication().runReadAction(new Computable() { + @Override public Throwable compute() { try { runnable.run(); diff --git a/platform/lang-api/src/com/intellij/util/FileContentUtil.java b/platform/lang-api/src/com/intellij/util/FileContentUtil.java index dfd1df716e5a..82106be4eb4e 100644 --- a/platform/lang-api/src/com/intellij/util/FileContentUtil.java +++ b/platform/lang-api/src/com/intellij/util/FileContentUtil.java @@ -71,6 +71,7 @@ public class FileContentUtil { public static void reparseFiles(@NotNull final Project project, @NotNull final Collection files, final boolean includeOpenFiles) { ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override public void run() { // files must be processed under one write action to prevent firing event for invalid files. diff --git a/platform/lang-api/src/com/intellij/util/VirtualFileLogicalRoot.java b/platform/lang-api/src/com/intellij/util/VirtualFileLogicalRoot.java index a39174d7fd38..a57d2c053bd1 100644 --- a/platform/lang-api/src/com/intellij/util/VirtualFileLogicalRoot.java +++ b/platform/lang-api/src/com/intellij/util/VirtualFileLogicalRoot.java @@ -36,11 +36,13 @@ public class VirtualFileLogicalRoot extends LogicalRoot { this(virtualFile, LogicalRootType.SOURCE_ROOT); } + @Override @Nullable public VirtualFile getVirtualFile() { return myVirtualFile; } + @Override @NotNull public LogicalRootType getType() { return myType; diff --git a/platform/lang-api/src/com/intellij/util/xml/NanoXmlUtil.java b/platform/lang-api/src/com/intellij/util/xml/NanoXmlUtil.java index 5ba60f0bc562..e28ab9120fab 100644 --- a/platform/lang-api/src/com/intellij/util/xml/NanoXmlUtil.java +++ b/platform/lang-api/src/com/intellij/util/xml/NanoXmlUtil.java @@ -184,36 +184,44 @@ public class NanoXmlUtil { public static class IXMLBuilderAdapter implements IXMLBuilder { + @Override public void startBuilding(final String systemID, final int lineNr) throws Exception { } + @Override public void newProcessingInstruction(final String target, final Reader reader) throws Exception { } + @Override public void startElement(final String name, final String nsPrefix, final String nsURI, final String systemID, final int lineNr) throws Exception { } + @Override public void addAttribute(final String key, final String nsPrefix, final String nsURI, final String value, final String type) throws Exception { } + @Override public void elementAttributesProcessed(final String name, final String nsPrefix, final String nsURI) throws Exception { } + @Override public void endElement(final String name, final String nsPrefix, final String nsURI) throws Exception { } + @Override public void addPCData(final Reader reader, final String systemID, final int lineNr) throws Exception { } + @Override @Nullable public Object getResult() throws Exception { return null; @@ -227,14 +235,17 @@ public class NanoXmlUtil { public static class BaseXmlBuilder extends IXMLBuilderAdapter { private final Stack myLocation = new Stack(); + @Override public void startBuilding(String systemID, int lineNr) throws Exception { myLocation.push(""); } + @Override public void startElement(String name, String nsPrefix, String nsURI, String systemID, int lineNr) throws Exception { myLocation.push(myLocation.peek() + "." + name); } + @Override public void endElement(String name, String nsPrefix, String nsURI) throws Exception { myLocation.pop(); } @@ -251,14 +262,17 @@ public class NanoXmlUtil { public static class EmptyValidator extends NonValidator { private IXMLEntityResolver myParameterEntityResolver; + @Override public void setParameterEntityResolver(IXMLEntityResolver resolver) { myParameterEntityResolver = resolver; } + @Override public IXMLEntityResolver getParameterEntityResolver() { return myParameterEntityResolver; } + @Override public void parseDTD(String publicID, IXMLReader reader, IXMLEntityResolver entityResolver, boolean external) throws Exception { if (!external) { //super.parseDTD(publicID, reader, entityResolver, external); @@ -281,33 +295,42 @@ public class NanoXmlUtil { } } + @Override public void elementStarted(String name, String systemId, int lineNr) { } + @Override public void elementEnded(String name, String systemId, int lineNr) { } + @Override public void attributeAdded(String key, String value, String systemId, int lineNr) { } + @Override public void elementAttributesProcessed(String name, Properties extraAttributes, String systemId, int lineNr) { } + @Override public void PCDataAdded(String systemId, int lineNr) { } } private static class EmptyEntityResolver implements IXMLEntityResolver { + @Override public void addInternalEntity(String name, String value) { } + @Override public void addExternalEntity(String name, String publicID, String systemID) { } + @Override public Reader getEntity(IXMLReader xmlReader, String name) throws XMLParseException { return new StringReader(""); } + @Override public boolean isExternalEntity(String name) { return false; } @@ -361,27 +384,34 @@ public class NanoXmlUtil { private String myRootTagName; private String myNamespace; + @Override public void startBuilding(final String systemID, final int lineNr) throws Exception { } + @Override public void newProcessingInstruction(final String target, final Reader reader) throws Exception { } + @Override public void startElement(final String name, final String nsPrefix, final String nsURI, final String systemID, final int lineNr) throws Exception { myRootTagName = name; myNamespace = nsURI; throw ParserStoppedXmlException.INSTANCE; } + @Override public void addAttribute(final String key, final String nsPrefix, final String nsURI, final String value, final String type) throws Exception { } + @Override public void elementAttributesProcessed(final String name, final String nsPrefix, final String nsURI) throws Exception { } + @Override public void endElement(final String name, final String nsPrefix, final String nsURI) throws Exception { } + @Override public void addPCData(final Reader reader, final String systemID, final int lineNr) throws Exception { } @@ -393,6 +423,7 @@ public class NanoXmlUtil { return myRootTagName; } + @Override public String getResult() { return myRootTagName; } diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java index b062cc0046fc..e6a48745db26 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java @@ -261,10 +261,12 @@ public abstract class AbstractConsoleRunnerWithHistory property, final Object value) { myValues.put(property, (Boolean)value); onPropertyChanged(property, (Boolean)value); @@ -51,10 +52,12 @@ public class StoringPropertyContainer extends AbstractProperty.AbstractPropertyC return value.toString(); } + @Override public boolean hasProperty(final AbstractProperty property) { return myValues.containsKey(property); } + @Override protected Object getValueOf(final AbstractProperty property) { Object value = myValues.get(property); if (value == null) { diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java index 1cebd0c4c400..2d62788b7b64 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java @@ -64,6 +64,7 @@ public class BookmarksFavoriteListProvider extends AbstractFavoritesListProvider return "Bookmarks"; } + @Override protected void updateChildrenImpl() { myChildren.clear(); List bookmarks = BookmarkManager.getInstance(myProject).getValidBookmarks();