[code samples] Update to 2020.1 IntelliJ Platform IJSDK-802

This commit is contained in:
JohnHake 2020-04-07 16:43:27 -07:00
parent 13cfe2c71f
commit 82bbf5b98b
22 changed files with 27 additions and 27 deletions

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '201-EAP-SNAPSHOT' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {

View File

@ -26,7 +26,7 @@ dependencies {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -26,7 +26,7 @@ test {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -25,7 +25,7 @@ sourceSets {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
compileKotlin { compileKotlin {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '201-EAP-SNAPSHOT' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
type 'PY' type 'PY'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -72,7 +72,7 @@ public class ImagesProjectNode extends AbstractTreeNode<VirtualFile> {
@NotNull @NotNull
@Override @Override
public Collection<? extends AbstractTreeNode> getChildren() { public Collection<? extends AbstractTreeNode<?>> getChildren() {
final List<VirtualFile> files = new ArrayList<>(0); final List<VirtualFile> files = new ArrayList<>(0);
for (VirtualFile file : getValue().getChildren()) { for (VirtualFile file : getValue().getChildren()) {
if (getImagesFiles(myProject).contains(file)) { if (getImagesFiles(myProject).contains(file)) {
@ -80,7 +80,7 @@ public class ImagesProjectNode extends AbstractTreeNode<VirtualFile> {
} }
} }
if (files.isEmpty()) return Collections.emptyList(); if (files.isEmpty()) return Collections.emptyList();
final List<AbstractTreeNode> nodes = new ArrayList<>(files.size()); final List<AbstractTreeNode<?>> nodes = new ArrayList<>(files.size());
final boolean alwaysOnTop = ProjectView.getInstance(myProject).isFoldersAlwaysOnTop(""); final boolean alwaysOnTop = ProjectView.getInstance(myProject).isFoldersAlwaysOnTop("");
Collections.sort(files, (o1, o2) -> { Collections.sort(files, (o1, o2) -> {
if (alwaysOnTop) { if (alwaysOnTop) {

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -30,7 +30,7 @@ dependencies {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
plugins 'java' plugins 'java'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -16,7 +16,7 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.4' version '2020.1'
sameSinceUntilBuild = true sameSinceUntilBuild = true
} }

View File

@ -14,11 +14,11 @@ import java.util.*;
public class TextOnlyTreeStructureProvider implements TreeStructureProvider { public class TextOnlyTreeStructureProvider implements TreeStructureProvider {
@NotNull @NotNull
@Override @Override
public Collection<AbstractTreeNode> modify(@NotNull AbstractTreeNode parent, public Collection<AbstractTreeNode<?>> modify(@NotNull AbstractTreeNode<?> parent,
@NotNull Collection<AbstractTreeNode> children, @NotNull Collection<AbstractTreeNode<?>> children,
ViewSettings settings) { ViewSettings settings) {
ArrayList<AbstractTreeNode> nodes = new ArrayList<>(); ArrayList<AbstractTreeNode<?>> nodes = new ArrayList<>();
for (AbstractTreeNode child : children) { for (AbstractTreeNode<?> child : children) {
if (child instanceof PsiFileNode) { if (child instanceof PsiFileNode) {
VirtualFile file = ((PsiFileNode) child).getVirtualFile(); VirtualFile file = ((PsiFileNode) child).getVirtualFile();
if (file != null && !file.isDirectory() && !(file.getFileType() instanceof PlainTextFileType)) { if (file != null && !file.isDirectory() && !(file.getFileType() instanceof PlainTextFileType)) {
@ -32,7 +32,7 @@ public class TextOnlyTreeStructureProvider implements TreeStructureProvider {
@Nullable @Nullable
@Override @Override
public Object getData(@NotNull Collection<AbstractTreeNode> selected, @NotNull String dataId) { public Object getData(@NotNull Collection<AbstractTreeNode<?>> selected, @NotNull String dataId) {
return null; return null;
} }
} }