fix custom use aliases do not work after restarting the IDE #54

Haehnchen · Apr 11, 2016 · 96799a8 · 96799a8
1 parent 95314f0
commit 96799a8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2" url="https://github.com/Haehnchen/idea-php-annotation-plugin">
   <id>de.espend.idea.php.annotation</id>
   <name>PHP Annotations</name>
-  <version>3.0</version>
+  <version>3.0.1</version>
   <vendor email="daniel@espendiller.net" url="http://www.espend.de">Daniel Espendiller</vendor>
 
   <description><![CDATA[
@@ -45,6 +45,11 @@
 2.x: PhpStorm9, 10<br>
 1.x: PhpStorm8<br>
 
+<h2>3.0.1</h2>
+<ul>
+    <li>Custom use aliases do not work after restarting the IDE <a href="https://github.com/Haehnchen/idea-php-annotation-plugin/issues/54">#54</a></li>
+</ul>
+
 <h2>3.0</h2>
 <ul>
     <li>Change minimal api level to PhpStorm 2016.1</li>

diff --git a/src/de/espend/idea/php/annotation/ApplicationSettings.java b/src/de/espend/idea/php/annotation/ApplicationSettings.java
@@ -4,16 +4,12 @@
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.util.containers.HashMap;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import de.espend.idea.php.annotation.dict.UseAliasOption;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
@@ -23,7 +19,12 @@ public class ApplicationSettings implements PersistentStateComponent<Application
 
     public boolean appendRoundBracket = true;
 
-    public List<UseAliasOption> useAliasOptions = null;
+    public List<UseAliasOption> useAliasOptions = new ArrayList<UseAliasOption>();
+
+    /**
+     * First user change, so that can provide defaults
+     */
+    public boolean provideDefaults = true;
 
     @Nullable
     @Override
@@ -54,7 +55,7 @@ public static Collection<UseAliasOption> getDefaultUseAliasOption() {
 
     @NotNull
     public static Collection<UseAliasOption> getUseAliasOptionsWithDefaultFallback() {
-        if(getInstance().useAliasOptions == null) {
+        if(getInstance().provideDefaults && getInstance().useAliasOptions.size() == 0) {
             return getDefaultUseAliasOption();
         }
 

diff --git a/src/de/espend/idea/php/annotation/ui/UseAliasListForm.java b/src/de/espend/idea/php/annotation/ui/UseAliasListForm.java
@@ -51,6 +51,12 @@ public void actionPerformed(ActionEvent e) {
                 tableView.getTableViewModel().fireTableDataChanged();
                 changed = true;
                 resetList();
+                try {
+                    apply();
+                    ApplicationSettings.getInstance().provideDefaults = false;
+                    JOptionPane.showMessageDialog(panel, "Default alias applied");
+                } catch (ConfigurationException ignored) {
+                }
             }
         });
 
@@ -159,6 +165,7 @@ public void apply() throws ConfigurationException {
         }
 
         ApplicationSettings.getInstance().useAliasOptions = options;
+        ApplicationSettings.getInstance().provideDefaults = false;
         this.changed = false;
     }