Skip to content

Commit 95e8e9c

Browse files
authored
Merge branch 'develop' into qianjin-popup-runconfig-icon
2 parents 105c05b + 174d494 commit 95e8e9c

File tree

151 files changed

+2366
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+2366
-963
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
plugins {
2+
id 'java'
3+
id "org.jetbrains.intellij"
4+
}
5+
6+
group 'com.microsoft.azuretools'
7+
8+
intellij {
9+
version = intellij_version
10+
downloadSources = Boolean.valueOf(true)
11+
}
12+
13+
repositories {
14+
mavenLocal()
15+
mavenCentral()
16+
}
17+
18+
dependencies {
19+
// https://mvnrepository.com/artifact/org.projectlombok/lombok
20+
compileOnly 'org.projectlombok:lombok:1.18.8'
21+
annotationProcessor 'org.projectlombok:lombok:1.18.8'
22+
23+
implementation "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
24+
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureFormInputComponent.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureFormInputComponent.java

File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*/
5+
6+
package com.microsoft.azure.toolkit.intellij.common;
7+
8+
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
9+
import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
10+
import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
11+
12+
import java.util.Collections;
13+
import java.util.List;
14+
15+
public interface AzureFormPanel<T> extends AzureForm<T> {
16+
default void setVisible(boolean visible) {
17+
// do nothing
18+
}
19+
20+
@Override
21+
default T getData() {
22+
throw new AzureToolkitRuntimeException("method not implemeted");
23+
}
24+
25+
@Override
26+
default List<AzureFormInput<?>> getInputs() {
27+
return Collections.emptyList();
28+
}
29+
30+
// CHECKSTYLE IGNORE check FOR NEXT 1 LINES
31+
default void $$$setupUI$$$() {
32+
}
33+
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/SwingUtils.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/SwingUtils.java

File renamed without changes.

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/TextDocumentListenerAdapter.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/TextDocumentListenerAdapter.java

File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*/
5+
6+
package com.microsoft.azure.toolkit.intellij.common.preload;
7+
8+
import com.intellij.openapi.application.ApplicationManager;
9+
import com.intellij.openapi.application.PreloadingActivity;
10+
import com.intellij.openapi.progress.ProgressIndicator;
11+
import com.microsoft.azure.toolkit.lib.common.cache.Preloader;
12+
import lombok.extern.java.Log;
13+
14+
@Log
15+
public class AzurePreloadingActivity extends PreloadingActivity {
16+
17+
@Override
18+
public void preload(@org.jetbrains.annotations.NotNull final ProgressIndicator indicator) {
19+
// Using progress manager as azure task manager is not initialized
20+
ApplicationManager.getApplication().executeOnPooledThread(Preloader::load);
21+
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<idea-plugin>
2+
<extensionPoints>
3+
</extensionPoints>
4+
<extensions defaultExtensionNs="com.intellij">
5+
<preloadingActivity implementation="com.microsoft.azure.toolkit.intellij.common.preload.AzurePreloadingActivity"/>
6+
</extensions>
7+
<actions>
8+
</actions>
9+
</idea-plugin>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
plugins {
2+
id 'java'
3+
id "org.jetbrains.intellij"
4+
id "io.freefair.aspectj.post-compile-weaving"
5+
}
6+
7+
group 'com.microsoft.azuretools'
8+
9+
intellij {
10+
version = intellij_version
11+
downloadSources = Boolean.valueOf(true)
12+
plugins = ['java', 'maven', 'gradle']
13+
}
14+
15+
repositories {
16+
mavenLocal()
17+
mavenCentral()
18+
}
19+
20+
dependencies {
21+
// https://mvnrepository.com/artifact/org.projectlombok/lombok
22+
compileOnly 'org.projectlombok:lombok:1.18.8'
23+
annotationProcessor 'org.projectlombok:lombok:1.18.8'
24+
25+
compileOnly 'org.jetbrains:annotations:20.1.0'
26+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2', {
27+
exclude group: "com.fasterxml.jackson", module: "jackson-bom"
28+
}
29+
30+
compile project(':azure-intellij-plugin-lib')
31+
compile "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
32+
33+
aspect "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
34+
}

0 commit comments

Comments
 (0)