Skip to content

Commit bf052c8

Browse files
VISTALLVISTALL
committed
fix compiler after ide.api split
1 parent 6c5ec3d commit bf052c8

6 files changed

Lines changed: 114 additions & 118 deletions

File tree

‎plugin/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<version>${project.version}</version>
126126
<scope>provided</scope>
127127
</dependency>
128+
<dependency>
129+
<groupId>consulo</groupId>
130+
<artifactId>consulo-module-creation-api</artifactId>
131+
<version>${project.version}</version>
132+
<scope>provided</scope>
133+
</dependency>
128134
<dependency>
129135
<groupId>consulo</groupId>
130136
<artifactId>consulo-language-api</artifactId>

‎plugin/src/main/java/consulo/unity3d/jsonApi/UnityOpenFilePostHandler.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121
import com.sun.jna.platform.win32.User32;
2222
import com.sun.jna.platform.win32.WinDef;
2323
import consulo.annotation.component.ExtensionImpl;
24+
import consulo.application.Application;
2425
import consulo.application.ui.wm.IdeFocusManager;
2526
import consulo.builtinWebServer.json.JsonPostRequestHandler;
2627
import consulo.codeEditor.Editor;
2728
import consulo.content.bundle.Sdk;
2829
import consulo.content.bundle.SdkTable;
2930
import consulo.content.bundle.SdkUtil;
3031
import consulo.fileEditor.FileEditorManager;
31-
import consulo.ide.moduleImport.ModuleImportContext;
32-
import consulo.ide.moduleImport.ModuleImportProcessor;
33-
import consulo.ide.moduleImport.ModuleImportProvider;
34-
import consulo.ide.newModule.NewOrImportModuleUtil;
32+
import consulo.module.creation.ModuleCreationHelper;
33+
import consulo.module.creation.NewOrImportModuleUtil;
34+
import consulo.module.creation.importing.ModuleImportContext;
35+
import consulo.module.creation.importing.ModuleImportProvider;
3536
import consulo.navigation.OpenFileDescriptor;
3637
import consulo.navigation.OpenFileDescriptorFactory;
3738
import consulo.platform.Platform;
@@ -154,7 +155,8 @@ public JsonResponse handle(@Nonnull final UnityOpenFilePostHandlerRequest body)
154155

155156
AsyncResult<Pair<ModuleImportContext, ModuleImportProvider<ModuleImportContext>>> result = AsyncResult.undefined();
156157

157-
ModuleImportProcessor.showImportChooser(null, projectVirtualFile, Collections.singletonList(importProvider), result);
158+
Application.get().getInstance(ModuleCreationHelper.class)
159+
.showImportChooser(null, projectVirtualFile, Collections.singletonList(importProvider), result);
158160

