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

notnull

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-01-27 15:17:36 +01:00
parent 5ea80f2e3f
commit ec31fa83fc
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/testFramework/ModuleTestCase.java
+9 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* 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.
@@ -81,7 +81,7 @@ public abstract class ModuleTestCase extends IdeaTestCase {
}
}
protected Module createModule(final File moduleFile) {
protected Module createModule(@NotNull File moduleFile) {
return createModule(moduleFile, StdModuleTypes.JAVA);
}
@@ -99,14 +99,16 @@ public abstract class ModuleTestCase extends IdeaTestCase {
return module;
}
protected Module loadModule(@NotNull String modulePath) {
final String normalizedPath = FileUtil.toSystemIndependentName(modulePath);
LocalFileSystem.getInstance().refreshAndFindFileByPath(normalizedPath);
protected Module loadModule(@NotNull VirtualFile file) {
return loadModule(file.getPath());
}
protected Module loadModule(@NotNull String modulePath) {
final ModuleManager moduleManager = ModuleManager.getInstance(myProject);
Module module;
try {
module = ApplicationManager.getApplication().runWriteAction((ThrowableComputable<Module, Exception>)() -> moduleManager.loadModule(normalizedPath));
module = ApplicationManager.getApplication().runWriteAction((ThrowableComputable<Module, Exception>)() -> moduleManager.loadModule(
FileUtil.toSystemIndependentName(modulePath)));
}
catch (Exception e) {
LOG.error(e);
@@ -130,7 +132,7 @@ public abstract class ModuleTestCase extends IdeaTestCase {
@Override
public boolean visitFile(@NotNull VirtualFile file) {
if (!file.isDirectory() && file.getName().endsWith(ModuleFileType.DOT_DEFAULT_EXTENSION)) {
ModuleImpl module = (ModuleImpl)loadModule(file.getPath());
ModuleImpl module = (ModuleImpl)loadModule(file);
if (moduleConsumer != null) {
moduleConsumer.consume(module);
}
platform/projectModel-api/src/com/intellij/openapi/module/ModuleManager.java
+2 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* 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.
@@ -64,8 +64,7 @@ public abstract class ModuleManager extends SimpleModificationTracker {
* @throws ModuleWithNameAlreadyExists if a module with such a name already exists in the project.
*/
@NotNull
public abstract Module loadModule(@NotNull String filePath)
throws InvalidDataException, IOException, JDOMException, ModuleWithNameAlreadyExists;
public abstract Module loadModule(@NotNull String filePath) throws IOException, JDOMException, ModuleWithNameAlreadyExists;
/**
* Disposes of the specified module and removes it from the project.