From d4ac3d1215b428a60f64516030d87bbd6bfe323a Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Tue, 24 Jul 2012 20:06:40 +0400
Subject: [PATCH] test fixed

---
 xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java | 4 ++--
 xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java b/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java
index 739d0d3880df..f8e6f95f6f8e 100644
--- a/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java
+++ b/xml/impl/src/com/intellij/javaee/XMLCatalogConfigurable.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.options.BaseConfigurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
-import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
@@ -73,7 +73,7 @@ public class XMLCatalogConfigurable extends BaseConfigurable implements Searchab
 
   @Override
   public boolean isModified() {
-    return !Comparing.equal(ExternalResourceManagerEx.getInstanceEx().getCatalogPropertiesFile(), myPropertyFile.getText());
+    return !StringUtil.notNullize(ExternalResourceManagerEx.getInstanceEx().getCatalogPropertiesFile()).equals(myPropertyFile.getText());
   }
 
   @Override
diff --git a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
index 2905c3081b0c..445c23a4bcac 100644
--- a/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
+++ b/xml/tests/src/com/intellij/xml/XMLCatalogManagerTest.java
@@ -17,6 +17,7 @@ package com.intellij.xml;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.javaee.ExternalResourceManagerEx;
+import com.intellij.javaee.XMLCatalogConfigurable;
 import com.intellij.javaee.XMLCatalogManager;
 import com.intellij.testFramework.IdeaTestCase;
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
@@ -75,6 +76,10 @@ public class XMLCatalogManagerTest extends LightPlatformCodeInsightFixtureTestCa
     }
   }
 
+  public void testConfigurable() throws Exception {
+    assertFalse(new XMLCatalogConfigurable().isModified());
+  }
+
   private XMLCatalogManager getManager() throws IOException {
     return new XMLCatalogManager(getTestDataPath() + "catalog.properties");
   }