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

# Conflicts:
#	gradle.properties

README.md

@@ -21,8 +21,9 @@ Unofficial [IntelliJ Platform](http://www.jetbrains.com/idea/) plugin for the
 * Android Studio
 * DataGrip
 * CLion
-* Gogland
+* GoLand
 * Rider
+* MPS
 
 *Compiled with Java 1.6*
 
@@ -135,6 +136,7 @@ Credits
 ------
 * IntelliJ Github plugin (some code of this plugin is based on its code)
 
+Thanks to [JetBrains](https://www.jetbrains.com/) for providing a free licence for developing this project.
 
 Donations
 --------
@@ -147,7 +149,7 @@ Please only use the link from github.com/uwolfer/gerrit-intellij-plugin to verif
 Copyright and license
 --------------------
 
-Copyright 2013 - 2017 Urs Wolfer
+Copyright 2013 - 2018 Urs Wolfer
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this work except in compliance with the License.

build.gradle

@@ -15,7 +15,7 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version '0.2.16'
+    id 'org.jetbrains.intellij' version '0.2.17'
 }
 
 apply plugin: 'java'

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/LoginPanel.form

@@ -64,10 +64,10 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="URL:"/>
+          <text value="Web-URL:"/>
         </properties>
       </component>
-      <component id="f5630" class="javax.swing.JTextField" binding="hostTextField">
+      <component id="f5630" class="com.intellij.ui.components.JBTextField" binding="hostTextField">
         <constraints>
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/LoginPanel.java

@@ -18,6 +18,7 @@
 package com.urswolfer.intellij.plugin.gerrit.ui;
 
 import com.intellij.ui.DocumentAdapter;
+import com.intellij.ui.components.JBTextField;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
@@ -35,16 +36,18 @@
  */
 public class LoginPanel {
     public static final String LOGIN_CREDENTIALS_INFO =
-        "* If logging in with your normal Gerrit login credentials fails, you need to set a HTTP access password" +
+        "* If login in with your usual Gerrit login credentials fails, you need to set a HTTP access password" +
         " for your account in the Gerrit Web Application (Settings > HTTP Password).";
 
     private JPanel pane;
-    private JTextField hostTextField;
+    private JBTextField hostTextField;
     private JTextField loginTextField;
     private JPasswordField passwordField;
     private JTextPane gerritLoginInfoTestField;
 
     public LoginPanel(final LoginDialog dialog) {
+        hostTextField.getEmptyText().setText("https://review.example.org");
+
         hostTextField.addFocusListener(new FocusAdapter() {
             @Override
             public void focusLost(FocusEvent e) {

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/SettingsPanel.form

@@ -87,10 +87,10 @@
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="URL:"/>
+                  <text value="Web-URL:"/>
                 </properties>
               </component>
-              <component id="3352a" class="javax.swing.JTextField" binding="hostTextField">
+              <component id="3352a" class="com.intellij.ui.components.JBTextField" binding="hostTextField">
                 <constraints>
                   <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                     <preferred-size width="150" height="-1"/>

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/SettingsPanel.java

@@ -25,6 +25,7 @@
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.EnumComboBoxModel;
 import com.intellij.ui.GuiUtils;
+import com.intellij.ui.components.JBTextField;
 import com.urswolfer.gerrit.client.rest.GerritAuthData;
 import com.urswolfer.intellij.plugin.gerrit.GerritSettings;
 import com.urswolfer.intellij.plugin.gerrit.rest.GerritUtil;
@@ -49,7 +50,7 @@ public class SettingsPanel {
     private JTextPane gerritLoginInfoTextField;
     private JPanel loginPane;
     private JButton testButton;
-    private JTextField hostTextField;
+    private JBTextField hostTextField;
     private JSpinner refreshTimeoutSpinner;
     private JPanel settingsPane;
     private JPanel pane;
@@ -72,6 +73,8 @@ public class SettingsPanel {
     private Logger log;
 
     public SettingsPanel() {
+        hostTextField.getEmptyText().setText("https://review.example.org");
+
         gerritLoginInfoTextField.setText(LoginPanel.LOGIN_CREDENTIALS_INFO);
         gerritLoginInfoTextField.setBackground(pane.getBackground());
         testButton.addActionListener(new ActionListener() {

src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/ShowProjectColumn.java

@@ -2,7 +2,7 @@
 
 public enum ShowProjectColumn {
     ALWAYS("Always"),
-    AUTO("Automatic (if multiple git repositories)"),
+    AUTO("Auto (when multiple Git repositories available)"),
     NEVER("Never");
 
     ShowProjectColumn(String label) {

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

@@ -35,8 +35,9 @@ public static Comment.Range textOffsetToRange(CharSequence charsSequence, int st
         int startOffset = -1;
         int endLine = 1;
         int endOffset = -1;
+        CharSequenceReader charSequenceReader = new CharSequenceReader(charsSequence);
         try {
-            BufferedReader reader = new BufferedReader(new CharSequenceReader(charsSequence));
+            BufferedReader reader = new BufferedReader(charSequenceReader);
             String lineString;
             int currentCharCount = 0;
             while ((lineString = reader.readLine()) != null) {
@@ -58,6 +59,8 @@ public static Comment.Range textOffsetToRange(CharSequence charsSequence, int st
             }
         } catch (IOException e) {
             throw Throwables.propagate(e);
+        } finally {
+            charSequenceReader.close();
         }
 
         Comment.Range range = new Comment.Range();
@@ -71,8 +74,9 @@ public static Comment.Range textOffsetToRange(CharSequence charsSequence, int st
     public static Offset rangeToTextOffset(CharSequence charsSequence, Comment.Range range) {
         int startOffset = 0;
         int endOffset = 0;
+        CharSequenceReader charSequenceReader = new CharSequenceReader(charsSequence);
         try {
-            BufferedReader reader = new BufferedReader(new CharSequenceReader(charsSequence));
+            BufferedReader reader = new BufferedReader(charSequenceReader);
             String line;
             int textLineCount = 1;
             while ((line = reader.readLine()) != null) {
@@ -90,17 +94,19 @@ public static Offset rangeToTextOffset(CharSequence charsSequence, Comment.Range
             }
         } catch (IOException e) {
             throw Throwables.propagate(e);
+        } finally {
+            charSequenceReader.close();
         }
         startOffset += range.startCharacter;
         endOffset += range.endCharacter;
         return new Offset(startOffset, endOffset);
     }
 
-    public static class Offset {
-        public int start;
-        public int end;
+    static class Offset {
+        final int start;
+        final int end;
 
-        public Offset(int start, int end) {
+        Offset(int start, int end) {
             this.start = start;
             this.end = end;
         }

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.5</li>
+          <ul>
+            <li>improved labels and documentation for improved usability</li>
+            <li>minor fixes and improvements</li>
+          </ul>
           <li>1.0.4</li>
           <ul>
             <li>optimize checkout: display smart file checkout dialog when required</li>
@@ -216,7 +221,7 @@
           <li>0.9.5</li>
           <ul>
             <li>new action to add reviewers to a change</li>
-            <li>support for LDAP authentication (when logging in happens with a HTML form)</li>
+            <li>support for LDAP authentication (when login in happens with a HTML form)</li>
             <li>fix authentication when HTTP digest method is used</li>
             <li>fix branch filter for some project setups</li>
             <li>many minor fixes and improvements</li>