Merge remote-tracking branch 'origin/intellij14.1' into intellij15

# Conflicts: # gradle.properties
uwolfer · Dec 5, 2018 · dbfc2b0 · dbfc2b0
2 parents 663fcd6 + 2274e63
commit dbfc2b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 ideaVersion=IC-15.0.5
 ijPluginRepoChannel=
 downloadIdeaSources=false
-version=1.1.0-142
+version=1.1.1-142
 javaVersion=1.6
diff --git a/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java b/src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java
@@ -97,17 +97,14 @@ public void registerGerritPushTargetPanel(GerritPushTargetPanel gerritPushTarget
     public void initialized() {
         initialized = true;
 
-        if (gerritPushTargetPanels.size() == 1) {
-            String branchName = gerritPushTargetPanels.values().iterator().next();
-
-            Optional<String> gitReviewBranchName = getGitReviewBranchName();
-
-            branchTextField.setText(gitReviewBranchName.or(branchName));
-        }
-
         // force a deferred update (changes are monitored only after full construction of dialog)
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
+                if (gerritPushTargetPanels.size() == 1) {
+                    String branchName = gerritPushTargetPanels.values().iterator().next();
+                    Optional<String> gitReviewBranchName = getGitReviewBranchName();
+                    branchTextField.setText(gitReviewBranchName.or(branchName));
+                }
                 initDestinationBranch();
             }
         });
@@ -117,7 +114,8 @@ private Optional<String> getGitReviewBranchName() {
         Optional<String> branchName = Optional.absent();
 
         DataContext dataContext = DataManager.getInstance().getDataContextFromFocus().getResult();
-        Optional<Project> openedProject = Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext));
+        Optional<Project> openedProject = dataContext != null ?
+            Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext)) : Optional.<Project>absent();
 
         if (openedProject.isPresent()) {
             String gitReviewFilePath = Joiner.on(File.separator).join(

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -89,6 +89,10 @@
           href="https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases">
           https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases</a>.</li>
 
+          <li>1.1.1</li>
+          <ul>
+            <li>fix for push dialog which did not appear in some situations (fix for a recent change which is included in last release)</li>
+          </ul>
           <li>1.1.0</li>
           <ul>
             <li>add support for Gerrit 2.15+ push options (wip, private, publish-comments, hashtag)</li>