MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplify notNullize(s, "") to notNullize(s)

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-11-08 14:10:11 +03:00
parent fce39cb7c6
commit 8107d5c7c9
9 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/inspectionProfiles/idea_default.xml
Generated
+9
View File
@@ -800,6 +800,15 @@
<constraint name="Instance" nameOfExprType="com\.intellij\.psi\.PsiAnnotationOwner" exprTypeWithinHierarchy="true" minCount="0" within="" contains="" />
<constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
</replaceConfiguration>
<replaceConfiguration name="simplify to ContainerUtil.filter()" text="$l$.stream().filter($f$).collect(Collectors.toList())" recursive="true" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.containers.ContainerUtil.filter($l$, $f$)">
<constraint name="__context__" within="" contains="" />
<constraint name="l" within="" contains="" />
<constraint name="f" within="" contains="" />
</replaceConfiguration>
<replaceConfiguration name="notNullize(s,&quot;&quot;) can be simplified" text="com.intellij.openapi.util.text.StringUtil.notNullize($s$, &quot;&quot;)" recursive="true" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.openapi.util.text.StringUtil.notNullize($s$)">
<constraint name="__context__" within="" contains="" />
<constraint name="s" within="" contains="" />
</replaceConfiguration>
</inspection_tool>
<inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="SeamAnnotationIncorrectSignatureInspection" enabled="false" level="ERROR" enabled_by_default="false" />
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
+1 -1
View File
@@ -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);
java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java
+1 -1
View File
@@ -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
platform/editor-ui-api/src/com/intellij/ide/projectView/PresentationData.java
+1 -1
View File
@@ -338,6 +338,6 @@ public class PresentationData implements ColoredItemPresentation, ComparableObje
@Override
public String getLocationSuffix() {
return StringUtil.notNullize(myLocationSuffix, "");
return StringUtil.notNullize(myLocationSuffix);
}
}
platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
+2 -3
View File
@@ -72,9 +72,8 @@ public class ProgramParametersConfigurator {
Collection<Macro> 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 + "\"";
}
platform/lang-impl/src/com/intellij/find/EditorSearchSession.java
+1 -1
View File
@@ -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("");
platform/platform-api/src/com/intellij/ui/switcher/ShowQuickActionPopupAction.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class ShowQuickActionPopupAction extends AnAction {
if (parentProvider != null) {
List<AnAction> 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);
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java
+1 -1
View File
@@ -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();
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java
+2 -3
View File
@@ -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());
}
}