Merge pull request #114 from ShyykoSerhiy/dev

Release v0.1.11
ShyykoSerhiy · Sep 7, 2016 · 5c8cdd3 · 5c8cdd3
2 parents cd25262 + 2461253
commit 5c8cdd3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsConfigurable.java b/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsConfigurable.java
@@ -4,6 +4,7 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
+import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -96,6 +97,7 @@ public void run() {
 
     @Override
     public void disposeUIResources() {
+        Disposer.dispose(this.gfmGlobalSettingsPanel);
         this.gfmGlobalSettingsPanel = null;
     }
 }
diff --git a/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsPanel.java b/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsPanel.java
@@ -4,13 +4,15 @@
 import com.github.shyykoserhiy.gfm.editor.RenderingEngine;
 import com.github.shyykoserhiy.gfm.markdown.offline.JnaMarkdownParser;
 import com.github.shyykoserhiy.gfm.ui.Utils;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.impl.EditorImpl;
 
 import javax.swing.*;
 import java.awt.*;
 
 @SuppressWarnings("unused")
-public class GfmGlobalSettingsPanel {
+public class GfmGlobalSettingsPanel implements Disposable {
     private JPasswordField githubAccessTokenField;
     private JLabel githubAccessTokenLabel;
     private JLabel connectionTimeoutLabel;
@@ -86,4 +88,15 @@ private void createUIComponents() {
         this.additionalCssTextArea = Utils.createEditor("css");
         this.additionalCssPanel.add(this.additionalCssTextArea.getComponent(), "Center");
     }
+
+    @Override
+    public void dispose() {
+        if (this.additionalCssTextArea instanceof EditorImpl) {
+            EditorImpl editor = (EditorImpl) additionalCssTextArea;
+            if (!editor.isDisposed()) {//!isReleased
+                //for some reason Editor is not Disposable. release in this case is dispose.
+                editor.release();
+            }
+        }
+    }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.github.shyykoserhiy.gfm</id>
     <name>gfm</name>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
     <vendor email="[email protected]" url="https://github.com/shyykoserhiy/gfm-plugin">Shyyko Serhiy</vendor>
 
     <description><![CDATA[
@@ -19,6 +19,12 @@
 
     <change-notes><![CDATA[
         <p>
+        <b>0.1.11</b>
+        <ul>
+            <li>
+                Fixed <a href="https://github.com/ShyykoSerhiy/gfm-plugin/issues/113">Editor of class com.intellij.openapi.editor.impl.EditorImpl hasn't been released</a>
+            </li>
+        </ul>
         <b>0.1.10</b>
         <ul>
             <li>