release v1.7.6

JetBrains · Feb 23, 2017 · 6f31b19 · 6f31b19
1 parent 10538c2
commit 6f31b19
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Change Log
 
+## [v1.7.6](https://github.com/hsz/idea-gitignore/tree/v1.7.6) (2017-02-23)
+
+[Full Changelog](https://github.com/hsz/idea-gitignore/compare/v1.7.5...v1.7.6)
+
+**Implemented enhancements:**
+
+- Preventing or Notification for editing ignored files [\#319](https://github.com/hsz/idea-gitignore/issues/319)
+- Present untrack git commands to the user in UntrackFilesDialog before execution
+
+**Fixed bugs:**
+
+- *NullPointerException on PhpStorm startup* [\#315](https://github.com/hsz/idea-gitignore/issues/315)
+- NoSuchMethodError: ContainerUtil.createConcurrentList() [\#320](https://github.com/hsz/idea-gitignore/issues/320)
+
 ## [v1.7.5](https://github.com/hsz/idea-gitignore/tree/v1.7.5) (2017-02-14)
 
 [Full Changelog](https://github.com/hsz/idea-gitignore/compare/v1.6...v1.7.5)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-.ignore v1.7.5
+.ignore v1.7.6
 ==================
 
 [![Gitter][badge-gitter-img]][badge-gitter] [![Build Status][badge-travis-img]][badge-travis] [![Donate][badge-paypal-img]][badge-paypal] [![Donate][badge-bitcoin-img]][badge-bitcoin]
@@ -106,33 +106,19 @@ Usage
 Changelog
 ---------
 
-## [v1.7.5](https://github.com/hsz/idea-gitignore/tree/v1.7.5) (2017-02-14)
+## [v1.7.6](https://github.com/hsz/idea-gitignore/tree/v1.7.6) (2017-02-23)
 
-[Full Changelog](https://github.com/hsz/idea-gitignore/compare/v1.6...v1.7.5)
+[Full Changelog](https://github.com/hsz/idea-gitignore/compare/v1.7.5...v1.7.6)
 
 **Implemented enhancements:**
 
-- *Hide ignored files and directories in the project tree view*
-- *Indicate that parent contains extra elements if children are hidden*
-- Dialog box that allows to untrack ignored files (performs git rm --cached command)
-- Untrack files dialog invoked automatically + from Project view context menu
-- Stylint (.stylintignore) support [\#279](https://github.com/hsz/idea-gitignore/issues/279)
-- Project Tree View coloring refactoring (performance)
+- Preventing or Notification for editing ignored files [\#319](https://github.com/hsz/idea-gitignore/issues/319)
+- Present untrack git commands to the user in UntrackFilesDialog before execution
 
 **Fixed bugs:**
 
-- *Fixed colors for tracked and ignored files, additional info label is implemented* [\#296](https://github.com/hsz/idea-gitignore/issues/296) [\#295](https://github.com/hsz/idea-gitignore/issues/295) [\#284](https://github.com/hsz/idea-gitignore/issues/284)
-- *IllegalArgumentException on IDEA startup* [\#302](https://github.com/hsz/idea-gitignore/issues/302)
-- File of UntrackFilesDialog.createDirectoryNodes must not be null [\#307](https://github.com/hsz/idea-gitignore/issues/307) [\#309](https://github.com/hsz/idea-gitignore/issues/309)
-- NoSuchFieldError: GRAYED_SMALL_ATTRIBUTES [\#305](https://github.com/hsz/idea-gitignore/issues/305)
-- Ignored entries coloring [\#304](https://github.com/hsz/idea-gitignore/issues/304) [\#301](https://github.com/hsz/idea-gitignore/issues/301)
-- ClassNotFoundException: mobi.hsz.idea.gitignore.FilesIndexCacheProjectComponent [\#297](https://github.com/hsz/idea-gitignore/issues/297)
-- Assertion failed: Registering post-startup activity that will never be run [\#290](https://github.com/hsz/idea-gitignore/issues/290)
-- Component name collision: UpdateComponent [\#289](https://github.com/hsz/idea-gitignore/issues/289)
-- Ignore Files Support pane scrollbar issue [\#286](https://github.com/hsz/idea-gitignore/issues/286)
-- Outer ignore file panel now has max height rule [\#257](https://github.com/hsz/idea-gitignore/issues/257)
-- Properly coloring of subdirectories [\#255](https://github.com/hsz/idea-gitignore/issues/255)
-- Setting "Enable ignoring" does not really work [\#298](https://github.com/hsz/idea-gitignore/issues/238)
+- *NullPointerException on PhpStorm startup* [\#315](https://github.com/hsz/idea-gitignore/issues/315)
+- NoSuchMethodError: ContainerUtil.createConcurrentList() [\#320](https://github.com/hsz/idea-gitignore/issues/320)
 
 [Full Changelog History](./CHANGELOG.md)
 

diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ runGenerators = true
 
 pluginGroup = mobi.hsz.idea
 pluginName = .ignore
-pluginVersion = 1.7.5
+pluginVersion = 1.7.6
 
 publishPluginId = 7495
 publishUsername = hsz

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>mobi.hsz.idea.gitignore</id>
     <name>.ignore</name>
-    <version>1.7.5</version>
+    <version>1.7.6</version>
     <vendor email="[email protected]" url="http://www.hsz.mobi">hsz</vendor>
 
     <description><![CDATA[
@@ -56,51 +56,23 @@
 
     <change-notes><![CDATA[
 
-        <a href="https://github.com/hsz/idea-gitignore/tree/v1.7.5"><b>v1.7.5</b></a> (2017-02-14) <br/><br/>
-        <a href="https://github.com/hsz/idea-gitignore/compare/v1.6...v1.7.5"><small>Full Changelog</small></a> <br/><br/>
+        <a href="https://github.com/hsz/idea-gitignore/tree/v1.7.6"><b>v1.7.6</b></a> (2017-02-23) <br/><br/>
+        <a href="https://github.com/hsz/idea-gitignore/compare/v1.7.5...v1.7.6"><small>Full Changelog</small></a> <br/><br/>
 
         <i>Implemented enhancements:</i>
 
         <ul>
-            <li><b>Hide ignored files and directories in the project tree view</b></li>
-            <li><b>Indicate that parent contains extra elements if children are hidden</b></li>
-            <li>Dialog box that allows to untrack ignored files (performs git rm --cached command)</li>
-            <li>Untrack files dialog invoked automatically + from Project view context menu</li>
-            <li>Stylint (.stylintignore) support (<a href="https://github.com/hsz/idea-gitignore/issues/279">279</a>)</li>
-            <li>Project Tree View coloring refactoring (performance)</li>
+            <li>Preventing or Notification for editing ignored files (<a href="https://github.com/hsz/idea-gitignore/issues/319">319</a>)</li>
+            <li>Present untrack git commands to the user in UntrackFilesDialog before execution</li>
         </ul>
 
         <i>Fixed bugs:</i>
 
         <ul>
-            <li><b>Fixed colors for tracked and ignored files, additional info label is implemented</b> (
-                <a href="https://github.com/hsz/idea-gitignore/issues/296">296</a>,
-                <a href="https://github.com/hsz/idea-gitignore/issues/295">295</a>,
-                <a href="https://github.com/hsz/idea-gitignore/issues/284">284</a>)</li>
-            <li><b>IllegalArgumentException on IDEA startup</b>
-                (<a href="https://github.com/hsz/idea-gitignore/issues/302">302</a>)</li>
-            <li>File of UntrackFilesDialog.createDirectoryNodes must not be null (
-                <a href="https://github.com/hsz/idea-gitignore/issues/307">307</a>,
-                <a href="https://github.com/hsz/idea-gitignore/issues/307">307</a>)</li>
-            <li>NoSuchFieldError: GRAYED_SMALL_ATTRIBUTES
-                (<a href="https://github.com/hsz/idea-gitignore/issues/305">305</a>)</li>
-            <li>Ignored entries coloring (
-                <a href="https://github.com/hsz/idea-gitignore/issues/304">304</a>,
-                <a href="https://github.com/hsz/idea-gitignore/issues/301">301</a>)</li>
-            <li>ClassNotFoundException: mobi.hsz.idea.gitignore.FilesIndexCacheProjectComponent
-                (<a href="https://github.com/hsz/idea-gitignore/issues/297">297</a>)</li>
-            <li>Assertion failed: Registering post-startup activity that will never be run
-                (<a href="https://github.com/hsz/idea-gitignore/issues/290">290</a>)</li>
-            <li>Component name collision: UpdateComponent
-                (<a href="https://github.com/hsz/idea-gitignore/issues/289">289</a>)</li>
-            <li>Ignore Files Support pane scrollbar issue
-                (<a href="https://github.com/hsz/idea-gitignore/issues/286">286</a>)</li>
-            <li>Outer ignore file panel now has max height rule
-                (<a href="https://github.com/hsz/idea-gitignore/issues/257">257</a>)</li>
-            <li>Properly coloring of subdirectories
-                (<a href="https://github.com/hsz/idea-gitignore/issues/255">255</a>)</li>
-            <li>Setting "Enable ignoring" does not really work
-                (<a href="https://github.com/hsz/idea-gitignore/issues/238">238</a>)</li>
+            <li><b>NullPointerException on PhpStorm startup</b>
+                (<a href="https://github.com/hsz/idea-gitignore/issues/315">315</a>)</li>
+            <li>NoSuchMethodError: ContainerUtil.createConcurrentList()
+                (<a href="https://github.com/hsz/idea-gitignore/issues/320">320</a>)</li>
         </ul>
 
         <a href="https://github.com/hsz/idea-gitignore/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>

diff --git a/resources/messages/IgnoreBundle.properties b/resources/messages/IgnoreBundle.properties
@@ -154,37 +154,12 @@ notification.untrack.content=<b>.ignore</b> plugin found some files that are tra
 notification.update.title=<b>.ignore</b> plugin updated to v{0}
 notification.update.content=<br/>\
 Features:<br/>\
-- <b>Hide ignored files and directories in the project tree view</b><br/>\
-- <b>Indicate that parent contains extra elements if children are hidden</b><br/>\
-- Dialog box that allows to untrack ignored files (performs git rm --cached command)<br/>\
-- Stylint (.stylintignore) support (<a href="https://github.com/hsz/idea-gitignore/issues/279">279</a>)<br/>\
-- Project Tree View coloring refactoring (performance)<br/>\
+- Preventing or Notification for editing ignored files (<a href="https://github.com/hsz/idea-gitignore/issues/319">319</a>)<br/>\
+- Present untrack git commands to the user in UntrackFilesDialog before execution<br/>\
 <br/>\
 Fixes:<br/>\
-- <b>Fixed colors for tracked and ignored files, additional info label is implemented</b> (\
-    <a href="https://github.com/hsz/idea-gitignore/issues/296">296</a>,\
-    <a href="https://github.com/hsz/idea-gitignore/issues/295">295</a>,\
-    <a href="https://github.com/hsz/idea-gitignore/issues/284">284</a>)<br/>\
-- <b>IllegalArgumentException on IDEA startup</b>\
-    (<a href="https://github.com/hsz/idea-gitignore/issues/302">302</a>)<br/>\
-- NoSuchFieldError: GRAYED_SMALL_ATTRIBUTES\
-    (<a href="https://github.com/hsz/idea-gitignore/issues/305">305</a>)<br/>\
-- File of UntrackFilesDialog.createDirectoryNodes must not be null (\
-    <a href="https://github.com/hsz/idea-gitignore/issues/307">307</a>,\
-    <a href="https://github.com/hsz/idea-gitignore/issues/309">309</a>)<br/>\
-- Ignored entries coloring (\
-    <a href="https://github.com/hsz/idea-gitignore/issues/304">304</a>,\
-    <a href="https://github.com/hsz/idea-gitignore/issues/301">301</a>)<br/>\
-- ClassNotFoundException: mobi.hsz.idea.gitignore.FilesIndexCacheProjectComponent\
-    (<a href="https://github.com/hsz/idea-gitignore/issues/297">297</a>)<br/>\
-- Assertion failed: Registering post-startup activity that will never be run\
-    (<a href="https://github.com/hsz/idea-gitignore/issues/290">290</a>)<br/>\
-- Component name collision: UpdateComponent (<a href="https://github.com/hsz/idea-gitignore/issues/289">289</a>)<br/>\
-- Ignore Files Support pane scrollbar issue (<a href="https://github.com/hsz/idea-gitignore/issues/286">286</a>)<br/>\
-- Outer ignore file panel now has max height rule (<a href="https://github.com/hsz/idea-gitignore/issues/257">257</a>)<br/>\
-- Properly coloring of subdirectories (<a href="https://github.com/hsz/idea-gitignore/issues/255">255</a>)<br/>\
-- Setting "Enable ignoring" does not really work (<a href="https://github.com/hsz/idea-gitignore/issues/238">238</a>)<br/>\
-- and others...<br/>\
+- <b>NullPointerException on PhpStorm startup</b> (<a href="https://github.com/hsz/idea-gitignore/issues/315">315</a>)<br/>\
+- NoSuchMethodError: ContainerUtil.createConcurrentList() (<a href="https://github.com/hsz/idea-gitignore/issues/320">320</a>)<br/>\
 <br/>\
 <span style="font-size: 120%">If you find my plugin helpful, donate me using <br/><b>\
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick\\&hosted_button_id=SJAU4XWQ584QL">PayPal</a> or \

diff --git a/src/mobi/hsz/idea/gitignore/settings/IgnoreSettings.java b/src/mobi/hsz/idea/gitignore/settings/IgnoreSettings.java
@@ -186,9 +186,6 @@ public Element getState() {
         element.addContent(languagesElement);
         element.addContent(createTemplatesElement(userTemplates));
 
-        // settings fix for 1.1 - can be removed with further releases
-        element.setAttribute("settingsFixed", "true");
-
         return element;
     }
 
@@ -283,13 +280,9 @@ public void loadState(Element element) {
         userTemplates.clear();
         userTemplates.addAll(loadTemplates(element));
 
-        // settings fix for 1.1 - can be removed with further releases
-        value = element.getAttributeValue("settingsFixed");
-        if (value == null) {
-            for (IgnoreLanguage language : IgnoreBundle.LANGUAGES) {
-                if (!language.isVCS()) {
-                    languagesSettings.get(language).put(IgnoreLanguagesSettings.KEY.ENABLE, false);
-                }
+        for (IgnoreLanguage language : IgnoreBundle.LANGUAGES) {
+            if (!language.isVCS()) {
+                languagesSettings.get(language).put(IgnoreLanguagesSettings.KEY.ENABLE, false);
             }
         }
     }