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

# Conflicts:
#	gradle.properties

build.gradle

@@ -47,13 +47,13 @@ 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.15') {
+    compile ('com.urswolfer.gerrit.client.rest:gerrit-rest-java-client:0.8.16') {
         exclude group: 'com.google.code.gson', module: 'gson'
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
-    compile 'org.javassist:javassist:3.22.0-GA'
+    compile 'org.javassist:javassist:3.24.1-GA'
 
     testCompile 'org.testng:testng:6.8.21'
     testCompile 'org.easymock:easymock:3.4'

gradle.properties

@@ -1,5 +1,5 @@
 ideaVersion=IC-15.0.5
 ijPluginRepoChannel=
 downloadIdeaSources=false
-version=1.1.1-142
+version=1.1.2-142
 javaVersion=1.6

src/main/java/com/urswolfer/intellij/plugin/gerrit/push/GerritPushExtensionPanel.java

@@ -113,7 +113,7 @@ public void run() {
     private Optional<String> getGitReviewBranchName() {
         Optional<String> branchName = Optional.absent();
 
-        DataContext dataContext = DataManager.getInstance().getDataContextFromFocus().getResult();
+        DataContext dataContext = DataManager.getInstance().getDataContext(this);
         Optional<Project> openedProject = dataContext != null ?
             Optional.fromNullable(CommonDataKeys.PROJECT.getData(dataContext)) : Optional.<Project>absent();
 
@@ -129,7 +129,7 @@ private Optional<String> getGitReviewBranchName() {
 
                     Properties properties = new Properties();
                     properties.load(fileInputStream);
-                    branchName = Optional.fromNullable(properties.getProperty("defaultbranch"));
+                    branchName = Optional.fromNullable(Strings.emptyToNull(properties.getProperty("defaultbranch")));
                 } catch (IOException e) {
                     //no need to handle as branch name is already absent and ready to be returned
                 } finally {

src/main/java/com/urswolfer/intellij/plugin/gerrit/rest/GerritUtil.java

@@ -39,6 +39,7 @@
 import com.google.gerrit.extensions.common.ProjectInfo;
 import com.google.gerrit.extensions.common.RevisionInfo;
 import com.google.gerrit.extensions.restapi.RestApiException;
+import com.google.gerrit.extensions.restapi.Url;
 import com.google.inject.Inject;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.notification.Notification;
@@ -380,7 +381,7 @@ private String getProjectQueryPart(Project project) {
         Iterable<String> projectNamesWithQueryPrefix = Iterables.transform(projectNames, new Function<String, String>() {
             @Override
             public String apply(String input) {
-                return "project:" + input;
+                return "project:" + Url.encode(input);
             }
         });
 

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.1.2</li>
+          <ul>
+            <li>fix push dialog extension for Java 11 JRE</li>
+            <li>fix for setups which contain Git repos with spaces in their name</li>
+          </ul>
           <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>