From fd7022c125b794e10c1906a9258d435264612adf Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Sat, 9 Aug 2014 16:10:52 +0400 Subject: [PATCH] cleanup --- .../intellij/psi/impl/source/tree/java/PsiKeywordImpl.java | 3 ++- .../psi/impl/source/tree/java/PsiLiteralExpressionImpl.java | 4 +++- .../core-api/src/com/intellij/openapi/vfs/VirtualFile.java | 1 + .../com/intellij/openapi/editor/ex/EditorMarkupModel.java | 4 ++-- .../intellij/openapi/editor/impl/EditorMarkupModelImpl.java | 2 +- .../openapi/fileEditor/impl/FileEditorManagerImpl.java | 6 +++--- .../util/src/com/intellij/util/text/StringSearcher.java | 6 +++--- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiKeywordImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiKeywordImpl.java index f39a88e8b35c..cdc2fa881c0b 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiKeywordImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiKeywordImpl.java @@ -25,6 +25,7 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Field; +import java.util.Locale; public class PsiKeywordImpl extends LeafPsiElement implements PsiKeyword, PsiJavaToken { public PsiKeywordImpl(@NotNull IElementType type, CharSequence text) { @@ -52,7 +53,7 @@ public class PsiKeywordImpl extends LeafPsiElement implements PsiKeyword, PsiJav static { for(Field field: PsiKeyword.class.getFields()) { - CharTableImpl.staticIntern(field.getName().toLowerCase()); + CharTableImpl.staticIntern(field.getName().toLowerCase(Locale.ENGLISH)); } } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java index e5892be2fb4d..ce38729027d9 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java @@ -31,6 +31,8 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Locale; + public class PsiLiteralExpressionImpl extends ExpressionPsiElement implements PsiLiteralExpression, PsiLanguageInjectionHost, ContributedReferenceHost { @@ -93,7 +95,7 @@ public class PsiLiteralExpressionImpl @Override public Object getValue() { final IElementType type = getLiteralElementType(); - String text = NUMERIC_LITERALS.contains(type) ? getCanonicalText().toLowerCase() : getCanonicalText(); + String text = NUMERIC_LITERALS.contains(type) ? getCanonicalText().toLowerCase(Locale.ENGLISH) : getCanonicalText(); final int textLength = text.length(); if (type == JavaTokenType.INTEGER_LITERAL) { diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java index e4c3e5c502f5..d265d5a8cd2e 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java @@ -717,6 +717,7 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica putUserData(BOM_KEY, BOM); } + @Override @NonNls public String toString() { return "VirtualFile: " + getPresentableUrl(); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorMarkupModel.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorMarkupModel.java index 5da1077baf5c..71dee99c3514 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorMarkupModel.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorMarkupModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ public interface EditorMarkupModel extends MarkupModel { void setErrorStripeVisible(boolean val); - void setErrorStripeRenderer(ErrorStripeRenderer renderer); + void setErrorStripeRenderer(@NotNull ErrorStripeRenderer renderer); ErrorStripeRenderer getErrorStripeRenderer(); void addErrorMarkerListener(@NotNull ErrorStripeListener listener, @NotNull Disposable parent); diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java index 6ec29e58dc0b..20c08ec4ec99 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java @@ -368,7 +368,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark } @Override - public void setErrorStripeRenderer(ErrorStripeRenderer renderer) { + public void setErrorStripeRenderer(@NotNull ErrorStripeRenderer renderer) { assertIsDispatchThread(); if (myErrorStripeRenderer instanceof Disposable) { Disposer.dispose((Disposable)myErrorStripeRenderer); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index c7fa51f770d1..bab6d2b2fa4f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -1636,7 +1636,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec */ private final class MyVirtualFileListener extends VirtualFileAdapter { @Override - public void beforeFileDeletion(VirtualFileEvent e) { + public void beforeFileDeletion(@NotNull VirtualFileEvent e) { assertDispatchThread(); boolean moveFocus = moveFocusOnDelete(); @@ -1651,7 +1651,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec } @Override - public void propertyChanged(VirtualFilePropertyEvent e) { + public void propertyChanged(@NotNull VirtualFilePropertyEvent e) { if (VirtualFile.PROP_NAME.equals(e.getPropertyName())) { assertDispatchThread(); final VirtualFile file = e.getFile(); @@ -1681,7 +1681,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec } @Override - public void fileMoved(VirtualFileMoveEvent e) { + public void fileMoved(@NotNull VirtualFileMoveEvent e) { final VirtualFile file = e.getFile(); final VirtualFile[] openFiles = getOpenFiles(); for (final VirtualFile openFile : openFiles) { diff --git a/platform/util/src/com/intellij/util/text/StringSearcher.java b/platform/util/src/com/intellij/util/text/StringSearcher.java index d5bc95f99cef..f9517ad09ade 100644 --- a/platform/util/src/com/intellij/util/text/StringSearcher.java +++ b/platform/util/src/com/intellij/util/text/StringSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ public class StringSearcher { } } - int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1; + int step = lastChar < 128 ? mySearchTable[lastChar] : 1; if (step <= 0) { int index; @@ -160,7 +160,7 @@ public class StringSearcher { if (i < 0) return end - start - myPatternLength + 1; } - int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1; + int step = lastChar < 128 ? mySearchTable[lastChar] : 1; if (step <= 0) { int index;