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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexander Lobas
2012-05-17 18:20:33 +04:00
parent 0a011b581e d7e1a9b1c4
commit e06d8f2c6b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class MavenBaseModifiableModelsProvider implements MavenModifiab
return myModuleModel;
}
public ModifiableRootModel getRootModel(Module module) {
public ModifiableRootModel getRootModel(@NotNull Module module) {
ModifiableRootModel result = myRootModels.get(module);
if (result == null) {
result = doGetRootModel(module);
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenDefaultModifiableModelsProvider.java
+2 -1
View File
@@ -32,6 +32,7 @@ import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.packaging.artifacts.ArtifactManager;
import com.intellij.packaging.artifacts.ModifiableArtifactModel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.maven.utils.MavenUtil;
import java.util.Collection;
@@ -65,7 +66,7 @@ public class MavenDefaultModifiableModelsProvider extends MavenBaseModifiableMod
}
@Override
protected ModifiableRootModel doGetRootModel(final Module module) {
protected ModifiableRootModel doGetRootModel(@NotNull final Module module) {
return new ReadAction<ModifiableRootModel>() {
protected void run(Result<ModifiableRootModel> result) throws Throwable {
result.setResult(ModuleRootManager.getInstance(module).getModifiableModel());
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class MavenRootModelAdapter {
private final ModifiableModuleModel myModuleModel;
private final ModifiableRootModel myRootModel;
public MavenRootModelAdapter(MavenProject p, Module module, final MavenModifiableModelsProvider rootModelsProvider) {
public MavenRootModelAdapter(@NotNull MavenProject p, @NotNull Module module, final MavenModifiableModelsProvider rootModelsProvider) {
myMavenProject = p;
myModuleModel = rootModelsProvider.getModuleModel();
myRootModel = rootModelsProvider.getRootModel(module);