Skip to content

Commit 1d73776

Browse files
committed
port away from deprecated api
1 parent 1c908e6 commit 1d73776

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import com.urswolfer.intellij.plugin.gerrit.util.UrlUtils;
5454
import git4idea.GitCommit;
5555
import git4idea.GitExecutionException;
56-
import git4idea.GitPlatformFacade;
5756
import git4idea.GitUtil;
5857
import git4idea.GitVcs;
5958
import git4idea.commands.Git;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.util.net.ssl.CertificateManager;
2020
import com.urswolfer.gerrit.client.rest.GerritAuthData;
2121
import com.urswolfer.gerrit.client.rest.http.HttpClientBuilderExtension;
22-
import org.apache.http.conn.ssl.X509HostnameVerifier;
2322
import org.apache.http.impl.client.HttpClientBuilder;
2423

2524
/**
@@ -31,7 +30,7 @@ public class CertificateManagerClientBuilderExtension extends HttpClientBuilderE
3130
public HttpClientBuilder extend(HttpClientBuilder httpClientBuilder, GerritAuthData authData) {
3231
HttpClientBuilder builder = super.extend(httpClientBuilder, authData);
3332
builder.setSslcontext(CertificateManager.getInstance().getSslContext());
34-
builder.setHostnameVerifier((X509HostnameVerifier) CertificateManager.HOSTNAME_VERIFIER);
33+
builder.setSSLHostnameVerifier(CertificateManager.HOSTNAME_VERIFIER);
3534
return builder;
3635
}
3736
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public RepositoryChangesBrowser get(Project project, GerritChangeListPanel chang
9595

9696
final GerritRepositoryChangesBrowser changesBrowser = new GerritRepositoryChangesBrowser(project);
9797
changesBrowser.getDiffAction().registerCustomShortcutSet(CommonShortcuts.getDiff(), table);
98-
changesBrowser.getViewer().setScrollPaneBorder(IdeBorderFactory.createBorder(SideBorder.LEFT | SideBorder.TOP));
98+
changesBrowser.getViewerScrollPane().setBorder(IdeBorderFactory.createBorder(SideBorder.LEFT | SideBorder.TOP));
9999
changesBrowser.getViewer().setChangeDecorator(changesBrowser.getChangeNodeDecorator());
100100

101101
changeListPanel.addListSelectionListener(new Consumer<ChangeInfo>() {

0 commit comments

Comments
 (0)