port away from deprecated api

uwolfer · Oct 23, 2017 · 1d73776 · 1d73776
1 parent 1c908e6
commit 1d73776
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java b/src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java
@@ -53,7 +53,6 @@
 import com.urswolfer.intellij.plugin.gerrit.util.UrlUtils;
 import git4idea.GitCommit;
 import git4idea.GitExecutionException;
-import git4idea.GitPlatformFacade;
 import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.Git;

diff --git a/...a/com/urswolfer/intellij/plugin/gerrit/rest/CertificateManagerClientBuilderExtension.java b/...a/com/urswolfer/intellij/plugin/gerrit/rest/CertificateManagerClientBuilderExtension.java
@@ -19,7 +19,6 @@
 import com.intellij.util.net.ssl.CertificateManager;
 import com.urswolfer.gerrit.client.rest.GerritAuthData;
 import com.urswolfer.gerrit.client.rest.http.HttpClientBuilderExtension;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.impl.client.HttpClientBuilder;
 
 /**
@@ -31,7 +30,7 @@ public class CertificateManagerClientBuilderExtension extends HttpClientBuilderE
     public HttpClientBuilder extend(HttpClientBuilder httpClientBuilder, GerritAuthData authData) {
         HttpClientBuilder builder = super.extend(httpClientBuilder, authData);
         builder.setSslcontext(CertificateManager.getInstance().getSslContext());
-        builder.setHostnameVerifier((X509HostnameVerifier) CertificateManager.HOSTNAME_VERIFIER);
+        builder.setSSLHostnameVerifier(CertificateManager.HOSTNAME_VERIFIER);
         return builder;
     }
 }
diff --git a/src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/RepositoryChangesBrowserProvider.java b/src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/RepositoryChangesBrowserProvider.java
@@ -95,7 +95,7 @@ public RepositoryChangesBrowser get(Project project, GerritChangeListPanel chang
 
         final GerritRepositoryChangesBrowser changesBrowser = new GerritRepositoryChangesBrowser(project);
         changesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), table);
-        changesBrowser.getViewer().setScrollPaneBorder(IdeBorderFactory.createBorder(SideBorder.LEFT | SideBorder.TOP));
+        changesBrowser.getViewerScrollPane().setBorder(IdeBorderFactory.createBorder(SideBorder.LEFT | SideBorder.TOP));
         changesBrowser.getViewer().setChangeDecorator(changesBrowser.getChangeNodeDecorator());
 
         changeListPanel.addListSelectionListener(new Consumer<ChangeInfo>() {