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

do not export JDOM and XStream for all modules — add explicitly dep only when need

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-02-14 16:52:27 +01:00
parent 57eca5909e
commit 0606fdb958
29 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/openapi/intellij.java.compiler.iml
+1
View File
@@ -8,6 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
<component name="copyright">
<Base>
java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfiguration.java
+3 -4
View File
@@ -6,7 +6,7 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.JDOMExternalizable;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -81,8 +81,7 @@ public class ExcludedEntriesConfiguration implements PersistentStateComponent<Ex
public void readExternal(final Element node) {
removeAllExcludeEntryDescriptions();
for (final Object o : node.getChildren()) {
Element element = (Element)o;
for (final Element element : node.getChildren()) {
String url = element.getAttributeValue(URL);
if (url == null) continue;
if (FILE.equals(element.getName())) {
@@ -126,7 +125,7 @@ public class ExcludedEntriesConfiguration implements PersistentStateComponent<Ex
}
}
else if (entryDescription.isIncludeSubdirectories()) {
if (VfsUtil.isAncestor(descriptionFile, virtualFile, false)) {
if (VfsUtilCore.isAncestor(descriptionFile, virtualFile, false)) {
return true;
}
}
java/debugger/openapi/intellij.java.debugger.iml
+1
View File
@@ -11,6 +11,7 @@
<orderEntry type="module" module-name="intellij.jsp" />
<orderEntry type="module" module-name="intellij.java.psi" />
<orderEntry type="module" module-name="intellij.java.resources.en" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
<component name="copyright">
<Base>
platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+1 -1
View File
@@ -15,10 +15,10 @@
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.bootstrap" />
<orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
<orderEntry type="module" module-name="intellij.platform.vcs" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
platform/core-api/intellij.platform.core.iml
+1
View File
@@ -13,5 +13,6 @@
<orderEntry type="module" module-name="intellij.platform.resources.en" exported="" />
<orderEntry type="library" name="automaton" level="project" />
<orderEntry type="library" name="CGLIB" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/core-impl/intellij.platform.core.impl.iml
+1
View File
@@ -10,5 +10,6 @@
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
<orderEntry type="library" name="picocontainer" level="project" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
+1
View File
@@ -14,5 +14,6 @@
<orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
<orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
<orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
platform/editor-ui-api/intellij.platform.editor.iml
+1
View File
@@ -13,5 +13,6 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/extensions/intellij.platform.extensions.iml
+2 -2
View File
@@ -8,8 +8,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="XStream" level="project" />
<orderEntry type="library" exported="" name="JDOM" level="project" />
<orderEntry type="library" name="XStream" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="library" name="picocontainer" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
platform/external-system-api/intellij.platform.externalSystem.iml
+1
View File
@@ -17,5 +17,6 @@
<orderEntry type="module" module-name="intellij.platform.externalSystem.rt" exported="" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="de.ruedigermoeller:fst" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/indexing-api/intellij.platform.indexing.iml
+1
View File
@@ -10,5 +10,6 @@
<orderEntry type="module" module-name="intellij.platform.core" exported="" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="library" name="NanoXML" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/lang-api/intellij.platform.lang.iml
+1
View File
@@ -17,5 +17,6 @@
<orderEntry type="library" scope="TEST" name="Mocks" level="project" />
<orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/lang-impl/intellij.platform.lang.impl.iml
+1 -1
View File
@@ -16,7 +16,6 @@
<orderEntry type="library" name="Velocity" level="project" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
<orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
<orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
<orderEntry type="library" exported="" name="cli-parser" level="project" />
<orderEntry type="module" module-name="intellij.platform.indexing" />
<orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
@@ -32,5 +31,6 @@
<orderEntry type="module" module-name="intellij.platform.diff.impl" />
<orderEntry type="module" module-name="intellij.platform.builtInServer" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
+1 -16
View File
@@ -1,18 +1,4 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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 com.intellij.ide.projectView;
@@ -27,7 +13,6 @@ import com.intellij.openapi.util.*;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.FocusRequestor;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
platform/platform-api/intellij.platform.ide.iml
+1
View File
@@ -30,5 +30,6 @@
<orderEntry type="library" name="jna" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="ini4j" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/projectModel-api/intellij.platform.projectModel.iml
+1
View File
@@ -11,5 +11,6 @@
<orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="Xerces" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/remote-servers/api/intellij.platform.remoteServers.iml
+1
View File
@@ -10,5 +10,6 @@
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.remoteServers.agent.rt" exported="" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/tasks-platform-api/intellij.platform.tasks.iml
+1
View File
@@ -9,5 +9,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.platform.vcs" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
platform/vcs-api/intellij.platform.vcs.iml
+1
View File
@@ -13,5 +13,6 @@
<orderEntry type="module" module-name="intellij.platform.vcs.core" exported="" />
<orderEntry type="module" module-name="intellij.platform.diff" exported="" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
plugins/ShortcutPromoter/intellij.shortcutPromoter.iml
+1
View File
@@ -11,5 +11,6 @@
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.editor" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
plugins/cvs/cvs-core/intellij.vcs.cvs.core.iml
+1
View File
@@ -21,5 +21,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
plugins/gradle/intellij.gradle.iml
+1
View File
@@ -32,5 +32,6 @@
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="intellij.java.coverage" />
<orderEntry type="module" module-name="intellij.platform.jps.build" />
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/events/TestEventXPPXmlView.java
+2 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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.gradle.execution.test.runner.events;
import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
@@ -47,7 +33,7 @@ public class TestEventXPPXmlView implements TestEventXmlView {
private String myEventTestResultStartTime;
private String myTestName;
public TestEventXPPXmlView(@NotNull final String xml) throws XmlParserException {
public TestEventXPPXmlView(@NotNull final String xml) {
final HierarchicalStreamReader parser = DRIVER.createReader(new StringReader(xml));
if (!"ijLog".equals(parser.getNodeName())) throw new RuntimeException("root element must be 'ijLog'");
plugins/hg4idea/intellij.vcs.hg.iml
+1
View File
@@ -22,5 +22,6 @@
<orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="XStream" level="project" />
</component>
</module>
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgAnnotateCommandTest.java
+1 -16
View File
@@ -1,25 +1,10 @@
/*
* Copyright 2000-2011 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// 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.zmlx.hg4idea.test;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.openapi.util.io.FileUtil;
import com.thoughtworks.xstream.XStream;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.zmlx.hg4idea.HgRevisionNumber;
plugins/tasks/tasks-java/intellij.tasks.java.iml
+1
View File
@@ -12,5 +12,6 @@
<orderEntry type="module" module-name="intellij.java.debugger" />
<orderEntry type="module" module-name="intellij.java.debugger.impl" />
<orderEntry type="module" module-name="intellij.platform.tasks" />
<orderEntry type="library" name="JDOM" level="project" />
</component>
</module>
python/intellij.python.community.impl.iml
+1
View File
@@ -36,5 +36,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
python/intellij.python.pydev.iml
+1
View File
@@ -13,5 +13,6 @@
<orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="XStream" level="project" />
</component>
</module>
python/pydevSrc/com/jetbrains/python/debugger/pydev/ProtocolParser.java
+3 -2
View File
@@ -1,3 +1,4 @@
// 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 com.jetbrains.python.debugger.pydev;
import com.google.common.collect.Lists;
@@ -132,7 +133,7 @@ public class ProtocolParser {
return threadingEvent;
}
public static boolean parseInputCommand(String payload) throws PyDebuggerException {
public static boolean parseInputCommand(String payload) {
return payload.equals("True");
}
@@ -151,7 +152,7 @@ public class ProtocolParser {
}
}
public static String parseSourceContent(String payload) throws PyDebuggerException {
public static String parseSourceContent(String payload) {
return payload;
}