From ae79a18033eb8c0587d29d445c2b8397b8100421 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Thu, 5 Feb 2009 14:03:50 +0300
Subject: [PATCH] cleanup

---
 ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java   | 2 +-
 lang-impl/src/com/intellij/psi/impl/source/tree/Factory.java        | 3 +--
 .../src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java | 4 ++--
 xml/impl/src/com/intellij/psi/xml/XmlElementType.java               | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
index 0301e34d6c..07ff5ad096 100644
--- a/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
+++ b/ExtendedApi/src/com/intellij/testFramework/LightIdeaTestCase.java
@@ -498,7 +498,7 @@ import java.util.Map;
    * @return dummy psi file.
    * @throws IncorrectOperationException
    */
-  protected static PsiFile createFile(String fileName, String text) throws IncorrectOperationException {
+  protected static PsiFile createFile(@NonNls String fileName, String text) throws IncorrectOperationException {
     return createPseudoPhysicalFile(fileName, text);
   }
 
diff --git a/lang-impl/src/com/intellij/psi/impl/source/tree/Factory.java b/lang-impl/src/com/intellij/psi/impl/source/tree/Factory.java
index 916eacd4f0..a113c9508f 100644
--- a/lang-impl/src/com/intellij/psi/impl/source/tree/Factory.java
+++ b/lang-impl/src/com/intellij/psi/impl/source/tree/Factory.java
@@ -28,9 +28,8 @@ public class Factory  {
   }
 
   public static LeafElement createSingleLeafElement(IElementType type, CharSequence buffer, int startOffset, int endOffset, CharTable table, PsiManager manager, boolean generatedFlag) {
-    final LeafElement newElement;
     final FileElement holderElement = DummyHolderFactory.createHolder(manager, table, type.getLanguage()).getTreeElementNoLock();
-    newElement = ASTFactory.leaf(type, buffer, startOffset, endOffset, holderElement.getCharTable());
+    final LeafElement newElement = ASTFactory.leaf(type, buffer, startOffset, endOffset, holderElement.getCharTable());
     TreeUtil.addChildren(holderElement, newElement);
     if(generatedFlag) CodeEditUtil.setNodeGenerated(newElement, true);
     return newElement;
diff --git a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java
index 17991879ff..29365e4945 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/parsing/xml/OldXmlParsing.java
@@ -373,7 +373,7 @@ public class OldXmlParsing implements XmlElementType {
       addToken(tag, lexer);
     }
     else {
-      TreeUtil.insertAfter((TreeElement)tag.getLastChildNode(), Factory.createErrorElement(XmlErrorMessages.message("element.is.not.closed")));
+      TreeUtil.insertAfter(tag.getLastChildNode(), Factory.createErrorElement(XmlErrorMessages.message("element.is.not.closed")));
     }
 
     return true;
@@ -918,7 +918,7 @@ public class OldXmlParsing implements XmlElementType {
     originalLexer.start(text, start, end, _OldXmlLexer.DOCTYPE);
     insertMissingTokens(dummyRoot, originalLexer, start, end, _OldXmlLexer.DOCTYPE,
                                   WhiteSpaceAndCommentsProcessor.INSTANCE, myContext);
-    return (TreeElement)dummyRoot.getFirstChildNode();
+    return dummyRoot.getFirstChildNode();
   }
 
   public static class WhiteSpaceAndCommentsProcessor implements TokenProcessor {
diff --git a/xml/impl/src/com/intellij/psi/xml/XmlElementType.java b/xml/impl/src/com/intellij/psi/xml/XmlElementType.java
index e4038f46e8..43c39ecc68 100644
--- a/xml/impl/src/com/intellij/psi/xml/XmlElementType.java
+++ b/xml/impl/src/com/intellij/psi/xml/XmlElementType.java
@@ -8,7 +8,7 @@ import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.lexer.OldXmlLexer;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.impl.source.parsing.xml.XmlParsingContext;
-import com.intellij.psi.impl.source.tree.CharTableBasedLeafElementImpl;
+import com.intellij.psi.impl.source.tree.LeafElement;
 import com.intellij.psi.impl.source.tree.SharedImplUtil;
 import com.intellij.psi.tree.IChameleonElementType;
 import com.intellij.psi.tree.IElementType;
@@ -54,7 +54,7 @@ public interface XmlElementType extends XmlTokenType {
 
   IElementType DTD_FILE = new IChameleonElementType("DTD_FILE", DTDLanguage.INSTANCE){
     public ASTNode parseContents(ASTNode chameleon) {
-      final CharSequence chars = ((CharTableBasedLeafElementImpl)chameleon).getInternedText();
+      final CharSequence chars = ((LeafElement)chameleon).getInternedText();
       final CharTable table = SharedImplUtil.findCharTableByTree(chameleon);
       final XmlParsingContext parsingContext = new XmlParsingContext(table);
       return parsingContext.getXmlParsing().parse(new OldXmlLexer(), chars, 0, chars.length(), SharedImplUtil.getManagerByTree(chameleon));
@@ -64,7 +64,7 @@ public interface XmlElementType extends XmlTokenType {
 
   IElementType XML_MARKUP = new IChameleonElementType("XML_MARKUP_DECL", XMLLanguage.INSTANCE){
     public ASTNode parseContents(ASTNode chameleon) {
-      final CharSequence chars = ((CharTableBasedLeafElementImpl)chameleon).getInternedText();
+      final CharSequence chars = ((LeafElement)chameleon).getInternedText();
       final CharTable table = SharedImplUtil.findCharTableByTree(chameleon);
       final XmlParsingContext parsingContext = new XmlParsingContext(table);
       return parsingContext.getXmlParsing().parseMarkupDecl(new OldXmlLexer(), chars, 0, chars.length(), SharedImplUtil.getManagerByTree(chameleon));
-- 
2.11.4.GIT