diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..6d799a0
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
new file mode 100644
index 0000000..4e638cd
--- /dev/null
+++ b/.idea/dbnavigator.xml
@@ -0,0 +1,454 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/restclient_ui_2_3_3_jar_with_dependencies.xml b/.idea/libraries/restclient_ui_2_3_3_jar_with_dependencies.xml
new file mode 100644
index 0000000..29b5b6f
--- /dev/null
+++ b/.idea/libraries/restclient_ui_2_3_3_jar_with_dependencies.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d1ab054
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e2bf51d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
deleted file mode 100644
index 66c5b05..0000000
--- a/META-INF/plugin.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
- RESTClient
- RESTClient
-
-
-
- 1.1
- Network
- Dustin R. Callaway
-
-
-
- org.wiztools.restclient.ui.IdeaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
- Version 1.0
-
- Version 1.1
-
- Updated to work with IntelliJ IDEA 11.0
- ]]>
-
-
\ No newline at end of file
diff --git a/RESTClient-idea-plugin.iml b/RESTClient-idea-plugin.iml
index a3ce966..9386175 100644
--- a/RESTClient-idea-plugin.iml
+++ b/RESTClient-idea-plugin.iml
@@ -6,19 +6,10 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
+
-
-
+
\ No newline at end of file
diff --git a/src/main/java/com/sourcestream/plugin/idea/restclient/EditMenuAction.java b/src/main/java/com/sourcestream/plugin/idea/restclient/EditMenuAction.java
index ba395de..7630838 100644
--- a/src/main/java/com/sourcestream/plugin/idea/restclient/EditMenuAction.java
+++ b/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;
diff --git a/src/main/java/com/sourcestream/plugin/idea/restclient/FileMenuAction.java b/src/main/java/com/sourcestream/plugin/idea/restclient/FileMenuAction.java
index 82e983e..b6755a8 100644
--- a/src/main/java/com/sourcestream/plugin/idea/restclient/FileMenuAction.java
+++ b/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;
diff --git a/src/main/java/com/sourcestream/plugin/idea/restclient/HelpMenuAction.java b/src/main/java/com/sourcestream/plugin/idea/restclient/HelpMenuAction.java
index bf1acdd..a848ba7 100644
--- a/src/main/java/com/sourcestream/plugin/idea/restclient/HelpMenuAction.java
+++ b/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;
diff --git a/src/main/java/com/sourcestream/plugin/idea/restclient/IdeaPluginBase.java b/src/main/java/com/sourcestream/plugin/idea/restclient/IdeaPluginBase.java
index 0ad09b5..013ee79 100644
--- a/src/main/java/com/sourcestream/plugin/idea/restclient/IdeaPluginBase.java
+++ b/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);
diff --git a/src/main/java/com/sourcestream/plugin/idea/restclient/ToolsMenuAction.java b/src/main/java/com/sourcestream/plugin/idea/restclient/ToolsMenuAction.java
index 87fb4ae..1fc4221 100644
--- a/src/main/java/com/sourcestream/plugin/idea/restclient/ToolsMenuAction.java
+++ b/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;
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 66c5b05..8276bcf 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -8,7 +8,7 @@
request/response tracing, test scripts, and Base64 password encoding/decoding.
]]>
- 1.1
+ 1.2.1
Network
Dustin R. Callaway
@@ -40,10 +40,9 @@
Version 1.0
-
- Version 1.1
-
- Updated to work with IntelliJ IDEA 11.0
+ Version 1.0
+ Version 1.1
- Updated to work with IntelliJ IDEA 11.0
+ Version 1.2.1
- Updated to work with IntelliJ IDEA 2017/2018
]]>
\ No newline at end of file