Merge pull request #88 from wangtaicheng/dev

: fix #86 #87

Author: ishchenko

build.gradle

@@ -1,24 +1,30 @@
 import org.ajoberstar.grgit.Grgit
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.1"
-    id "org.ajoberstar.grgit" version "3.1.1"
+    id "org.jetbrains.intellij" version "1.3.0"
+    id "org.ajoberstar.grgit" version "4.1.1"
     id "java"
     id "idea"
 }
 
 group 'net.ishchenko.idea.nginx'
-version '0.1.9'
+version '0.1.11'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
+    mavenLocal()
     mavenCentral()
+
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+//    implementation 'com.jgoodies:forms:1.2.1'
+    implementation 'com.jgoodies:jgoodies-common:1.8.1'
+    implementation 'com.jgoodies:jgoodies-forms:1.9.0'
+//    implementation 'com.jgoodies:jgoodiesforms:1.5.1'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
 
 sourceSets {
@@ -32,14 +38,17 @@ sourceSets {
 }
 
 intellij {
-    version '2019.2' //IntelliJ IDEA dependency
-    updateSinceUntilBuild false
-    pluginName 'idea-nginx-support'
+    version = '2021.3' //IntelliJ IDEA dependency
+    type = 'IU'
+    updateSinceUntilBuild = false
+    pluginName = 'idea-nginx-support'
+//    localPath = 'D:\\Program\\JetBrains\\ideaIU-2021.3.win'
+//    localPath = 'D:\\Program\\JetBrains\\WebStorm-2021.2.3.win'
 
-    publishPlugin {
-        username project.hasProperty('user') ? user : ''
-        password project.hasProperty('pass') ? pass : ''
-    }
+//    publishPlugin {
+//        username project.hasProperty('user') ? user : ''
+//        password project.hasProperty('pass') ? pass : ''
+//    }
 }
 
 task generateDocumentation(type: JavaExec) {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip

nginx.conf

@@ -1,4 +1,4 @@
-<idea-plugin url="https://github.com/ishchenko/idea-nginx">
+<idea-plugin url="https://github.com/ishchenko/idea-nginx"  require-restart="true">
 
   <id>ideanginx9</id>
   <name>nginx Support</name>

resources/META-INF/plugin.xml

@@ -21,11 +21,12 @@
 import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.util.IconLoader;
-import javax.swing.*;
 import net.ishchenko.idea.nginx.NginxBundle;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 /**
  * Created by IntelliJ IDEA.
  * User: Max
@@ -37,8 +38,9 @@ public class NginxConfigurationManager extends BaseConfigurable implements BaseC
     private NginxServersConfiguration configuration;
     private NginxConfigurationPanel panel;
 
-    public NginxConfigurationManager(NginxServersConfiguration configuration) {
-        this.configuration = configuration;
+    public NginxConfigurationManager() {
+
+        this.configuration = NginxServersConfiguration.getInstance();
     }
 
     public NginxServersConfiguration getConfiguration() {
@@ -66,10 +68,12 @@ public void initComponent() {
     }
 
     @Nls
+    @Override
     public String getDisplayName() {
         return NginxBundle.message("config.title");
     }
 
+    @Override
     public String getHelpTopic() {
         return null;
     }
@@ -100,9 +104,9 @@ public JComponent createComponent() {
         }
         return panel.getPanel();
     }
-
+    @Override
     public void disposeUIResources() {
         panel = null;
     }
 
-}
+}

src/net/ishchenko/idea/nginx/configurator/NginxConfigurationManager.java

@@ -36,25 +36,31 @@ public class NginxConfigurationType implements ConfigurationType {
 
     NginxConfigurationFactory ncf = new NginxConfigurationFactory(this);
 
+    @NotNull
+    @Override
     public String getDisplayName() {
         return NginxBundle.message("cofigurationtype.displayname");
     }
 
+    @Override
     public String getConfigurationTypeDescription() {
         return NginxBundle.message("configurationtype.description");
     }
 
+    @Override
     public Icon getIcon() {
         return IconLoader.getIcon("/nginx.png");
     }
 
+    @Override
     @NotNull
     public String getId() {
         return "nginx.configuration.type";
     }
 
+    @Override
     public ConfigurationFactory[] getConfigurationFactories() {
-        return new ConfigurationFactory[]{ncf};
+        return new ConfigurationFactory[] {this.ncf};
     }
 
     private static class NginxConfigurationFactory extends ConfigurationFactory {
@@ -63,10 +69,14 @@ protected NginxConfigurationFactory(@NotNull ConfigurationType type) {
             super(type);
         }
 
+
+        @Override
         public RunConfiguration createTemplateConfiguration(Project project) {
             return new NginxRunConfiguration(project, this, NginxBundle.message("cofigurationtype.displayname"));
         }
-        
+
+
+        @NotNull
         @Override
         public String getId() {
             return "net.ishchenko.idea.nginx.run";