Skip to content

Commit fa050cc

Browse files
committed
fix compile - update to sdk api
1 parent c0382b7 commit fa050cc

4 files changed

Lines changed: 11 additions & 45 deletions

File tree

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.intellij.java.language.internal;
22

33
import com.intellij.java.language.projectRoots.JavaSdkType;
4+
import consulo.localize.LocalizeValue;
5+
import consulo.ui.image.Image;
6+
import jakarta.annotation.Nonnull;
47

58
/**
69
* @author VISTALL
710
* @since 02.06.2024
811
*/
912
public abstract class DefaultJavaSdkType extends JavaSdkType {
10-
public DefaultJavaSdkType(String name) {
11-
super(name);
12-
}
13+
protected DefaultJavaSdkType(@Nonnull String id, @Nonnull LocalizeValue displayName, @Nonnull Image icon) {
14+
super(id, displayName, icon);
15+
}
1316
}

java-language-api/src/main/java/com/intellij/java/language/projectRoots/JavaSdkType.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import consulo.content.bundle.SdkModificator;
2222
import consulo.content.bundle.SdkTable;
2323
import consulo.content.bundle.SdkType;
24+
import consulo.localize.LocalizeValue;
2425
import consulo.process.cmd.GeneralCommandLine;
26+
import consulo.ui.image.Image;
2527
import jakarta.annotation.Nonnull;
2628

2729
import java.io.File;
@@ -35,8 +37,8 @@ public static JavaSdkType getDefaultJavaSdkType() {
3537
return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(DefaultJavaSdkType.class);
3638
}
3739

38-
public JavaSdkType(String name) {
39-
super(name);
40+
protected JavaSdkType(@Nonnull String id, @Nonnull LocalizeValue displayName, @Nonnull Image icon) {
41+
super(id, displayName, icon);
4042
}
4143

4244
public final Sdk createJdk(String jdkName, @Nonnull String home) {

plugin/src/main/java/com/intellij/java/impl/openapi/projectRoots/impl/DefaultJavaSdkTypeImpl.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import consulo.platform.PlatformOperatingSystem;
3939
import consulo.process.cmd.GeneralCommandLine;
4040
import consulo.project.localize.ProjectLocalize;
41-
import consulo.ui.image.Image;
4241
import consulo.util.collection.Sets;
4342
import consulo.util.dataholder.Key;
4443
import consulo.util.io.FileUtil;
@@ -77,25 +76,7 @@ public class DefaultJavaSdkTypeImpl extends DefaultJavaSdkType {
7776
public static final Key<Boolean> KEY = Key.create("JavaSdk");
7877

7978
public DefaultJavaSdkTypeImpl() {
80-
super("JDK");
81-
}
82-
83-
@Nonnull
84-
@Override
85-
public String getPresentableName() {
86-
return ProjectLocalize.sdkJavaName().get();
87-
}
88-
89-
@Nonnull
90-
@Override
91-
public Image getIcon() {
92-
return JavaPsiImplIconGroup.java();
93-
}
94-
95-
@Nonnull
96-
@Override
97-
public String getHelpTopic() {
98-
return "reference.project.structure.sdk.java";
79+
super("JDK", ProjectLocalize.sdkJavaName(), JavaPsiImplIconGroup.java());
9980
}
10081

10182
@Override

plugin/src/main/java/com/intellij/java/impl/openapi/projectRoots/package.html

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)