From ac26cc4086956cea1bc5ff3e9da9c12694e67963 Mon Sep 17 00:00:00 2001 From: JohnHake Date: Mon, 17 Feb 2020 15:48:25 -0800 Subject: [PATCH] Cleanup per SDK --- module/resources/META-INF/plugin.xml | 18 ------ module/src/main/java/icons/SdkIcons.java | 11 ++++ .../sdk}/module/DemoModuleBuilder.java | 5 +- .../intellij/sdk}/module/DemoModuleType.java | 8 +-- .../sdk}/module/DemoModuleWizardStep.java | 7 +-- module/src/main/resources/META-INF/plugin.xml | 41 +++++++++++++ .../main/resources/META-INF/pluginIcon.svg | 58 +++++++++++++++++++ module/src/main/resources/icons/sdk_16.svg | 7 +++ 8 files changed, 124 insertions(+), 31 deletions(-) delete mode 100644 module/resources/META-INF/plugin.xml create mode 100644 module/src/main/java/icons/SdkIcons.java rename module/src/{com/intellij/tutorials => main/java/org/intellij/sdk}/module/DemoModuleBuilder.java (90%) rename module/src/{com/intellij/tutorials => main/java/org/intellij/sdk}/module/DemoModuleType.java (91%) rename module/src/{com/intellij/tutorials => main/java/org/intellij/sdk}/module/DemoModuleWizardStep.java (63%) create mode 100644 module/src/main/resources/META-INF/plugin.xml create mode 100644 module/src/main/resources/META-INF/pluginIcon.svg create mode 100644 module/src/main/resources/icons/sdk_16.svg diff --git a/module/resources/META-INF/plugin.xml b/module/resources/META-INF/plugin.xml deleted file mode 100644 index 8a76b1823..000000000 --- a/module/resources/META-INF/plugin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - com.intellij.tutorials.module - Module Type Demo - 1.0 - JetBrains - - Basic example of working with module types - - - - - com.intellij.modules.platform - - - - - - \ No newline at end of file diff --git a/module/src/main/java/icons/SdkIcons.java b/module/src/main/java/icons/SdkIcons.java new file mode 100644 index 000000000..1475ff91d --- /dev/null +++ b/module/src/main/java/icons/SdkIcons.java @@ -0,0 +1,11 @@ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + +package icons; + +import com.intellij.openapi.util.IconLoader; + +import javax.swing.*; + +public class SdkIcons { + public static final Icon Sdk_default_icon = IconLoader.getIcon("/icons/sdk_16.svg"); +} diff --git a/module/src/com/intellij/tutorials/module/DemoModuleBuilder.java b/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java similarity index 90% rename from module/src/com/intellij/tutorials/module/DemoModuleBuilder.java rename to module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java index 8caba83f3..88e5999b1 100644 --- a/module/src/com/intellij/tutorials/module/DemoModuleBuilder.java +++ b/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java @@ -1,4 +1,4 @@ -package com.intellij.tutorials.module; +package org.intellij.sdk.module; import com.intellij.ide.util.projectWizard.*; import com.intellij.openapi.Disposable; @@ -7,9 +7,6 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.roots.ModifiableRootModel; import org.jetbrains.annotations.Nullable; -/** - * @author Anna Bulenkova - */ public class DemoModuleBuilder extends ModuleBuilder { @Override public void setupRootModel(ModifiableRootModel model) throws ConfigurationException { diff --git a/module/src/com/intellij/tutorials/module/DemoModuleType.java b/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java similarity index 91% rename from module/src/com/intellij/tutorials/module/DemoModuleType.java rename to module/src/main/java/org/intellij/sdk/module/DemoModuleType.java index 34c83ec06..29d1e8453 100644 --- a/module/src/com/intellij/tutorials/module/DemoModuleType.java +++ b/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java @@ -1,16 +1,14 @@ -package com.intellij.tutorials.module; +package org.intellij.sdk.module; import com.intellij.icons.AllIcons; import com.intellij.ide.util.projectWizard.*; import com.intellij.openapi.module.*; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; +import icons.SdkIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; -/** - * @author Anna Bulenkova - */ public class DemoModuleType extends ModuleType { private static final String ID = "DEMO_MODULE_TYPE"; @@ -43,7 +41,7 @@ public class DemoModuleType extends ModuleType { @Override public Icon getNodeIcon(@Deprecated boolean b) { - return AllIcons.General.Information; + return SdkIcons.Sdk_default_icon; } @NotNull diff --git a/module/src/com/intellij/tutorials/module/DemoModuleWizardStep.java b/module/src/main/java/org/intellij/sdk/module/DemoModuleWizardStep.java similarity index 63% rename from module/src/com/intellij/tutorials/module/DemoModuleWizardStep.java rename to module/src/main/java/org/intellij/sdk/module/DemoModuleWizardStep.java index d65923c22..9f4711faa 100644 --- a/module/src/com/intellij/tutorials/module/DemoModuleWizardStep.java +++ b/module/src/main/java/org/intellij/sdk/module/DemoModuleWizardStep.java @@ -1,12 +1,11 @@ -package com.intellij.tutorials.module; +// Copyright 2000-2020. JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + +package org.intellij.sdk.module; import com.intellij.ide.util.projectWizard.ModuleWizardStep; import javax.swing.*; -/** - * @author Anna Bulenkova - */ public class DemoModuleWizardStep extends ModuleWizardStep { @Override public JComponent getComponent() { diff --git a/module/src/main/resources/META-INF/plugin.xml b/module/src/main/resources/META-INF/plugin.xml new file mode 100644 index 000000000..1784c2274 --- /dev/null +++ b/module/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,41 @@ + + + + org.intellij.sdk.module + + + SDK: Module Type Sample Project + + + 2.0.0 + + + + + + com.intellij.modules.platform + + + + + Adds SDK Demo Module to File | New | Project... + ]]> + + + +
  • 2.0.0 Convert to Gradle-based plugin, change plugin ID
    • +
  • 1.0.0 Release 2018.3 and earlier.
    • + + ]]> +     + + + IntelliJ Platform SDK + + + + + +     \ No newline at end of file diff --git a/module/src/main/resources/META-INF/pluginIcon.svg b/module/src/main/resources/META-INF/pluginIcon.svg new file mode 100644 index 000000000..613290897 --- /dev/null +++ b/module/src/main/resources/META-INF/pluginIcon.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module/src/main/resources/icons/sdk_16.svg b/module/src/main/resources/icons/sdk_16.svg new file mode 100644 index 000000000..011462b8a --- /dev/null +++ b/module/src/main/resources/icons/sdk_16.svg @@ -0,0 +1,7 @@ + + + + + + +