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

Merge branch 'svn_18_3'

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2014-10-18 21:31:42 +04:00
parent e2d35a2f1f 52ade43b1c
commit 53b1cd186a
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
+3 -3
View File
@@ -201,9 +201,9 @@ dialog.edit.http.proxies.settings.test.connection.succes.title=Connection test s
confirmation.text.delete.stored.authentication.information=You are about to delete all stored Subversion authentication information.\nWould you like to proceed with deletion?
confirmation.title.clear.authentication.cache=Clear Authentication Cache
command.line.interactive.mode.title=Interactive mode
command.line.interactive.mode.description=<html>Emulates behaviour as if Subversion commands were executed directly from terminal (in interactive mode).<br>\
Primarily intended to be used for handling password/passphrase prompts for svn+ssh repositories and trusting invalid server certificates for https repositories.</html>
command.line.interactive.mode.title=Enable interactive mode
command.line.interactive.mode.description=<html>Emulates the behavior when Subversion commands are executed directly from the terminal (in the interactive mode).<br>\
This is required to handle password/passphrase prompts for svn+ssh repositories, and trust invalid server certificates for https repositories.</html>
ssh.settings.title=SSH Settings
ssh.settings.executable.label=SSH executable\:
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
+4 -3
View File
@@ -66,7 +66,7 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati
private final static long UPGRADE_TO_16_VERSION_ASKED = 125;
private final Project myProject;
private SvnConfigurationState myState = new SvnConfigurationState();
@NotNull private SvnConfigurationState myState = new SvnConfigurationState();
private ISVNOptions myOptions;
private SvnAuthenticationManager myAuthManager;
@@ -85,13 +85,14 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati
return UseAcceleration.commandLine.equals(getUseAcceleration());
}
@NotNull
@Override
public SvnConfigurationState getState() {
return myState;
}
@Override
public void loadState(SvnConfigurationState state) {
public void loadState(@NotNull SvnConfigurationState state) {
myState = state;
}
@@ -361,7 +362,7 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati
myState.directory.useDefault = useDefault;
}
public ISVNOptions getOptions(Project project) {
public ISVNOptions getOptions() {
if (myOptions == null) {
File path = new File(getConfigurationDirectory());
myOptions = SVNWCUtil.createDefaultOptions(path.getAbsoluteFile(), true);
plugins/svn4idea/src/org/jetbrains/idea/svn/svnkit/SvnKitManager.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class SvnKitManager {
@NotNull
public ISVNOptions getSvnOptions() {
return myConfiguration.getOptions(myProject);
return myConfiguration.getOptions();
}
@NotNull