Merge pull request #86 from ShyykoSerhiy/dev

Dev
ShyykoSerhiy · Sep 24, 2015 · 357d776 · 357d776
2 parents 0bef263 + b2ac631
commit 357d776
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 40 deletions.
diff --git a/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserFx.java b/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserFx.java
@@ -14,6 +14,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
+import java.util.concurrent.*;
 
 public class BrowserFx implements IsBrowser {
     private final JPanel jPanel;
@@ -153,6 +154,27 @@ public String getUrl() {
         return webView.getEngine().getLocation();
     }
 
+    @Override
+    public String getHtml() {
+        FutureTask<String> futureTask = new FutureTask<String>(new Callable<String>() {
+            @Override
+            public String call() throws Exception {
+                return (String) webView.getEngine().executeScript("document.documentElement.outerHTML");
+            }
+        });
+        String result = "";
+        try {
+            result = futureTask.get(1000, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        } catch (TimeoutException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
     @Override
     public boolean canGoForward() {
         WebHistory history = webView.getEngine().getHistory();

diff --git a/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java b/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserJx.java
@@ -135,6 +135,11 @@ public String getUrl() {
         return webView.getBrowser().getURL();
     }
 
+    @Override
+    public String getHtml() {
+        return webView.getBrowser().getHTML();
+    }
+
     @Override
     public boolean canGoForward() {
         return webView.getBrowser().canGoForward();

diff --git a/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserLobo.java b/src/main/java/com/github/shyykoserhiy/gfm/browser/BrowserLobo.java
@@ -82,6 +82,11 @@ public String getUrl() {
         return null;//todo throw unsupported exception?
     }
 
+    @Override
+    public String getHtml() {
+        return webView.getSourceCode();
+    }
+
     @Override
     public boolean canGoForward() {
         return false;//todo throw unsupported exception?

diff --git a/src/main/java/com/github/shyykoserhiy/gfm/browser/IsBrowser.java b/src/main/java/com/github/shyykoserhiy/gfm/browser/IsBrowser.java
@@ -30,6 +30,8 @@ public interface IsBrowser extends Disposable {
 
     String getUrl();
 
+    String getHtml();
+
     boolean canGoForward();
 
     boolean canGoBack();

diff --git a/src/main/java/com/github/shyykoserhiy/gfm/editor/AbstractGfmPreview.java b/src/main/java/com/github/shyykoserhiy/gfm/editor/AbstractGfmPreview.java
@@ -7,10 +7,13 @@
 import com.github.shyykoserhiy.gfm.markdown.offline.JnaMarkdownParser;
 import com.github.shyykoserhiy.gfm.settings.GfmGlobalSettings;
 import com.github.shyykoserhiy.gfm.settings.GfmGlobalSettingsChangedListener;
+import com.github.shyykoserhiy.gfm.ui.Utils;
 import com.intellij.codeHighlighting.BackgroundEditorHighlighter;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.fileEditor.FileEditor;
@@ -24,6 +27,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeListener;
@@ -39,6 +44,8 @@ public abstract class AbstractGfmPreview extends UserDataHolderBase implements D
     protected final GfmGlobalSettings settings;
     protected IsBrowser browser;
 
+    private PopClickListener popClickListener;
+
     public AbstractGfmPreview(@NotNull VirtualFile markdownFile, @NotNull Document document) {
         this.markdownFile = markdownFile;
         this.document = document;
@@ -128,6 +135,9 @@ public StructureViewBuilder getStructureViewBuilder() {
     public void dispose() {
         Disposer.dispose(this);
         browser.dispose();
+        if (popClickListener != null) {
+            getComponent().removeMouseListener(popClickListener);
+        }
     }
 
     /**
@@ -145,7 +155,8 @@ public boolean isPreviewIsSelected() {
     protected abstract GfmRequestDoneListener getRequestDoneListener();
 
     protected void addPopupListener() {
-        getComponent().addMouseListener(new PopClickListener());
+        popClickListener = new PopClickListener();
+        getComponent().addMouseListener(popClickListener);
     }
 
     private void updateMarkdownParser(GfmGlobalSettings gfmGlobalSettings) {
@@ -200,6 +211,31 @@ class PopUpDemo extends JPopupMenu {
 
         public PopUpDemo() {
             anItem = new JMenuItem("Get HTML");
+            anItem.addActionListener(new AbstractAction() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    final String html = browser.getHtml();
+                    Window window = SwingUtilities.getWindowAncestor(AbstractGfmPreview.this.getComponent());
+                    JDialog dialog = new JDialog(window);
+                    dialog.setModal(true);
+                    final Editor editor = Utils.createEditor("html");
+                    dialog.setContentPane(editor.getComponent());
+                    dialog.setSize(700, 500);
+                    dialog.setLocationRelativeTo(null);
+                    ApplicationManager.getApplication().invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            ApplicationManager.getApplication().runWriteAction(new Runnable() {
+                                @Override
+                                public void run() {
+                                    editor.getDocument().setText(html);
+                                }
+                            });
+                        }
+                    });
+                    dialog.setVisible(true);
+                }
+            });
             add(anItem);
         }
     }

diff --git a/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsPanel.java b/src/main/java/com/github/shyykoserhiy/gfm/settings/GfmGlobalSettingsPanel.java
@@ -3,17 +3,8 @@
 import com.github.shyykoserhiy.gfm.GfmBundle;
 import com.github.shyykoserhiy.gfm.editor.RenderingEngine;
 import com.github.shyykoserhiy.gfm.markdown.offline.JnaMarkdownParser;
-import com.intellij.ide.highlighter.HighlighterFactory;
-import com.intellij.openapi.editor.Document;
+import com.github.shyykoserhiy.gfm.ui.Utils;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.editor.EditorSettings;
-import com.intellij.openapi.editor.colors.EditorColorsManager;
-import com.intellij.openapi.editor.ex.EditorEx;
-import com.intellij.openapi.editor.highlighter.EditorHighlighter;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.fileTypes.UnknownFileType;
 
 import javax.swing.*;
 import java.awt.*;
@@ -92,35 +83,7 @@ private void createUIComponents() {
         connectionTimeoutSpinner = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 100));
         socketTimeoutSpinner = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 100));
         additionalCssPanel = new JPanel(new BorderLayout());
-        this.additionalCssTextArea = createEditor();
+        this.additionalCssTextArea = Utils.createEditor("css");
         this.additionalCssPanel.add(this.additionalCssTextArea.getComponent(), "Center");
     }
-
-    private static Editor createEditor() {
-        EditorFactory editorFactory = EditorFactory.getInstance();
-        Document editorDocument = editorFactory.createDocument("");
-        EditorEx editor = (EditorEx) editorFactory.createEditor(editorDocument);
-        fillEditorSettings(editor.getSettings());
-        setHighlighting(editor);
-        return editor;
-    }
-
-    private static void setHighlighting(EditorEx editor) {
-        FileType cssFileType = FileTypeManager.getInstance().getFileTypeByExtension("css");
-        if (cssFileType != UnknownFileType.INSTANCE) {
-            EditorHighlighter editorHighlighter = HighlighterFactory.createHighlighter(cssFileType, EditorColorsManager.getInstance().getGlobalScheme(), null);
-            editor.setHighlighter(editorHighlighter);
-        }
-    }
-
-    private static void fillEditorSettings(EditorSettings editorSettings) {
-        editorSettings.setWhitespacesShown(false);
-        editorSettings.setLineMarkerAreaShown(false);
-        editorSettings.setIndentGuidesShown(false);
-        editorSettings.setLineNumbersShown(true);
-        editorSettings.setFoldingOutlineShown(false);
-        editorSettings.setAdditionalColumnsCount(1);
-        editorSettings.setAdditionalLinesCount(1);
-        editorSettings.setUseSoftWraps(false);
-    }
 }
diff --git a/src/main/java/com/github/shyykoserhiy/gfm/ui/Utils.java b/src/main/java/com/github/shyykoserhiy/gfm/ui/Utils.java
@@ -0,0 +1,43 @@
+package com.github.shyykoserhiy.gfm.ui;
+
+import com.intellij.ide.highlighter.HighlighterFactory;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.EditorSettings;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.editor.highlighter.EditorHighlighter;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.fileTypes.UnknownFileType;
+
+public class Utils {
+    public static Editor createEditor(String fileExtension) {
+        EditorFactory editorFactory = EditorFactory.getInstance();
+        Document editorDocument = editorFactory.createDocument("");
+        EditorEx editor = (EditorEx) editorFactory.createEditor(editorDocument);
+        fillEditorSettings(editor.getSettings());
+        setHighlighting(editor, fileExtension);
+        return editor;
+    }
+
+    private static void setHighlighting(EditorEx editor, String fileExtension) {
+        FileType cssFileType = FileTypeManager.getInstance().getFileTypeByExtension(fileExtension);
+        if (cssFileType != UnknownFileType.INSTANCE) {
+            EditorHighlighter editorHighlighter = HighlighterFactory.createHighlighter(cssFileType, EditorColorsManager.getInstance().getGlobalScheme(), null);
+            editor.setHighlighter(editorHighlighter);
+        }
+    }
+
+    private static void fillEditorSettings(EditorSettings editorSettings) {
+        editorSettings.setWhitespacesShown(false);
+        editorSettings.setLineMarkerAreaShown(false);
+        editorSettings.setIndentGuidesShown(false);
+        editorSettings.setLineNumbersShown(true);
+        editorSettings.setFoldingOutlineShown(false);
+        editorSettings.setAdditionalColumnsCount(1);
+        editorSettings.setAdditionalLinesCount(1);
+        editorSettings.setUseSoftWraps(false);
+    }
+}