diff --git a/facet_basics/build.gradle b/facet_basics/build.gradle
new file mode 100644
index 000000000..432b6baf5
--- /dev/null
+++ b/facet_basics/build.gradle
@@ -0,0 +1,30 @@
+plugins {
+ id 'java'
+ id 'org.jetbrains.intellij' version '0.4.10'
+}
+
+group 'org.intellij.sdk'
+version '2.1.0'
+
+sourceCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+}
+
+// See https://github.com/JetBrains/gradle-intellij-plugin/
+intellij {
+ version '2019.1'
+ updateSinceUntilBuild = false
+
+}
+patchPluginXml {
+ version = project.version
+}
+
+// Force javadoc rebuild before jar is built
+jar.dependsOn javadoc
diff --git a/facet_basics/facet_basics.iml b/facet_basics/facet_basics.iml
deleted file mode 100644
index 3700dfbf1..000000000
--- a/facet_basics/facet_basics.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/facet_basics/gradle/wrapper/gradle-wrapper.jar b/facet_basics/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..28861d273
Binary files /dev/null and b/facet_basics/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/facet_basics/gradle/wrapper/gradle-wrapper.properties b/facet_basics/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..290541c73
--- /dev/null
+++ b/facet_basics/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/facet_basics/gradlew b/facet_basics/gradlew
new file mode 100755
index 000000000..cccdd3d51
--- /dev/null
+++ b/facet_basics/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/facet_basics/gradlew.bat b/facet_basics/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/facet_basics/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/facet_basics/settings.gradle b/facet_basics/settings.gradle
new file mode 100644
index 000000000..f92009185
--- /dev/null
+++ b/facet_basics/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'facet'
+
diff --git a/facet_basics/src/main/java/icons/SdkIcons.java b/facet_basics/src/main/java/icons/SdkIcons.java
new file mode 100644
index 000000000..1475ff91d
--- /dev/null
+++ b/facet_basics/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/facet_basics/src/com/intellij/tutorials/facet/DemoFacet.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacet.java
similarity index 75%
rename from facet_basics/src/com/intellij/tutorials/facet/DemoFacet.java
rename to facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacet.java
index e0b00cf3b..2c8f4d278 100644
--- a/facet_basics/src/com/intellij/tutorials/facet/DemoFacet.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacet.java
@@ -1,6 +1,4 @@
-// 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 com.intellij.tutorials.facet;
+package org.intellij.sdk.facet;// 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.
import com.intellij.facet.Facet;
import com.intellij.facet.FacetType;
diff --git a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetConfiguration.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java
similarity index 90%
rename from facet_basics/src/com/intellij/tutorials/facet/DemoFacetConfiguration.java
rename to facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java
index 159752fe1..73638c865 100644
--- a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetConfiguration.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java
@@ -1,6 +1,4 @@
-// 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 com.intellij.tutorials.facet;
+package org.intellij.sdk.facet;// 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.
import com.intellij.facet.FacetConfiguration;
import com.intellij.facet.ui.FacetEditorContext;
@@ -11,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
- * Provides a custom implementation of the Configuration class for DemoFacet.
+ * Provides a custom implementation of the Configuration class for org.intellij.sdk.facet.DemoFacet.
*
* @author Anna Bulenkova
* @author John Hake
diff --git a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetEditorTab.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java
similarity index 81%
rename from facet_basics/src/com/intellij/tutorials/facet/DemoFacetEditorTab.java
rename to facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java
index e2a142e28..d69ccf3c3 100644
--- a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetEditorTab.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java
@@ -1,6 +1,4 @@
-// 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 com.intellij.tutorials.facet;
+package org.intellij.sdk.facet;// 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.
import com.intellij.facet.ui.FacetEditorContext;
import com.intellij.facet.ui.FacetEditorTab;
@@ -15,7 +13,7 @@ import java.awt.*;
/**
* Provides the JPanel to be displayed in the facet UI.
- * Manages validation and modification of the DemoFacet state.
+ * Manages validation and modification of the org.intellij.sdk.facet.DemoFacet state.
*
* @author John Hake
*/
@@ -26,10 +24,10 @@ public class DemoFacetEditorTab extends FacetEditorTab {
private final JTextField myPath;
/**
- * Only DemoFacetState is captured so it can be updated per user changes
+ * Only org.intellij.sdk.facet.DemoFacetState is captured so it can be updated per user changes
* in the EditorTab.
*
- * @param state DemoFacetState object persisting DemoFacet state.
+ * @param state org.intellij.sdk.facet.DemoFacetState object persisting org.intellij.sdk.facet.DemoFacet state.
* @param context Facet editor context, can be used to get e.g. the current project module.
* @param validator Facet validator manager, can be used to get and apply a custom validator for
* this facet.
@@ -42,7 +40,7 @@ public class DemoFacetEditorTab extends FacetEditorTab {
/**
* Provides the JPanel displayed in the Preferences | Facet UI
*
- * @return JPanel to be displayed in the DemoFacetEditorTab.
+ * @return JPanel to be displayed in the org.intellij.sdk.facet.DemoFacetEditorTab.
*/
@NotNull
@Override
@@ -96,7 +94,7 @@ public class DemoFacetEditorTab extends FacetEditorTab {
}
/**
- * Copies current DemoFacetState into the myPath UI element.
+ * Copies current org.intellij.sdk.facet.DemoFacetState into the myPath UI element.
* This method is called each time this editor tab is needed for display.
*/
@Override
diff --git a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetState.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetState.java
similarity index 67%
rename from facet_basics/src/com/intellij/tutorials/facet/DemoFacetState.java
rename to facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetState.java
index fbe011bcf..15d53c97e 100644
--- a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetState.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetState.java
@@ -1,11 +1,9 @@
-// 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 com.intellij.tutorials.facet;
+package org.intellij.sdk.facet;// 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.
import org.jetbrains.annotations.NotNull;
/**
- * A simple class to store state for the DemoFacet.
+ * A simple class to store state for the org.intellij.sdk.facet.DemoFacet.
* In this case it is just a string containing a path to an SDK.
*
* @author John Hake
diff --git a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetType.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
similarity index 77%
rename from facet_basics/src/com/intellij/tutorials/facet/DemoFacetType.java
rename to facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
index d6c845391..e040fa997 100644
--- a/facet_basics/src/com/intellij/tutorials/facet/DemoFacetType.java
+++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetType.java
@@ -1,16 +1,14 @@
-// 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 com.intellij.tutorials.facet;
+package org.intellij.sdk.facet;// 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.
import com.intellij.facet.*;
-import com.intellij.icons.AllIcons;
import com.intellij.openapi.module.*;
+import icons.SdkIcons;
import org.jetbrains.annotations.*;
import javax.swing.*;
/**
- * Defines the type, id, and name of the DemoFacet. Provides creation of DemoFacet
+ * Defines the type, id, and name of the org.intellij.sdk.facet.DemoFacet. Provides creation of org.intellij.sdk.facet.DemoFacet
* and associated Configuration.
* Allows application of this facet to all ModuleTypes.
*
@@ -46,6 +44,6 @@ public class DemoFacetType extends FacetType
@Nullable
@Override
public Icon getIcon() {
- return AllIcons.General.Information;
+ return SdkIcons.Sdk_default_icon;
}
}
diff --git a/facet_basics/resources/META-INF/plugin.xml b/facet_basics/src/main/resources/META-INF/plugin.xml
similarity index 80%
rename from facet_basics/resources/META-INF/plugin.xml
rename to facet_basics/src/main/resources/META-INF/plugin.xml
index 401e2b25d..29dbd4cdb 100644
--- a/facet_basics/resources/META-INF/plugin.xml
+++ b/facet_basics/src/main/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
org.intellij.sdk.facet
- SDK Facet Basics
+ SDK: Facet Basics
@@ -16,26 +16,27 @@
2.1 Refactored for Gradle project format. 2.0 Refactored to illustrate use of PersistentComponent. 1.0 Release 2018.3 and earlier.
]]>
- IntelliJ Platform SDK
+ IntelliJ Platform SDK
- 2.0
+ 2.1
-
+ com.intellij.modules.lang
-
+
\ No newline at end of file
diff --git a/facet_basics/src/main/resources/META-INF/pluginIcon.svg b/facet_basics/src/main/resources/META-INF/pluginIcon.svg
new file mode 100644
index 000000000..613290897
--- /dev/null
+++ b/facet_basics/src/main/resources/META-INF/pluginIcon.svg
@@ -0,0 +1,58 @@
+
diff --git a/facet_basics/src/main/resources/icons/sdk_16.svg b/facet_basics/src/main/resources/icons/sdk_16.svg
new file mode 100644
index 000000000..011462b8a
--- /dev/null
+++ b/facet_basics/src/main/resources/icons/sdk_16.svg
@@ -0,0 +1,7 @@
+
diff --git a/inspection_basics/gradle/wrapper/gradle-wrapper.properties b/inspection_basics/gradle/wrapper/gradle-wrapper.properties
index 91f72d8e0..44e7c4d1d 100644
--- a/inspection_basics/gradle/wrapper/gradle-wrapper.properties
+++ b/inspection_basics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Jun 13 15:15:25 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip