Merge branch 'release/0.6.3'

OpherV · Oct 5, 2017 · 583b912 · 583b912
2 parents a2eb4d9 + e63246f
commit 583b912
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -2,15 +2,15 @@
     <name>Git Flow Integration</name>
     <id>Gitflow</id>
     <description>Git Flow Integration</description>
-    <version>0.6.2</version>
+    <version>0.6.3</version>
     <category>VCS Integration</category>
     <vendor url="http://www.opherv.com">Opher Vishnia</vendor>
 
     <depends>com.intellij.modules.vcs</depends>
     <depends>com.intellij.tasks</depends>
     <depends>Git4Idea</depends>
 
-    <idea-version since-build="171.0" until-build="172.*"/>
+    <idea-version since-build="162.0" until-build="173.*"/>
 
     <actions>
         <action id="Gitflow.OpenGitflowPopup" class="gitflow.actions.OpenGitflowPopup"

diff --git a/src/gitflow/GitflowBranchUtilManager.java b/src/gitflow/GitflowBranchUtilManager.java
@@ -11,7 +11,9 @@
 
 /**
  * This class maps repos to their corresponding branch utils
+ * Note that the static class is used across projects
  */
+
 public class GitflowBranchUtilManager {
     private static HashMap<GitRepository, GitflowBranchUtil> repoBranchUtilMap;
 
@@ -32,7 +34,6 @@ static public void update(Project project){
         if (repoBranchUtilMap == null){
             repoBranchUtilMap = new HashMap<GitRepository, GitflowBranchUtil>();
         }
-        repoBranchUtilMap.clear();
 
         List<GitRepository> gitRepositories = GitUtil.getRepositoryManager(project).getRepositories();
 

diff --git a/src/gitflow/actions/GitflowAction.java b/src/gitflow/actions/GitflowAction.java
@@ -45,7 +45,13 @@ public class GitflowAction extends DumbAwareAction {
 
     @Override
     public void actionPerformed(AnActionEvent e) {
-        setup(e.getProject());
+        Project project = e.getProject();
+
+        // if repo isn't set explicitly, such as in the case of starting from keyboard shortcut, infer it
+        if (myRepo == null){
+            myRepo = GitBranchUtil.getCurrentRepository(project);
+        }
+        setup(project);
     }
 
     public void setup(Project project){

diff --git a/src/gitflow/ui/AbstractBranchStartDialog.java b/src/gitflow/ui/AbstractBranchStartDialog.java
@@ -64,10 +64,10 @@ public void validateBranchName() {
                 }
 
                 if (branchNameTextField.getText().contains("&")){
-                    AbstractBranchStartDialog.this.setOKActionEnabled(false);
+                    AbstractBranchStartDialog.super.setOKActionEnabled(false);
                 }
                 else{
-                    AbstractBranchStartDialog.this.setOKActionEnabled(true);
+                    AbstractBranchStartDialog.super.setOKActionEnabled(true);
                 }
             }
         });