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

lazy framework support loading in wizard

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-08-25 17:19:20 +04:00
parent 2c0098715a
commit 7362957649
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportNode.java
+11 -6
View File
@@ -36,24 +36,24 @@ import java.util.List;
public class FrameworkSupportNode extends CheckedTreeNode {
private final FrameworkSupportProvider myProvider;
private final FrameworkSupportNode myParentNode;
private final FrameworkSupportConfigurable myConfigurable;
private FrameworkSupportConfigurable myConfigurable;
private final List<FrameworkSupportNode> myChildren = new ArrayList<FrameworkSupportNode>();
private final FrameworkSupportModelBase myModel;
private final Disposable myParentDisposable;
public FrameworkSupportNode(final FrameworkSupportProvider provider, final FrameworkSupportNode parentNode, final FrameworkSupportModelBase model,
Disposable parentDisposable) {
super(provider);
myParentDisposable = parentDisposable;
setChecked(false);
myProvider = provider;
myParentNode = parentNode;
model.registerComponent(provider, this);
myConfigurable = provider.createConfigurable(model);
Disposer.register(parentDisposable, myConfigurable);
myModel = model;
if (parentNode != null) {
parentNode.add(this);
parentNode.myChildren.add(this);
}
setConfigurableComponentEnabled(false);
}
public List<FrameworkSupportNode> getChildren() {
@@ -75,7 +75,12 @@ public class FrameworkSupportNode extends CheckedTreeNode {
return myParentNode;
}
public FrameworkSupportConfigurable getConfigurable() {
public synchronized FrameworkSupportConfigurable getConfigurable() {
if (myConfigurable == null) {
myConfigurable = myProvider.createConfigurable(myModel);
setConfigurableComponentEnabled(false);
Disposer.register(myParentDisposable, myConfigurable);
}
return myConfigurable;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleBuilder.java
+17 -9
View File
@@ -44,18 +44,14 @@ public class MvcModuleBuilder extends GroovyAwareModuleBuilder {
}
private class GroovySdkWizardStep extends ModuleWizardStep {
private final LibraryOptionsPanel myPanel;
private LibraryOptionsPanel myPanel;
private final LibrariesContainer myLibrariesContainer;
private boolean myDownloaded;
private LibraryCompositionSettings myLibraryCompositionSettings;
public GroovySdkWizardStep(WizardContext wizardContext) {
final Project project = wizardContext.getProject();
final GroovyLibraryDescription libraryDescription = myFramework.createLibraryDescription();
final String contentEntryPath = getContentEntryPath();
final String basePath = contentEntryPath != null ? FileUtil.toSystemIndependentName(contentEntryPath) : "";
myLibrariesContainer = LibrariesContainerFactory.createContainer(project);
myPanel = new LibraryOptionsPanel(libraryDescription, basePath, null, myLibrariesContainer, false);
addModuleConfigurationUpdater(new ModuleConfigurationUpdater() {
@Override
public void update(@NotNull Module module, @NotNull ModifiableRootModel rootModel) {
@@ -69,12 +65,14 @@ public class MvcModuleBuilder extends GroovyAwareModuleBuilder {
@Override
public void disposeUIResources() {
Disposer.dispose(myPanel);
if (myPanel != null) {
Disposer.dispose(myPanel);
}
}
@Override
public JComponent getComponent() {
final JComponent component = myPanel.getMainPanel();
final JComponent component = getPanel().getMainPanel();
final JPanel panel = new JPanel(new BorderLayout());
panel.add(component, BorderLayout.NORTH);
@@ -96,7 +94,7 @@ public class MvcModuleBuilder extends GroovyAwareModuleBuilder {
@Override
public void _commit(boolean finishChosen) throws CommitStepException {
if (finishChosen && !myDownloaded && myLibraryCompositionSettings != null) {
if (myLibraryCompositionSettings.downloadFiles(myPanel.getMainPanel())) {
if (myLibraryCompositionSettings.downloadFiles(getPanel().getMainPanel())) {
myDownloaded = true;
}
}
@@ -104,7 +102,17 @@ public class MvcModuleBuilder extends GroovyAwareModuleBuilder {
@Override
public void updateDataModel() {
myLibraryCompositionSettings = myPanel.apply();
myLibraryCompositionSettings = getPanel().apply();
}
private synchronized LibraryOptionsPanel getPanel() {
if (myPanel == null) {
final GroovyLibraryDescription libraryDescription = myFramework.createLibraryDescription();
final String contentEntryPath = getContentEntryPath();
final String basePath = contentEntryPath != null ? FileUtil.toSystemIndependentName(contentEntryPath) : "";
myPanel = new LibraryOptionsPanel(libraryDescription, basePath, null, myLibrariesContainer, false);
}
return myPanel;
}
}
}