MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-120391 - Support OpenShift debug

Browse Source
This commit is contained in:
Michael Golubev
2014-02-06 11:25:46 +01:00
parent ccfd1f8de0
commit ce3a156ee7
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentEditor.java → plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentChecker.java
+11 -12
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Factory;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.remoteServer.agent.util.CloudGitApplication;
@@ -42,27 +41,27 @@ import java.util.regex.Pattern;
/**
* @author michael.golubev
*/
public class CloudGitDeploymentEditor<
public class CloudGitDeploymentChecker<
T extends CloudDeploymentNameConfiguration,
SC extends ServerConfigurationBase,
SR extends CloudMultiSourceServerRuntimeInstance<T, ?, ?, ?>> extends CloudDeploymentNameEditor<T> {
SR extends CloudMultiSourceServerRuntimeInstance<T, ?, ?, ?>> {
private GitRepositoryManager myGitRepositoryManager;
private Git myGit;
private final DeploymentSource myDeploymentSource;
private final RemoteServer<SC> myServer;
private final CloudDeploymentNameEditor<T> mySettingsEditor;
public CloudGitDeploymentEditor(Factory<T> deploymentModelFactory,
String labelCaption,
DeploymentSource deploymentSource,
RemoteServer<SC> server) {
super(deploymentModelFactory, labelCaption);
public CloudGitDeploymentChecker(DeploymentSource deploymentSource,
RemoteServer<SC> server,
CloudDeploymentNameEditor<T> settingsEditor) {
myDeploymentSource = deploymentSource;
myServer = server;
mySettingsEditor = settingsEditor;
}
protected void checkGitUrl(final T settings, Pattern gitUrlPattern) throws ConfigurationException {
public void checkGitUrl(final T settings, Pattern gitUrlPattern) throws ConfigurationException {
if (!(myDeploymentSource instanceof ModuleDeploymentSource)) {
return;
}
@@ -149,13 +148,13 @@ public class CloudGitDeploymentEditor<
}.perform();
if (application == null) {
Messages.showErrorDialog(getComponent(), "No application matching repository URL(s) found in account");
Messages.showErrorDialog(mySettingsEditor.getComponent(), "No application matching repository URL(s) found in account");
}
else {
T fixedSettings = getFactory().create();
T fixedSettings = mySettingsEditor.getFactory().create();
fixedSettings.setDefaultDeploymentName(false);
fixedSettings.setDeploymentName(application.getName());
resetEditorFrom(fixedSettings);
mySettingsEditor.resetFrom(fixedSettings);
}
}
});