Feat: Added support for multiple IDE's open

olivernybroe · Apr 12, 2018 · b12805b · b12805b
1 parent a70b89d
commit b12805b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ targetCompatibility = JavaVersion.VERSION_1_8
 
 intellij {
     pluginName 'intellij-touch'
-    version 2018.1
+    version 2018.2
     updateSinceUntilBuild false
 }
 
@@ -23,7 +23,7 @@ publishPlugin {
 
 group 'dk.lost_world'
 
-version 0.22
+version 0.3
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/dk/lost_world/intellij_touch/Components/TouchBarBuilder.java b/src/main/java/dk/lost_world/intellij_touch/Components/TouchBarBuilder.java
@@ -31,8 +31,4 @@ public static TouchBarBuilder fromAction(ActionGroup actionGroup) {
     public void apply(TouchBar touchBar) {
         components.forEach(componentBuilder -> componentBuilder.touchBar(touchBar).add());
     }
-
-    public void apply() {
-        this.apply(TouchBar.getInstance());
-    }
 }
diff --git a/src/main/java/dk/lost_world/intellij_touch/TouchBar.java b/src/main/java/dk/lost_world/intellij_touch/TouchBar.java
@@ -1,6 +1,7 @@
 package dk.lost_world.intellij_touch;
 
 import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.WindowManager;
 import com.thizzer.jtouchbar.JTouchBar;
 import com.thizzer.jtouchbar.common.Color;
@@ -16,20 +17,23 @@ public class TouchBar {
 
     protected JTouchBar jTouchBar;
 
-    public static TouchBar getInstance() {
-        return ServiceManager.getService(TouchBar.class);
+    protected Project project;
+
+    public static TouchBar getInstance(Project project) {
+        return ServiceManager.getService(project, TouchBar.class);
     }
 
-    public TouchBar() {
+    public TouchBar(Project project) {
+        this.project = project;
         IconFontSwing.register(FontAwesome.getIconFont());
 
         jTouchBar = new JTouchBar();
         jTouchBar.setCustomizationIdentifier("intellij-touch");
-        jTouchBar.show(WindowManager.getInstance().findVisibleFrame());
+        jTouchBar.show(WindowManager.getInstance().getFrame(this.project));
     }
 
     public void addItem(TouchBarItem touchBarItem) {
         this.jTouchBar.addItem(touchBarItem);
-        jTouchBar.show(WindowManager.getInstance().findVisibleFrame());
+        jTouchBar.show(WindowManager.getInstance().getFrame(this.project));
     }
 }
diff --git a/src/main/java/dk/lost_world/intellij_touch/TouchBarProjectComponent.java b/src/main/java/dk/lost_world/intellij_touch/TouchBarProjectComponent.java
@@ -21,7 +21,7 @@ public TouchBarProjectComponent(Project project) {
 
     @Override
     public void projectOpened() {
-        TouchBar touchBar = TouchBar.getInstance();
+        TouchBar touchBar = TouchBar.getInstance(project);
 
         ActionGroup touchBarGroup = (ActionGroup)
             CustomActionsSchema.getInstance().getCorrectedAction("dk.lost_world.intellij_touch.TouchBar");

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -36,7 +36,7 @@
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- Add your extensions here -->
-        <applicationService serviceImplementation="dk.lost_world.intellij_touch.TouchBar"/>
+        <projectService serviceImplementation="dk.lost_world.intellij_touch.TouchBar"/>
         <customizableActionGroupProvider
                 implementation="dk.lost_world.intellij_touch.Settings.TouchBarCustomizableActionGroupProvider"
         />