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 branch 'origin/master'

Browse Source
This commit is contained in:
irengrig
2013-01-31 13:19:54 +04:00
parent d55e9a7aca ad698630cf
commit 23624e90af
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java
+21 -7
View File
@@ -35,6 +35,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.NullableComputable;
@@ -99,17 +100,30 @@ public class TemplateModuleBuilder extends ModuleBuilder {
public void run() {
try {
setupModule(module);
ModifiableModuleModel modifiableModuleModel = ModuleManager.getInstance(project).getModifiableModel();
modifiableModuleModel.renameModule(module, module.getProject().getName());
modifiableModuleModel.commit();
fixModuleName(module);
}
catch (ConfigurationException e) {
LOG.error(e);
}
catch (ModuleWithNameAlreadyExists exists) {
// do nothing
}
}
});
StartupManager.getInstance(project).registerPostStartupActivity(new Runnable() {
@Override
public void run() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
try {
ModifiableModuleModel modifiableModuleModel = ModuleManager.getInstance(project).getModifiableModel();
modifiableModuleModel.renameModule(module, module.getProject().getName());
modifiableModuleModel.commit();
fixModuleName(module);
}
catch (ModuleWithNameAlreadyExists exists) {
// do nothing
}
}
});
}
});
return module;
platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java
+6
View File
@@ -92,6 +92,11 @@ public class FacetPointersManagerImpl extends FacetPointersManager implements Pr
public void initComponent() {
final FacetManagerListener facetListener = new FacetManagerAdapter() {
@Override
public void facetAdded(@NotNull Facet facet) {
refreshPointers(facet.getModule());
}
@Override
public void beforeFacetRenamed(@NotNull Facet facet) {
final FacetPointerImpl pointer = myPointers.get(constructId(facet));
@@ -204,6 +209,7 @@ public class FacetPointersManagerImpl extends FacetPointersManager implements Pr
final MessageBusConnection connection = module.getMessageBus().connect();
myModule2Connection.put(module, connection);
connection.subscribe(FacetManager.FACETS_TOPIC, myFacetListener);
refreshPointers(module);
}
public void moduleRemoved(Project project, final Module module) {