Merge remote-tracking branch 'origin/intellij15' into intellij2016.2

# Conflicts:
#	gradle.properties

Author: uwolfer

build.gradle

@@ -47,7 +47,7 @@ dependencies {
     compile ('com.google.inject.extensions:guice-multibindings:4.1.0') {
         exclude group: 'com.google.guava', module: 'guava'
     }
-    compile ('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.13') {
+    compile ('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.14') {
         exclude group: 'com.google.code.gson', module: 'gson'
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'commons-logging', module: 'commons-logging'

gradle.properties

@@ -1,5 +1,5 @@
 ideaVersion=IC-2016.2.5
 ijPluginRepoChannel=
 downloadIdeaSources=false
-version=1.0.5-146
+version=1.0.6-146
 javaVersion=1.8

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/diff/CommentBalloonBuilder.java

@@ -17,6 +17,8 @@
 package com.urswolfer.intellij.plugin.gerrit.ui.diff;
 
 import com.google.inject.Inject;
+import com.intellij.openapi.actionSystem.CommonShortcuts;
+import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.ui.popup.ComponentPopupBuilder;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -29,14 +31,17 @@
  * https://github.com/ktisha/Crucible4IDEA
  */
 public class CommentBalloonBuilder {
+    private static final String POPUP_TEXT =
+        String.format("Hit %s to create a comment. It will be published once you post your review.",
+            KeymapUtil.getShortcutsText(CommonShortcuts.CTRL_ENTER.getShortcuts()));
 
     @Inject
     private JBPopupFactory jbPopupFactory;
 
     public JBPopup getNewCommentBalloon(final CommentForm balloonContent, @NotNull final String title) {
         final ComponentPopupBuilder builder = jbPopupFactory.
                 createComponentPopupBuilder(balloonContent, balloonContent);
-        builder.setAdText("Hit Ctrl+Enter to create comment. It will be published once you post your review.");
+        builder.setAdText(POPUP_TEXT);
         builder.setTitle(title);
         builder.setResizable(true);
         builder.setMovable(true);

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/diff/CommentForm.java

@@ -19,8 +19,10 @@
 import com.google.gerrit.extensions.api.changes.DraftInput;
 import com.google.gerrit.extensions.client.Comment;
 import com.google.gerrit.extensions.client.Side;
+import com.intellij.openapi.actionSystem.CommonShortcuts;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.SelectionModel;
+import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.wm.IdeFocusManager;
@@ -76,7 +78,7 @@ public CommentForm(Project project,
         reviewTextField.setPreferredSize(new Dimension(BALLOON_WIDTH, BALLOON_HEIGHT));
 
         reviewTextField.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).
-                put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK), "postComment");
+                put(KeymapUtil.getKeyStroke(CommonShortcuts.CTRL_ENTER), "postComment");
         reviewTextField.getActionMap().put("postComment", new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/filter/AbstractUserFilter.java

@@ -22,6 +22,7 @@
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonShortcuts;
+import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.ComponentPopupBuilder;
@@ -39,6 +40,9 @@
  * @author Thomas Forrer
  */
 public abstract class AbstractUserFilter extends AbstractChangesFilter {
+    private static final String POPUP_TEXT = String.format("%s to search",
+        KeymapUtil.getShortcutsText(CommonShortcuts.CTRL_ENTER.getShortcuts()));
+
     @Inject
     private JBPopupFactory jbPopupFactory;
 
@@ -146,7 +150,7 @@ public void actionPerformed(AnActionEvent e) {
         private JBPopup buildBalloon(JTextArea textArea) {
             ComponentPopupBuilder builder = jbPopupFactory.
                 createComponentPopupBuilder(textArea, textArea);
-            builder.setAdText("Ctrl+Enter to search");
+            builder.setAdText(POPUP_TEXT);
             builder.setResizable(true);
             builder.setMovable(true);
             builder.setRequestFocus(true);

src/main/resources/META-INF/plugin.xml

@@ -89,6 +89,11 @@
           href="https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases">
           https://github.com/uwolfer/gerrit-intellij-plugin#pre-releases</a>.</li>
 
+          <li>1.0.6</li>
+          <ul>
+            <li>fix for session expiration related issues</li>
+            <li>macOS: change diff viewer shortcut "Add comment" to cmd+enter</li>
+          </ul>
           <li>1.0.5</li>
           <ul>
             <li>improved labels and documentation for improved usability</li>