From 81f7a1321bef68f29986e70e227d970d3a807d40 Mon Sep 17 00:00:00 2001 From: JohnHake Date: Tue, 18 Feb 2020 09:21:00 -0800 Subject: [PATCH] Cleanup --- project_model/resources/META-INF/plugin.xml | 42 ----------- project_model/src/java/icons/SdkIcons.java | 11 +++ .../sdk}/project/model/LibrariesAction.java | 4 +- .../project/model/ModificationAction.java | 4 +- .../model/ProjectFileIndexSampleAction.java | 4 +- .../sdk}/project/model/ProjectSdkAction.java | 4 +- .../project/model/ShowSourceRootsActions.java | 4 +- .../src/resources/META-INF/plugin.xml | 71 +++++++++++++++++++ .../src/resources/META-INF/pluginIcon.svg | 58 +++++++++++++++ project_model/src/resources/icons/sdk_16.svg | 7 ++ 10 files changed, 162 insertions(+), 47 deletions(-) delete mode 100644 project_model/resources/META-INF/plugin.xml create mode 100644 project_model/src/java/icons/SdkIcons.java rename project_model/src/{com/intellij/tutorials => java/org/intellij/sdk}/project/model/LibrariesAction.java (91%) rename project_model/src/{com/intellij/tutorials => java/org/intellij/sdk}/project/model/ModificationAction.java (88%) rename project_model/src/{com/intellij/tutorials => java/org/intellij/sdk}/project/model/ProjectFileIndexSampleAction.java (91%) rename project_model/src/{com/intellij/tutorials => java/org/intellij/sdk}/project/model/ProjectSdkAction.java (84%) rename project_model/src/{com/intellij/tutorials => java/org/intellij/sdk}/project/model/ShowSourceRootsActions.java (85%) create mode 100644 project_model/src/resources/META-INF/plugin.xml create mode 100644 project_model/src/resources/META-INF/pluginIcon.svg create mode 100644 project_model/src/resources/icons/sdk_16.svg diff --git a/project_model/resources/META-INF/plugin.xml b/project_model/resources/META-INF/plugin.xml deleted file mode 100644 index 4fbd72dd8..000000000 --- a/project_model/resources/META-INF/plugin.xml +++ /dev/null @@ -1,42 +0,0 @@ - - org.jetbrains.plugins.sample.ProjectModel - Project Model - 1.0 - JetBrains - - Demonstrates various aspects of interacting with project model - - - - - com.intellij.modules.java - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/project_model/src/java/icons/SdkIcons.java b/project_model/src/java/icons/SdkIcons.java new file mode 100644 index 000000000..1475ff91d --- /dev/null +++ b/project_model/src/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/project_model/src/com/intellij/tutorials/project/model/LibrariesAction.java b/project_model/src/java/org/intellij/sdk/project/model/LibrariesAction.java similarity index 91% rename from project_model/src/com/intellij/tutorials/project/model/LibrariesAction.java rename to project_model/src/java/org/intellij/sdk/project/model/LibrariesAction.java index 1bc8ebb70..a953be2c2 100644 --- a/project_model/src/com/intellij/tutorials/project/model/LibrariesAction.java +++ b/project_model/src/java/org/intellij/sdk/project/model/LibrariesAction.java @@ -1,4 +1,6 @@ -package com.intellij.tutorials.project.model; +// 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.project.model; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; diff --git a/project_model/src/com/intellij/tutorials/project/model/ModificationAction.java b/project_model/src/java/org/intellij/sdk/project/model/ModificationAction.java similarity index 88% rename from project_model/src/com/intellij/tutorials/project/model/ModificationAction.java rename to project_model/src/java/org/intellij/sdk/project/model/ModificationAction.java index 1f2364f23..649cf83ad 100644 --- a/project_model/src/com/intellij/tutorials/project/model/ModificationAction.java +++ b/project_model/src/java/org/intellij/sdk/project/model/ModificationAction.java @@ -1,4 +1,6 @@ -package com.intellij.tutorials.project.model; +// 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.project.model; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.module.Module; diff --git a/project_model/src/com/intellij/tutorials/project/model/ProjectFileIndexSampleAction.java b/project_model/src/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java similarity index 91% rename from project_model/src/com/intellij/tutorials/project/model/ProjectFileIndexSampleAction.java rename to project_model/src/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java index 421bd1f50..cdd21d3df 100644 --- a/project_model/src/com/intellij/tutorials/project/model/ProjectFileIndexSampleAction.java +++ b/project_model/src/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java @@ -1,4 +1,6 @@ -package com.intellij.tutorials.project.model; +// 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.project.model; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.editor.*; diff --git a/project_model/src/com/intellij/tutorials/project/model/ProjectSdkAction.java b/project_model/src/java/org/intellij/sdk/project/model/ProjectSdkAction.java similarity index 84% rename from project_model/src/com/intellij/tutorials/project/model/ProjectSdkAction.java rename to project_model/src/java/org/intellij/sdk/project/model/ProjectSdkAction.java index 758a6c418..ef290a808 100644 --- a/project_model/src/com/intellij/tutorials/project/model/ProjectSdkAction.java +++ b/project_model/src/java/org/intellij/sdk/project/model/ProjectSdkAction.java @@ -1,4 +1,6 @@ -package com.intellij.tutorials.project.model; +// 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.project.model; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; diff --git a/project_model/src/com/intellij/tutorials/project/model/ShowSourceRootsActions.java b/project_model/src/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java similarity index 85% rename from project_model/src/com/intellij/tutorials/project/model/ShowSourceRootsActions.java rename to project_model/src/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java index 41a21612c..df4632d29 100644 --- a/project_model/src/com/intellij/tutorials/project/model/ShowSourceRootsActions.java +++ b/project_model/src/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java @@ -1,4 +1,6 @@ -package com.intellij.tutorials.project.model; +// 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.project.model; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; diff --git a/project_model/src/resources/META-INF/plugin.xml b/project_model/src/resources/META-INF/plugin.xml new file mode 100644 index 000000000..992835c70 --- /dev/null +++ b/project_model/src/resources/META-INF/plugin.xml @@ -0,0 +1,71 @@ + + + + + + org.intellij.sdk.projectModel + + + SDK: Project Model Sample Project + + + 2.0.0 + + + + + + com.intellij.modules.java + + + + Adds SDK Demo $$$$ to #### + ]]> + + + +
  • 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/project_model/src/resources/META-INF/pluginIcon.svg b/project_model/src/resources/META-INF/pluginIcon.svg new file mode 100644 index 000000000..613290897 --- /dev/null +++ b/project_model/src/resources/META-INF/pluginIcon.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project_model/src/resources/icons/sdk_16.svg b/project_model/src/resources/icons/sdk_16.svg new file mode 100644 index 000000000..011462b8a --- /dev/null +++ b/project_model/src/resources/icons/sdk_16.svg @@ -0,0 +1,7 @@ + + + + + + +