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

update artifacts on facet rename (IDEADEV-40824)

Browse Source
This commit is contained in:
nik
2009-11-09 16:19:46 +03:00
parent 36bc9f2bcb
commit 0ab3274333
7 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java
+22 -5
View File
@@ -16,13 +16,11 @@
package com.intellij.facet.impl.pointers;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetManager;
import com.intellij.facet.FacetType;
import com.intellij.facet.FacetTypeRegistry;
import com.intellij.facet.*;
import com.intellij.facet.pointers.FacetPointer;
import com.intellij.facet.pointers.FacetPointersManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.module.ModifiableModuleModel;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
@@ -113,7 +111,7 @@ public class FacetPointerImpl<F extends Facet> implements FacetPointer<F> {
}
@Nullable
public F findFacet(ModulesProvider modulesProvider, FacetsProvider facetsProvider) {
public F findFacet(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider) {
final Module module = modulesProvider.getModule(myModuleName);
if (module == null) return null;
final FacetType<F, ?> type = getFacetType();
@@ -141,6 +139,25 @@ public class FacetPointerImpl<F extends Facet> implements FacetPointer<F> {
return myFacetTypeId;
}
@NotNull
public String getModuleName(@Nullable ModifiableModuleModel moduleModel) {
if (moduleModel != null && myFacet != null) {
final String newName = moduleModel.getNewName(myFacet.getModule());
if (newName != null) {
return newName;
}
}
return myModuleName;
}
@NotNull
public String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider) {
if (myFacet != null) {
return modulesProvider.getFacetModel(myFacet.getModule()).getFacetName(myFacet);
}
return myFacetName;
}
@Nullable
public FacetType<F, ?> getFacetType() {
//noinspection unchecked
java/openapi/src/com/intellij/facet/pointers/FacetPointer.java
+8 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.facet.pointers;
import com.intellij.facet.Facet;
import com.intellij.facet.FacetType;
import com.intellij.openapi.module.ModifiableModuleModel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
@@ -48,8 +49,14 @@ public interface FacetPointer<F extends Facet> {
FacetType<F, ?> getFacetType();
@Nullable
F findFacet(ModulesProvider modulesProvider, FacetsProvider facetsProvider);
F findFacet(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider);
@NotNull
String getFacetTypeId();
@NotNull
String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider);
@NotNull
String getModuleName(@Nullable ModifiableModuleModel moduleModel);
}