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

ComponentManagerConfigurationTest in Kotlin

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-08-28 17:04:26 +02:00
parent 67c37bb68d
commit e68462d50a
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/remote-servers/impl/src/META-INF/RemoteServersJava.xml
+3
View File
@@ -6,6 +6,9 @@
</extensionPoints>
<extensions defaultExtensionNs="com.intellij">
<applicationService serviceInterface="com.intellij.remoteServer.runtime.deployment.debug.JavaDebuggerLauncher"
serviceImplementation="com.intellij.remoteServer.impl.runtime.deployment.debug.JavaDebuggerLauncherImpl"/>
<applicationService serviceInterface="com.intellij.remoteServer.configuration.deployment.JavaDeploymentSourceUtil"
serviceImplementation="com.intellij.remoteServer.impl.configuration.deployment.JavaDeploymentSourceUtilImpl"/>
<remoteServer.deploymentSource.type implementation="com.intellij.remoteServer.impl.configuration.deployment.ArtifactDeploymentSourceType"/>
platform/testFramework/testSrc/com/intellij/testFramework/FixtureRule.kt
+11 -9
View File
@@ -118,7 +118,7 @@ public class ProjectRule() : ExternalResource() {
}
if (projectOpened.compareAndSet(false, true)) {
ProjectManagerEx.getInstanceEx().openTestProject(project)
runInEdtAndWait { ProjectManagerEx.getInstanceEx().openTestProject(project) }
}
return result!!
}
@@ -128,15 +128,17 @@ public class ProjectRule() : ExternalResource() {
var project = project
var result = sharedModule
if (result == null) {
LightProjectDescriptor().setUpProject(project, object: LightProjectDescriptor.SetupHandler {
override fun moduleCreated(module: Module) {
result = module
sharedModule = module
}
runInEdtAndWait {
LightProjectDescriptor().setUpProject(project, object : LightProjectDescriptor.SetupHandler {
override fun moduleCreated(module: Module) {
result = module
sharedModule = module
}
override fun sourceRootCreated(sourceRoot: VirtualFile) {
}
})
override fun sourceRootCreated(sourceRoot: VirtualFile) {
}
})
}
}
return result!!
}
platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+1 -1
View File
@@ -354,7 +354,7 @@ public class JDOMUtil {
}
@NotNull
public static Document loadDocument(URL url) throws JDOMException, IOException {
public static Document loadDocument(@NotNull URL url) throws JDOMException, IOException {
return loadDocument(URLUtil.openStream(url));
}
platform/util/src/com/intellij/util/xmlb/XmlSerializer.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class XmlSerializer {
}
@Nullable
public static <T> T deserialize(URL url, Class<T> aClass) throws XmlSerializationException {
public static <T> T deserialize(@NotNull URL url, Class<T> aClass) throws XmlSerializationException {
try {
Document document = JDOMUtil.loadDocument(url);
document = JDOMXIncluder.resolve(document, url.toExternalForm());
resources/src/META-INF/IdeaPlugin.xml
-3
View File
@@ -1575,9 +1575,6 @@
<debugger.nodeNameAdjuster implementation="com.intellij.debugger.ui.impl.watch.FieldOuterLocalNameAdjuster"/>
<applicationService serviceInterface="com.intellij.remoteServer.runtime.deployment.debug.JavaDebuggerLauncher"
serviceImplementation="com.intellij.remoteServer.impl.runtime.deployment.debug.JavaDebuggerLauncherImpl"/>
<dom.uiControlsProvider implementation="com.intellij.util.xml.impl.JavaDomApplicationComponent"/>
<programRunner id="defaultDebugRunner" implementation="com.intellij.debugger.impl.GenericDebuggerRunner" order="last"/>