From 7eef6862266d1f0f469bdc00531306c1d60ea83c Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 22 Sep 2016 00:25:34 +0300 Subject: [PATCH] Move GitDefineRemoteDialog to a more appropriate package --- .../src/git4idea/push/GitPushTargetPanel.java | 1 + .../{push => remote}/GitDefineRemoteDialog.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) rename plugins/git4idea/src/git4idea/{push => remote}/GitDefineRemoteDialog.java (93%) diff --git a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java index 5ba3108fcdf5..54dc05eb6e6e 100644 --- a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java +++ b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java @@ -43,6 +43,7 @@ import com.intellij.util.ui.table.ComponentsListFocusTraversalPolicy; import git4idea.GitRemoteBranch; import git4idea.commands.Git; import git4idea.commands.GitCommandResult; +import git4idea.remote.GitDefineRemoteDialog; import git4idea.repo.GitRemote; import git4idea.repo.GitRepository; import org.jetbrains.annotations.NotNull; diff --git a/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java b/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java similarity index 93% rename from plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java rename to plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java index a0d13f3553c9..c1f4c283e16f 100644 --- a/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java +++ b/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.push; +package git4idea.remote; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; @@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -class GitDefineRemoteDialog extends DialogWrapper { +public class GitDefineRemoteDialog extends DialogWrapper { private static final Logger LOG = Logger.getInstance(GitDefineRemoteDialog.class); @@ -47,7 +47,7 @@ class GitDefineRemoteDialog extends DialogWrapper { @NotNull private final JTextField myRemoteName; @NotNull private final JTextField myRemoteUrl; - GitDefineRemoteDialog(@NotNull GitRepository repository, @NotNull Git git) { + public GitDefineRemoteDialog(@NotNull GitRepository repository, @NotNull Git git) { super(repository.getProject()); myRepository = repository; myGit = git; @@ -73,12 +73,12 @@ class GitDefineRemoteDialog extends DialogWrapper { } @NotNull - String getRemoteName() { + public String getRemoteName() { return StringUtil.notNullize(myRemoteName.getText()).trim(); } @NotNull - String getRemoteUrl() { + public String getRemoteUrl() { return StringUtil.notNullize(myRemoteUrl.getText()).trim(); }