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

Make GithubSettingsConfigurable pass ConfigurablesModifiedTest

Browse Source
This commit is contained in:
Oleg Shpynov
2010-12-09 11:23:50 +03:00
parent 04b3daa132
commit 382c988c1d
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java
+13 -10
View File
@@ -70,27 +70,30 @@ public class GithubSettings implements PersistentStateComponent<Element> {
}
}
@NotNull
public String getLogin() {
return myLogin;
return myLogin != null ? myLogin : "";
}
@NotNull
public String getPassword() {
return myPassword;
return myPassword != null ? myPassword : "";
}
@NotNull
public String getClonePath() {
return myClonePath != null ? myClonePath : "";
}
public void setLogin(final String login) {
myLogin = login;
myLogin = login != null ? login : "";
}
public void setPassword(final String password) {
myPassword = password;
myPassword = password != null ? password : "";
}
public String getClonePath() {
return myClonePath;
}
public void setClonePath(String clonePath) {
myClonePath = clonePath;
public void setClonePath(final String clonePath) {
myClonePath = clonePath != null ? clonePath : "";
}
}
plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
+2 -3
View File
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.github.ui;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.plugins.github.GithubSettings;
import javax.swing.*;
@@ -41,8 +40,8 @@ public class GitHubSettingsConfigurable implements SearchableConfigurable {
}
public boolean isModified() {
return mySettingsPane == null || !StringUtil.equals(mySettings.getLogin(), mySettingsPane.getLogin()) ||
!StringUtil.equals(mySettings.getPassword(), mySettingsPane.getPassword());
return mySettingsPane == null || !mySettings.getLogin().equals(mySettingsPane.getLogin()) ||
!mySettings.getPassword().equals(mySettingsPane.getPassword());
}
public void apply() throws ConfigurationException {