Make plugin to work with Intellij 2017 and 2018

RESTClient-idea-plugin.iml

@@ -6,19 +6,10 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA IU-99.32" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/restclient-ui-2.3.3-jar-with-dependencies.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" exported="" name="restclient-ui-2.3.3-jar-with-dependencies" level="project" />
   </component>
-</module>
-
+</module>

src/main/java/com/sourcestream/plugin/idea/restclient/EditMenuAction.java

@@ -23,16 +23,18 @@
  */
 package com.sourcestream.plugin.idea.restclient;
 
-import com.intellij.openapi.actionSystem.DataKeys;
-import org.wiztools.restclient.ui.IdeaPlugin;
+import java.awt.event.ActionEvent;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
+
+import org.wiztools.restclient.ui.IdeaPlugin;
+
+import com.intellij.openapi.actionSystem.DataKeys;
 
 /**
  * Handles the edit menu action by displaying a popup menu of edit choices and processing the user's selection.
  */
-public class EditMenuAction extends BaseMenuAction
+public class EditMenuAction extends com.sourcestream.plugin.idea.restclient.BaseMenuAction
 {
     private static final int VERTICAL_LOCATION = 25;
 

src/main/java/com/sourcestream/plugin/idea/restclient/FileMenuAction.java

@@ -23,16 +23,18 @@
  */
 package com.sourcestream.plugin.idea.restclient;
 
-import com.intellij.openapi.actionSystem.DataKeys;
-import org.wiztools.restclient.ui.IdeaPlugin;
+import java.awt.event.ActionEvent;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
+
+import org.wiztools.restclient.ui.IdeaPlugin;
+
+import com.intellij.openapi.actionSystem.DataKeys;
 
 /**
  * Handles the file menu action by displaying a popup menu of file choices and processing the user's selection.
  */
-public class FileMenuAction extends BaseMenuAction
+public class FileMenuAction extends com.sourcestream.plugin.idea.restclient.BaseMenuAction
 {
     private static final int VERTICAL_LOCATION = 0;
 

src/main/java/com/sourcestream/plugin/idea/restclient/HelpMenuAction.java

@@ -23,16 +23,18 @@
  */
 package com.sourcestream.plugin.idea.restclient;
 
-import com.intellij.openapi.actionSystem.DataKeys;
-import org.wiztools.restclient.ui.IdeaPlugin;
+import java.awt.event.ActionEvent;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
+
+import org.wiztools.restclient.ui.IdeaPlugin;
+
+import com.intellij.openapi.actionSystem.DataKeys;
 
 /**
  * Handles the tools menu action by displaying a popup menu of edit choices and processing the user's selection.
  */
-public class HelpMenuAction extends BaseMenuAction
+public class HelpMenuAction extends com.sourcestream.plugin.idea.restclient.BaseMenuAction
 {
     private static final int VERTICAL_LOCATION = 75;
 

src/main/java/com/sourcestream/plugin/idea/restclient/IdeaPluginBase.java

@@ -23,6 +23,12 @@
  */
 package com.sourcestream.plugin.idea.restclient;
 
+import java.awt.*;
+
+import javax.swing.*;
+
+import org.jetbrains.annotations.NotNull;
+
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.components.ProjectComponent;
@@ -31,13 +37,9 @@
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
-import com.intellij.peer.PeerFactory;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.*;
+import com.intellij.ui.content.ContentFactoryImpl;
 
 /**
  * Base class for the RESTClient IDEA plugin. This class implements the functions that do not require direct access to
@@ -105,7 +107,7 @@ public void projectOpened()
         ToolWindow toolWindow = toolWindowManager.registerToolWindow(TOOL_WINDOW_ID, false, ToolWindowAnchor.BOTTOM);
 
         pluginPanel = createPluginPanel();
-        ContentFactory contentFactory = PeerFactory.getInstance().getContentFactory();
+        ContentFactory contentFactory = ContentFactoryImpl.SERVICE.getInstance();
         Content content = contentFactory.createContent(pluginPanel, "", false);
 
         toolWindow.getContentManager().addContent(content);

src/main/java/com/sourcestream/plugin/idea/restclient/ToolsMenuAction.java

@@ -23,17 +23,19 @@
  */
 package com.sourcestream.plugin.idea.restclient;
 
-import com.intellij.openapi.actionSystem.DataKeys;
+import java.awt.event.ActionEvent;
+
+import javax.swing.*;
+
 import org.wiztools.restclient.server.TraceServer;
 import org.wiztools.restclient.ui.IdeaPlugin;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
+import com.intellij.openapi.actionSystem.DataKeys;
 
 /**
  * Handles the tools menu action by displaying a popup menu of edit choices and processing the user's selection.
  */
-public class ToolsMenuAction extends BaseMenuAction
+public class ToolsMenuAction extends com.sourcestream.plugin.idea.restclient.BaseMenuAction
 {
     private static final int VERTICAL_LOCATION = 50;
 

src/main/resources/META-INF/plugin.xml

@@ -8,7 +8,7 @@
         request/response tracing, test scripts, and Base64 password encoding/decoding.
         ]]>
     </description>
-    <version>1.1</version>
+    <version>1.2.1</version>
     <category>Network</category>
     <vendor url="http://www.sourcestream.com" email="drcallaway@gmail.com" logo="icons/logo.png">Dustin R. Callaway</vendor>
     <idea-version since-build="8000" until-build=""/>
@@ -40,10 +40,9 @@
     </actions>
     <change-notes>
         <![CDATA[
-            <p>Version 1.0
-            <ul><li>Initial Release</li></ul></p>
-            <p>Version 1.1
-            <ul><li>Updated to work with IntelliJ IDEA 11.0</li></p>
+            <p>Version 1.0<ul><li>Initial Release</li></ul></p>
+            <p>Version 1.1<ul><li>Updated to work with IntelliJ IDEA 11.0</li></ul></p>
+            <p>Version 1.2.1<ul><li>Updated to work with IntelliJ IDEA 2017/2018</li></ul></p>
             ]]>
     </change-notes>
 </idea-plugin>