From 382c988c1d7c684e7ac65441e042ee6e17e5b0f6 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 9 Dec 2010 11:23:18 +0300
Subject: [PATCH] Make GithubSettingsConfigurable pass
 ConfigurablesModifiedTest

---
 .../plugins/github/GithubSettings.java        | 23 +++++++++++--------
 .../github/ui/GitHubSettingsConfigurable.java |  5 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java b/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java
index ba216d1fe522..41342b27ba52 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java
@@ -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 : "";
   }
 }
\ No newline at end of file
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
index febbd21d6a4b..aadbf6f1f55c 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubSettingsConfigurable.java
@@ -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 {