159161
result.doWhenDone(pair ->
160162
{

‎plugin/src/main/java/consulo/unity3d/projectImport/Unity3dModuleImportProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import consulo.annotation.access.RequiredReadAction;
2020
import consulo.annotation.component.ExtensionImpl;
2121
import consulo.content.bundle.Sdk;
22-
import consulo.ide.moduleImport.ModuleImportProvider;
2322
import consulo.localize.LocalizeValue;
2423
import consulo.module.ModifiableModuleModel;
2524
import consulo.module.Module;
25+
import consulo.module.creation.importing.ModuleImportProvider;
2626
import consulo.project.Project;
2727
import consulo.project.startup.StartupManager;
2828
import consulo.ui.ex.wizard.WizardStep;

‎plugin/src/main/java/consulo/unity3d/projectImport/UnityModuleImportContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package consulo.unity3d.projectImport;
1818

1919
import consulo.content.bundle.Sdk;
20-
import consulo.ide.moduleImport.ModuleImportContext;
20+
import consulo.module.creation.importing.ModuleImportContext;
2121
import consulo.project.Project;
2222
import consulo.unity3d.jsonApi.UnityOpenFilePostHandlerRequest;
2323

‎plugin/src/main/java/consulo/unity3d/projectImport/ui/Unity3dWizardStep.java‎

Lines changed: 98 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import consulo.content.bundle.SdkTable;
2323
import consulo.content.bundle.SdkUtil;
2424
import consulo.disposer.Disposable;
25-
import consulo.ide.newModule.ui.UnifiedProjectOrModuleNameStep;
2625
import consulo.ide.setting.ProjectStructureSettingsUtil;
2726
import consulo.ide.setting.ShowSettingsUtil;
2827
import consulo.localize.LocalizeValue;
28+
import consulo.module.creation.ui.UnifiedProjectOrModuleNameStep;
2929
import consulo.module.ui.BundleBox;
3030
import consulo.module.ui.BundleBoxBuilder;
3131
import consulo.ui.Button;
@@ -38,12 +38,12 @@
3838
import consulo.ui.model.MutableListModel;
3939
import consulo.ui.style.StandardColors;
4040
import consulo.ui.util.FormBuilder;
41-
import consulo.unity3d.localize.Unity3dLocalize;
4241
import consulo.unity3d.bundle.Unity3dBundleType;
42+
import consulo.unity3d.localize.Unity3dLocalize;
4343
import consulo.unity3d.projectImport.Unity3dProjectImporter;
4444
import consulo.unity3d.projectImport.UnityModuleImportContext;
45-
4645
import jakarta.annotation.Nonnull;
46+
4747
import javax.swing.*;
4848
import java.util.Objects;
4949
import java.util.function.Consumer;
@@ -52,112 +52,99 @@
5252
* @author VISTALL
5353
* @since 01.02.15
5454
*/
55-
public class Unity3dWizardStep extends UnifiedProjectOrModuleNameStep<UnityModuleImportContext>
56-
{
57-
private final UnityModuleImportContext myContext;
58-
59-
private BundleBox myBundleBox;
60-
61-
public Unity3dWizardStep(UnityModuleImportContext context)
62-
{
63-
super(context);
64-
myContext = context;
65-
}
66-
67-
@RequiredUIAccess
68-
@Override
69-
protected void extend(@Nonnull FormBuilder builder, @Nonnull Disposable uiDisposable)
70-
{
71-
super.extend(builder, uiDisposable);
72-
73-
String requiredVersion = Unity3dProjectImporter.loadVersionFromProject(myContext.getPath());
74-
75-
BundleBoxBuilder boxBuilder = BundleBoxBuilder.create(uiDisposable);
76-
boxBuilder.withSdkTypeFilterByType(Unity3dBundleType.getInstance());
77-
78-
ComboBox<BundleBox.BundleBoxItem> comboBox = (myBundleBox = boxBuilder.build()).getComponent();
79-
DockLayout dock = DockLayout.create();
80-
dock.center(comboBox);
81-
dock.right(Button.create(LocalizeValue.localizeTODO("Select..."), clickEvent ->
82-
{
83-
JComponent awtComponent = (JComponent) TargetAWT.to(myBundleBox.getComponent());
84-
85-
showAddSdk(sdk ->
86-
{
87-
WriteAction.run(() -> SdkTable.getInstance().addSdk(sdk));
88-
89-
MutableListModel<BundleBox.BundleBoxItem> listModel = (MutableListModel<BundleBox.BundleBoxItem>) comboBox.getListModel();
90-
91-
BundleBox.BaseBundleBoxItem item = new BundleBox.BaseBundleBoxItem(sdk);
92-
93-
listModel.add(item);
94-
95-
UIAccess.current().give(() -> comboBox.setValue(item));
96-
});
97-
}));
98-
builder.addLabeled(Unity3dLocalize.unityName(), dock);
99-
100-
if(requiredVersion != null)
101-
{
102-
for(BundleBox.BundleBoxItem item : comboBox.getListModel())
103-
{
104-
Sdk bundle = item.getBundle();
105-
106-
if(bundle != null)
107-
{
108-
String versionString = bundle.getVersionString();
109-
if(Objects.equals(requiredVersion, versionString))
110-
{
111-
comboBox.setValue(item);
112-
break;
113-
}
114-
}
115-
}
116-
}
117-
118-
if(comboBox.getValue() == null && comboBox.getListModel().getSize() > 0)
119-
{
120-
myBundleBox.getComponent().setValueByIndex(0);
121-
}
122-
123-
if(requiredVersion != null)
124-
{
125-
builder.addBottom(Label.create(Unity3dLocalize.requiredUnityVersionIs0(requiredVersion)).withForegroundColor(StandardColors.GRAY));
126-
}
127-
}
128-
129-
@RequiredUIAccess
130-
public static void showAddSdk(@RequiredUIAccess Consumer<Sdk> sdkConsumer)
131-
{
132-
ProjectStructureSettingsUtil settingsUtil = ShowSettingsUtil.getInstance();
133-
134-
Unity3dBundleType type = Unity3dBundleType.getInstance();
135-
136-
SdkUtil.selectSdkHome(Unity3dBundleType.getInstance(), home ->
137-
{
138-
String newSdkName = SdkUtil.createUniqueSdkName(type, home, settingsUtil.getSdksModel().getBundles());
139-
Sdk newSdk = SdkTable.getInstance().createSdk(newSdkName, type);
140-
141-
SdkModificator modificator = newSdk.getSdkModificator();
142-
modificator.setHomePath(home);
143-
modificator.commitChanges();
144-
145-
sdkConsumer.accept(newSdk);
146-
});
147-
}
148-
149-
@Override
150-
public void onStepLeave(@Nonnull UnityModuleImportContext context)
151-
{
152-
super.onStepLeave(context);
153-
154-
if(myBundleBox != null)
155-
{
156-
String selectedBundleName = myBundleBox.getSelectedBundleName();
157-
if(selectedBundleName != null)
158-
{
159-
context.setSdk(SdkTable.getInstance().findSdk(selectedBundleName));
160-
}
161-
}
162-
}
55+
public class Unity3dWizardStep extends UnifiedProjectOrModuleNameStep<UnityModuleImportContext> {
56+
private final UnityModuleImportContext myContext;
57+
58+
private BundleBox myBundleBox;
59+
60+
public Unity3dWizardStep(UnityModuleImportContext context) {
61+
super(context);
62+
myContext = context;
63+
}
64+
65+
@RequiredUIAccess
66+
@Override
67+
protected void extend(@Nonnull FormBuilder builder, @Nonnull Disposable uiDisposable) {
68+
super.extend(builder, uiDisposable);
69+
70+
String requiredVersion = Unity3dProjectImporter.loadVersionFromProject(myContext.getPath());
71+
72+
BundleBoxBuilder boxBuilder = BundleBoxBuilder.create(uiDisposable);
73+
boxBuilder.withSdkTypeFilterByType(Unity3dBundleType.getInstance());
74+
75+
ComboBox<BundleBox.BundleBoxItem> comboBox = (myBundleBox = boxBuilder.build()).getComponent();
76+
DockLayout dock = DockLayout.create();
77+
dock.center(comboBox);
78+
dock.right(Button.create(LocalizeValue.localizeTODO("Select..."), clickEvent ->
79+
{
80+
JComponent awtComponent = (JComponent) TargetAWT.to(myBundleBox.getComponent());
81+
82+
showAddSdk(sdk ->
83+
{
84+
WriteAction.run(() -> SdkTable.getInstance().addSdk(sdk));
85+
86+
MutableListModel<BundleBox.BundleBoxItem> listModel = (MutableListModel<BundleBox.BundleBoxItem>) comboBox.getListModel();
87+
88+
BundleBox.BaseBundleBoxItem item = new BundleBox.BaseBundleBoxItem(sdk);
89+
90+
listModel.add(item);
91+
92+
UIAccess.current().give(() -> comboBox.setValue(item));
93+
});
94+
}));
95+
builder.addLabeled(Unity3dLocalize.unityName(), dock);
96+
97+
if (requiredVersion != null) {
98+
for (BundleBox.BundleBoxItem item : comboBox.getListModel()) {
99+
Sdk bundle = item.getBundle();
100+
101+
if (bundle != null) {
102+
String versionString = bundle.getVersionString();
103+
if (Objects.equals(requiredVersion, versionString)) {
104+
comboBox.setValue(item);
105+
break;
106+
}
107+
}
108+
}
109+
}
110+
111+
if (comboBox.getValue() == null && comboBox.getListModel().getSize() > 0) {
112+
myBundleBox.getComponent().setValueByIndex(0);
113+
}
114+
115+
if (requiredVersion != null) {
116+
builder.addBottom(Label.create(Unity3dLocalize.requiredUnityVersionIs0(requiredVersion)).withForegroundColor(StandardColors.GRAY));
117+
}
118+
}
119+
120+
@RequiredUIAccess
121+
public static void showAddSdk(@RequiredUIAccess Consumer<Sdk> sdkConsumer) {
122+
ProjectStructureSettingsUtil settingsUtil = ShowSettingsUtil.getInstance();
123+
124+
Unity3dBundleType type = Unity3dBundleType.getInstance();
125+
126+
SdkUtil.selectSdkHome(Unity3dBundleType.getInstance(), home ->
127+
{
128+
String newSdkName = SdkUtil.createUniqueSdkName(type, home, settingsUtil.getSdksModel().getBundles());
129+
Sdk newSdk = SdkTable.getInstance().createSdk(newSdkName, type);
130+
131+
SdkModificator modificator = newSdk.getSdkModificator();
132+
modificator.setHomePath(home);
133+
modificator.commitChanges();
134+
135+
sdkConsumer.accept(newSdk);
136+
});
137+
}
138+
139+
@Override
140+
public void onStepLeave(@Nonnull UnityModuleImportContext context) {
141+
super.onStepLeave(context);
142+
143+
if (myBundleBox != null) {
144+
String selectedBundleName = myBundleBox.getSelectedBundleName();
145+
if (selectedBundleName != null) {
146+
context.setSdk(SdkTable.getInstance().findSdk(selectedBundleName));
147+
}
148+
}
149+
}
163150
}

‎plugin/src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
requires consulo.http.api;
2525

2626
requires consulo.module.ui.api;
27+
requires consulo.module.creation.api;
2728

2829
requires consulo.language.impl;
2930

0 commit comments

Comments
 (0)