diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index 9a301ff8c3f0..d9c4ab961d40 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -800,6 +800,15 @@ + + + + + + + + + diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java index 75ec7804e983..fd8a05d7bb5c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java @@ -70,7 +70,7 @@ public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory { } private void onSpecifyUrlButtonClicked() { - String defaultDocsUrl = mySdk == null ? "" : StringUtil.notNullize(((SdkType)mySdk.getSdkType()).getDefaultDocumentationUrl(mySdk), ""); + String defaultDocsUrl = mySdk == null ? "" : StringUtil.notNullize(((SdkType)mySdk.getSdkType()).getDefaultDocumentationUrl(mySdk)); VirtualFile virtualFile = Util.showSpecifyJavadocUrlDialog(myPanel, defaultDocsUrl); if (virtualFile != null) { addElement(virtualFile); diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java index b8823c5b8647..d90f4a8d4ec0 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java @@ -54,7 +54,7 @@ public class PsiJavaDirectoryFactory extends PsiDirectoryFactory { } return ""; } - return presentable ? StringUtil.notNullize(FileUtil.getLocationRelativeToUserHome(directory.getVirtualFile().getPresentableUrl()), "") : ""; + return presentable ? StringUtil.notNullize(FileUtil.getLocationRelativeToUserHome(directory.getVirtualFile().getPresentableUrl())) : ""; } @Nullable diff --git a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java index 18f5368ca165..02f2454a22ca 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java @@ -338,6 +338,6 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje @Override public String getLocationSuffix() { - return StringUtil.notNullize(myLocationSuffix, ""); + return StringUtil.notNullize(myLocationSuffix); } } diff --git a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java index 35fca1ea5568..2bf9b285ab56 100644 --- a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java +++ b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java @@ -72,9 +72,8 @@ public class ProgramParametersConfigurator { Collection macros = MacroManager.getInstance().getMacros(); for (Macro macro: macros) { if (!path.contains("$" + macro.getName() + "$")) continue; - String value = StringUtil.notNullize( - macro instanceof PromptMacro ? ((PromptMacro)macro).promptUser(): - macro.preview(), ""); + String value = StringUtil.notNullize(macro instanceof PromptMacro ? ((PromptMacro)macro).promptUser() : + macro.preview()); if (StringUtil.containsWhitespaces(value)) { value = "\"" + value + "\""; } diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java b/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java index 5fb6b879aa95..cac5a2e3360e 100644 --- a/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java +++ b/platform/lang-impl/src/com/intellij/find/EditorSearchSession.java @@ -161,7 +161,7 @@ public class EditorSearchSession implements SearchSession, } if (myIsGlobal != myFindModel.isGlobal() || myIsReplace != myFindModel.isReplaceState()) { if (myFindModel.getStringToFind().isEmpty() && myFindModel.isGlobal()) { - myFindModel.setStringToFind(StringUtil.notNullize(myEditor.getSelectionModel().getSelectedText(), "")); + myFindModel.setStringToFind(StringUtil.notNullize(myEditor.getSelectionModel().getSelectedText())); } if (!myFindModel.isGlobal() && myFindModel.getStringToFind().equals(myEditor.getSelectionModel().getSelectedText())) { myFindModel.setStringToFind(""); diff --git a/platform/platform-api/src/com/intellij/ui/switcher/ShowQuickActionPopupAction.java b/platform/platform-api/src/com/intellij/ui/switcher/ShowQuickActionPopupAction.java index 1852b40952f5..831e2d3abc01 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/ShowQuickActionPopupAction.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/ShowQuickActionPopupAction.java @@ -60,7 +60,7 @@ public class ShowQuickActionPopupAction extends AnAction { if (parentProvider != null) { List parentActions = parentProvider.getActions(false); if (!parentActions.isEmpty()) { - String name = StringUtil.notNullize(parentProvider.getName(), ""); + String name = StringUtil.notNullize(parentProvider.getName()); DefaultActionGroup parentGroup = new DefaultActionGroup(name, parentActions); if (!StringUtil.isEmpty(name)) { parentGroup.setPopup(true); diff --git a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java index 9fbca6327c79..b0c2e0a00bfc 100644 --- a/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java +++ b/plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java @@ -256,7 +256,7 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor @Override public BaseInjection createInjection(Element element) { - String place = StringUtil.notNullize(element.getChildText("place"), ""); + String place = StringUtil.notNullize(element.getChildText("place")); if (place.startsWith("xmlAttribute")) { return new XmlAttributeInjection(); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java index 4fde1b3d341f..858f879b9f6d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.lang.psi.impl; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; @@ -9,8 +10,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement; import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult; -import static com.intellij.openapi.util.text.StringUtil.notNullize; - /** * @author ven */ @@ -101,7 +100,7 @@ public class GrClassReferenceType extends PsiClassType { return factory.createType(clazz, factory.createRawSubstitutor(clazz), getLanguageLevel()); } else { - String qName = notNullize(myReferenceElement.getQualifiedReferenceName(), ""); + String qName = StringUtil.notNullize(myReferenceElement.getQualifiedReferenceName()); return factory.createTypeByFQClassName(qName, myReferenceElement.getResolveScope()); } }