diff --git a/gradle.properties b/gradle.properties index e212b38f..fe92533f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ideaVersion=IC-14.1.6 ijPluginRepoChannel= downloadIdeaSources=false -version=1.1.0-141 +version=1.1.1-141 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 index ddd104da..4f9dbb37 100644 --- 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 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 gitReviewBranchName = getGitReviewBranchName(); + branchTextField.setText(gitReviewBranchName.or(branchName)); + } initDestinationBranch(); } }); @@ -117,7 +114,8 @@ private Optional getGitReviewBranchName() { Optional branchName = Optional.absent(); DataContext dataContext = DataManager.getInstance().getDataContextFromFocus().getResult(); - Optional openedProject = Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext)); + Optional openedProject = dataContext != null ? + Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext)) : Optional.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 index e5d315de..5765eb1a 100644 --- 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. +
  • 1.1.1
  • +
      +
    • fix for push dialog which did not appear in some situations (fix for a recent change which is included in last release)
    • +
  • 1.1.0
    • add support for Gerrit 2.15+ push options (wip, private, publish-comments, hashtag)