From b532597856533e85e45dd93e25eaa6cdac19d560 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Tue, 31 Jul 2012 15:50:19 +0400
Subject: [PATCH] Refactoring

---
 .../intellij/designer/model/EmptyXmlTag.java  | 62 ++++++++++++++-----
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
index cd80c37d366b..2dc0aeb9150f 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/EmptyXmlTag.java
@@ -26,10 +26,7 @@ import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.SearchScope;
-import com.intellij.psi.xml.XmlAttribute;
-import com.intellij.psi.xml.XmlTag;
-import com.intellij.psi.xml.XmlTagChild;
-import com.intellij.psi.xml.XmlTagValue;
+import com.intellij.psi.xml.*;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.xml.XmlElementDescriptor;
 import com.intellij.xml.XmlNSDescriptor;
@@ -38,6 +35,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -49,7 +47,7 @@ public class EmptyXmlTag implements XmlTag {
   @NotNull
   @Override
   public String getName() {
-    return null;
+    return "";
   }
 
   @Override
@@ -60,13 +58,13 @@ public class EmptyXmlTag implements XmlTag {
   @NotNull
   @Override
   public String getNamespace() {
-    return null;
+    return "";
   }
 
   @NotNull
   @Override
   public String getLocalName() {
-    return null;
+    return "";
   }
 
   @Override
@@ -149,13 +147,13 @@ public class EmptyXmlTag implements XmlTag {
   @NotNull
   @Override
   public String getNamespacePrefix() {
-    return null;
+    return "";
   }
 
   @NotNull
   @Override
   public String getNamespaceByPrefix(@NonNls String prefix) {
-    return null;
+    return "";
   }
 
   @Override
@@ -176,13 +174,51 @@ public class EmptyXmlTag implements XmlTag {
   @NotNull
   @Override
   public Map<String, String> getLocalNamespaceDeclarations() {
-    return null;
+    return Collections.emptyMap();
   }
 
   @NotNull
   @Override
   public XmlTagValue getValue() {
-    return null;
+    return new XmlTagValue() {
+      @NotNull
+      @Override
+      public XmlTagChild[] getChildren() {
+        return new XmlTagChild[0];
+      }
+
+      @NotNull
+      @Override
+      public XmlText[] getTextElements() {
+        return new XmlText[0];
+      }
+
+      @NotNull
+      @Override
+      public String getText() {
+        return "";
+      }
+
+      @Override
+      public TextRange getTextRange() {
+        return null;
+      }
+
+      @NotNull
+      @Override
+      public String getTrimmedText() {
+        return "";
+      }
+
+      @Override
+      public void setText(String value) {
+      }
+
+      @Override
+      public boolean hasCDATA() {
+        return false;
+      }
+    };
   }
 
   @Override
@@ -225,13 +261,11 @@ public class EmptyXmlTag implements XmlTag {
     return false;
   }
 
-  @NotNull
   @Override
   public Project getProject() throws PsiInvalidElementAccessException {
     return null;
   }
 
-  @NotNull
   @Override
   public Language getLanguage() {
     return null;
@@ -464,13 +498,11 @@ public class EmptyXmlTag implements XmlTag {
     return false;
   }
 
-  @NotNull
   @Override
   public GlobalSearchScope getResolveScope() {
     return null;
   }
 
-  @NotNull
   @Override
   public SearchScope getUseScope() {
     return null;