From b587a7b07520ee11fc0dbdc0a6cbe017f582760d Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 15 Jul 2021 11:41:40 +0200 Subject: [PATCH] remove Velocity from api modules GitOrigin-RevId: 12ac133fe8550b0442910270284d63819997ad32 --- .../intellij.platform.externalSystem.impl.iml | 1 + platform/lang-impl/intellij.platform.lang.impl.iml | 2 +- .../src/com/intellij/vcs/log/ui/filter/FilterModel.java | 6 +++--- .../tests/intellij.platform.workspaceModel.jps.tests.iml | 1 + plugins/editorconfig/intellij.editorconfig.iml | 1 + plugins/git4idea/intellij.vcs.git.iml | 1 + plugins/gradle/intellij.gradle.common.iml | 1 + plugins/ide-features-trainer/intellij.featuresTrainer.iml | 1 + .../ide-features-trainer/src/training/project/FileUtils.kt | 4 ++-- .../completion/test/confidence/KotlinConfidenceTest.java | 4 ++-- plugins/kotlin/idea/kotlin.idea.iml | 1 + .../intellij/plugin/processor/handler/DelegateHandler.java | 6 +++--- plugins/markdown/intellij.markdown.iml | 1 + plugins/maven/intellij.maven.iml | 1 + .../output/quickfixes/MavenBadJvmConfigEventParser.kt | 5 ++--- python/intellij.python.community.impl.iml | 1 + python/testSrc/intellij.python.community.tests.iml | 1 + 17 files changed, 24 insertions(+), 14 deletions(-) diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml index ed30ef4755ae..d556f90271cd 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml @@ -26,5 +26,6 @@ + \ No newline at end of file diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml index 8c3b5069ac13..37148c430c30 100644 --- a/platform/lang-impl/intellij.platform.lang.impl.iml +++ b/platform/lang-impl/intellij.platform.lang.impl.iml @@ -12,7 +12,7 @@ - + diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterModel.java index aa1277ca0c46..09f678375e0c 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterModel.java @@ -5,13 +5,13 @@ import com.intellij.vcs.log.VcsLogFilter; import com.intellij.vcs.log.VcsLogFilterCollection; import com.intellij.vcs.log.impl.MainVcsLogUiProperties; import com.intellij.vcs.log.statistics.VcsLogUsageTriggerCollector; -import org.apache.commons.lang.ObjectUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Objects; import java.util.function.Function; public abstract class FilterModel { @@ -72,7 +72,7 @@ public abstract class FilterModel { @Nullable FilterObject currentFilter) { F oldFilter = currentFilter == null ? null : getter.apply(currentFilter); F newFilter = filter == null ? null : getter.apply(filter); - return !ObjectUtils.equals(oldFilter, newFilter); + return !Objects.equals(oldFilter, newFilter); } public static abstract class SingleFilterModel extends FilterModel { @@ -91,7 +91,7 @@ public abstract class FilterModel { @Override public void setFilter(@Nullable Filter filter) { - if (ObjectUtils.equals(myFilter, filter)) return; + if (Objects.equals(myFilter, filter)) return; if (filter != null) { triggerFilterSet(myFilterKey.getName()); diff --git a/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml b/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml index a38ecf53b45a..12d425cf18ad 100644 --- a/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml +++ b/platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml @@ -17,6 +17,7 @@ + \ No newline at end of file diff --git a/plugins/editorconfig/intellij.editorconfig.iml b/plugins/editorconfig/intellij.editorconfig.iml index 00a3c50d26dc..003960436beb 100644 --- a/plugins/editorconfig/intellij.editorconfig.iml +++ b/plugins/editorconfig/intellij.editorconfig.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml index 90dbbc36ac35..a216641f8853 100644 --- a/plugins/git4idea/intellij.vcs.git.iml +++ b/plugins/git4idea/intellij.vcs.git.iml @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml index c3dfab122e53..36016b442f0b 100644 --- a/plugins/gradle/intellij.gradle.common.iml +++ b/plugins/gradle/intellij.gradle.common.iml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml index 69f0509696f2..ae601698233d 100644 --- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml +++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/plugins/ide-features-trainer/src/training/project/FileUtils.kt b/plugins/ide-features-trainer/src/training/project/FileUtils.kt index 02b7f20246f9..9c7566405351 100644 --- a/plugins/ide-features-trainer/src/training/project/FileUtils.kt +++ b/plugins/ide-features-trainer/src/training/project/FileUtils.kt @@ -4,8 +4,8 @@ package training.project import com.intellij.UtilBundle import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.text.StringUtil import com.intellij.util.io.URLUtil -import org.apache.commons.lang.StringUtils import java.io.* import java.net.URL import java.util.jar.JarFile @@ -27,7 +27,7 @@ object FileUtils { while (entries.hasMoreElements()) { val entry = entries.nextElement() if (entry.name.startsWith(prefix)) { - val filename = StringUtils.removeStart(entry.name, prefix) + val filename = StringUtil.trimStart(entry.name, prefix) val f = File(destDir, filename) diff --git a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java index 0898e299cf39..8b28071a8a6b 100644 --- a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java +++ b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java @@ -17,8 +17,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ArrayUtil; +import com.intellij.util.SystemProperties; import com.intellij.util.ThreeState; -import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.completion.test.CompletionTestUtilKt; import org.jetbrains.kotlin.idea.test.TestUtilsKt; @@ -143,7 +143,7 @@ public class KotlinConfidenceTest extends LightCompletionTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdk.getInstance().createJdk("JDK", SystemUtils.getJavaHome().getAbsolutePath()); + return JavaSdk.getInstance().createJdk("JDK", new File(SystemProperties.getJavaHome()).getAbsolutePath()); } @Override diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml index 3949cafd57e6..8c7f27af4ede 100644 --- a/plugins/kotlin/idea/kotlin.idea.iml +++ b/plugins/kotlin/idea/kotlin.idea.iml @@ -84,5 +84,6 @@ + \ No newline at end of file diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java index 2cf43d220de0..d6bdbef5f843 100644 --- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java +++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java @@ -1,6 +1,7 @@ package de.plushnikov.intellij.plugin.processor.handler; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.psi.util.PsiUtil; @@ -12,7 +13,6 @@ import de.plushnikov.intellij.plugin.psi.LombokLightMethodBuilder; import de.plushnikov.intellij.plugin.util.PsiAnnotationSearchUtil; import de.plushnikov.intellij.plugin.util.PsiAnnotationUtil; import de.plushnikov.intellij.plugin.util.PsiElementUtil; -import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -200,7 +200,7 @@ public class DelegateHandler { for (int parameterIndex = 0; parameterIndex < psiParameters.length; parameterIndex++) { final PsiParameter psiParameter = psiParameters[parameterIndex]; final PsiType psiParameterType = psiSubstitutor.substitute(psiParameter.getType()); - final String generatedParameterName = StringUtils.defaultIfEmpty(psiParameter.getName(), "p" + parameterIndex); + final String generatedParameterName = StringUtil.defaultIfEmpty(psiParameter.getName(), "p" + parameterIndex); methodBuilder.withParameter(generatedParameterName, psiParameterType); } @@ -217,7 +217,7 @@ public class DelegateHandler { for (int parameterIndex = 0; parameterIndex < psiParameters.length; parameterIndex++) { final PsiParameter psiParameter = psiParameters[parameterIndex]; - final String generatedParameterName = StringUtils.defaultIfEmpty(psiParameter.getName(), "p" + parameterIndex); + final String generatedParameterName = StringUtil.defaultIfEmpty(psiParameter.getName(), "p" + parameterIndex); paramString.append(generatedParameterName).append(','); } diff --git a/plugins/markdown/intellij.markdown.iml b/plugins/markdown/intellij.markdown.iml index fcdf3e9c9535..3da27309830e 100644 --- a/plugins/markdown/intellij.markdown.iml +++ b/plugins/markdown/intellij.markdown.iml @@ -80,5 +80,6 @@ + \ No newline at end of file diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml index bdd2787ff43a..8e3fb8762adb 100644 --- a/plugins/maven/intellij.maven.iml +++ b/plugins/maven/intellij.maven.iml @@ -97,6 +97,7 @@ + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/MavenBadJvmConfigEventParser.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/MavenBadJvmConfigEventParser.kt index bd759b8e0c0e..e5cfa9df2b9f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/MavenBadJvmConfigEventParser.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/MavenBadJvmConfigEventParser.kt @@ -15,7 +15,6 @@ import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.pom.Navigatable -import org.apache.commons.lang.StringUtils import org.jetbrains.idea.maven.buildtool.quickfix.OpenMavenImportingSettingsQuickFix import org.jetbrains.idea.maven.buildtool.quickfix.OpenMavenRunnerSettingsQuickFix import org.jetbrains.idea.maven.execution.MavenExternalParameters @@ -45,7 +44,7 @@ class MavenBadJvmConfigEventParser : MavenLoggedEventParser { messageConsumer: Consumer): Boolean { var errorLine = logLine.line if (errorLine.startsWith(MavenJvmConfigBuildIssue.VM_INIT_ERROR)) { - val causeLine = logEntryReader.readLine()?.line ?: StringUtils.EMPTY + val causeLine = logEntryReader.readLine()?.line ?: "" if (causeLine.isNotEmpty()) { errorLine += "\n$causeLine" } @@ -70,7 +69,7 @@ class MavenImportBadJvmConfigEventParser : MavenImportLoggedEventParser { messageConsumer: Consumer): Boolean { var errorLine = logLine if (logLine.startsWith(MavenJvmConfigBuildIssue.VM_INIT_ERROR)) { - val causeLine = reader.readLine() ?: StringUtils.EMPTY + val causeLine = reader.readLine() ?: "" if (causeLine.isNotEmpty()) { errorLine += "\n$causeLine" } diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 9ba012f63447..753ea8337c9c 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -77,5 +77,6 @@ + \ No newline at end of file diff --git a/python/testSrc/intellij.python.community.tests.iml b/python/testSrc/intellij.python.community.tests.iml index 36f59d5e1e87..523e82726734 100644 --- a/python/testSrc/intellij.python.community.tests.iml +++ b/python/testSrc/intellij.python.community.tests.iml @@ -43,5 +43,6 @@ + \ No newline at end of file