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

remove Velocity from api modules

Browse Source 
GitOrigin-RevId: 12ac133fe8550b0442910270284d63819997ad32
This commit is contained in:
Alexey Kudravtsev
2021-07-15 11:51:51 +00:00
committed by intellij-monorepo-bot
parent 3700ab9da7
commit b587a7b075
17 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+1
View File
@@ -26,5 +26,6 @@
<orderEntry type="library" name="commons-cli" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
platform/lang-impl/intellij.platform.lang.impl.iml
+1 -1
View File
@@ -12,7 +12,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.lang" exported="" />
<orderEntry type="library" name="OroMatcher" level="project" />
<orderEntry type="library" exported="" name="Velocity" level="project" />
<orderEntry type="library" name="Velocity" level="project" />
<orderEntry type="library" name="commons-collections" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterModel.java
+3 -3
View File
@@ -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<Filter> {
@@ -72,7 +72,7 @@ public abstract class FilterModel<Filter> {
@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<Filter extends VcsLogFilter> extends FilterModel<Filter> {
@@ -91,7 +91,7 @@ public abstract class FilterModel<Filter> {
@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());
platform/workspaceModel/jps/tests/intellij.platform.workspaceModel.jps.tests.iml
+1
View File
@@ -17,6 +17,7 @@
<orderEntry type="module" module-name="intellij.platform.workspaceModel.storage.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="library" scope="TEST" name="Velocity" level="project" />
</component>
<component name="TestModuleProperties" production-module="intellij.platform.workspaceModel.jps" />
</module>
plugins/editorconfig/intellij.editorconfig.iml
+1
View File
@@ -35,5 +35,6 @@
<orderEntry type="library" name="automaton" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
plugins/git4idea/intellij.vcs.git.iml
+1
View File
@@ -55,5 +55,6 @@
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="library" name="caffeine" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="library" scope="TEST" name="Velocity" level="project" />
</component>
</module>
plugins/gradle/intellij.gradle.common.iml
+1
View File
@@ -35,5 +35,6 @@
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="module" module-name="intellij.gradle.toolingProxy" />
<orderEntry type="library" name="Log4J" level="project" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
plugins/ide-features-trainer/intellij.featuresTrainer.iml
+1
View File
@@ -25,5 +25,6 @@
<orderEntry type="module" module-name="intellij.platform.tasks.impl" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.xml.psi" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
plugins/ide-features-trainer/src/training/project/FileUtils.kt
+2 -2
View File
@@ -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)
plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java
+2 -2
View File
@@ -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
plugins/kotlin/idea/kotlin.idea.iml
+1
View File
@@ -84,5 +84,6 @@
<orderEntry type="library" name="intellij-markdown" level="project" />
<orderEntry type="module" module-name="intellij.java.compiler.impl" />
<orderEntry type="module" module-name="intellij.grazie" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/processor/handler/DelegateHandler.java
+3 -3
View File
@@ -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(',');
}
plugins/markdown/intellij.markdown.iml
+1
View File
@@ -80,5 +80,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
plugins/maven/intellij.maven.iml
+1
View File
@@ -97,6 +97,7 @@
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
<orderEntry type="library" name="Trove4j" level="project" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
<component name="copyright">
<Base>
plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/MavenBadJvmConfigEventParser.kt
+2 -3
View File
@@ -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<in BuildEvent?>): 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<in BuildEvent>): 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"
}
python/intellij.python.community.impl.iml
+1
View File
@@ -77,5 +77,6 @@
<orderEntry type="module" module-name="intellij.markdown" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="library" name="jcef" level="project" />
<orderEntry type="library" name="Velocity" level="project" />
</component>
</module>
python/testSrc/intellij.python.community.tests.iml
+1
View File
@@ -43,5 +43,6 @@
<orderEntry type="module" module-name="intellij.python.markdown" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.grazie.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.grazie" />
<orderEntry type="library" scope="TEST" name="Velocity" level="project" />
</component>
</module>