From 0ca3b03dd4a933316137aff22c0375eda7f7aae1 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Sun, 20 Feb 2005 23:22:22 +0300 Subject: [PATCH] Getting rid of assert statements. Clover seem to have problems with them. --- .../ide/actions/SelectInContextImpl.java | 6 ++++-- .../html/dtd/HtmlAttributeDescriptorImpl.java | 8 +++++--- .../html/dtd/HtmlElementDescriptorImpl.java | 15 +++++++++------ .../source/html/dtd/HtmlNSDescriptorImpl.java | 16 ++++++++++------ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/source/com/intellij/ide/actions/SelectInContextImpl.java b/source/com/intellij/ide/actions/SelectInContextImpl.java index 0fb6395241ef..5b66031bb8df 100644 --- a/source/com/intellij/ide/actions/SelectInContextImpl.java +++ b/source/com/intellij/ide/actions/SelectInContextImpl.java @@ -7,6 +7,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataConstants; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.ex.DataConstantsEx; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.*; @@ -25,6 +26,7 @@ import java.awt.*; import java.awt.event.InputEvent; abstract class SelectInContextImpl implements SelectInContext { + private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.SelectInContextImpl"); protected final PsiFile myPsiFile; protected SelectInContextImpl(PsiFile psiFile) { @@ -128,8 +130,8 @@ abstract class SelectInContextImpl implements SelectInContext { private final PopupLocation myPopupLocation; public SelectInContextProvider(SelectInContext context, PopupLocation popupLocation) { - assert context != null : "Null SelectInContext"; - assert popupLocation != null : "Null PopupLocation"; + LOG.assertTrue(context != null, "Null SelectInContext"); + LOG.assertTrue(popupLocation != null, "Null PopupLocation"); myContext = context; myPopupLocation = popupLocation; diff --git a/source/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java b/source/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java index feb6e44fcf21..79f4ef865a76 100644 --- a/source/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java +++ b/source/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java @@ -1,10 +1,11 @@ package com.intellij.psi.impl.source.html.dtd; -import com.intellij.xml.XmlAttributeDescriptor; -import com.intellij.psi.xml.XmlElement; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.xml.XmlElement; +import com.intellij.xml.XmlAttributeDescriptor; /** * Created by IntelliJ IDEA. @@ -14,10 +15,11 @@ import com.intellij.psi.scope.PsiScopeProcessor; * To change this template use File | Settings | File Templates. */ public class HtmlAttributeDescriptorImpl implements XmlAttributeDescriptor { + private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.html.dtd.HtmlAttributeDescriptorImpl"); private XmlAttributeDescriptor delegate; public HtmlAttributeDescriptorImpl() { - assert false; + LOG.error("should not be called"); } public HtmlAttributeDescriptorImpl(XmlAttributeDescriptor _delegate) { diff --git a/source/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java b/source/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java index 81a9d3a0cc0b..58d2f47ae1da 100644 --- a/source/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java +++ b/source/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java @@ -1,13 +1,14 @@ package com.intellij.psi.impl.source.html.dtd; -import com.intellij.xml.XmlElementDescriptor; -import com.intellij.xml.XmlAttributeDescriptor; -import com.intellij.xml.XmlNSDescriptor; -import com.intellij.psi.xml.XmlTag; -import com.intellij.psi.xml.XmlAttribute; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlTag; +import com.intellij.xml.XmlAttributeDescriptor; +import com.intellij.xml.XmlElementDescriptor; +import com.intellij.xml.XmlNSDescriptor; import java.util.HashMap; @@ -19,6 +20,8 @@ import java.util.HashMap; * To change this template use File | Settings | File Templates. */ public class HtmlElementDescriptorImpl implements XmlElementDescriptor { + private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.html.dtd.HtmlElementDescriptorImpl"); + private XmlElementDescriptor delegate; private HashMap cachedDescriptors; private HashMap cachedAttributeDescriptors; @@ -28,7 +31,7 @@ public class HtmlElementDescriptorImpl implements XmlElementDescriptor { } public HtmlElementDescriptorImpl() { - assert false; + LOG.error("Should not be called"); } public String getQualifiedName() { diff --git a/source/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java b/source/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java index 96fead3e1eb2..ad1036bb46a4 100644 --- a/source/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java +++ b/source/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java @@ -1,14 +1,16 @@ package com.intellij.psi.impl.source.html.dtd; -import com.intellij.xml.XmlElementDescriptor; -import com.intellij.xml.XmlNSDescriptor; -import com.intellij.psi.xml.XmlTag; -import com.intellij.psi.xml.XmlFile; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.xml.XmlFile; +import com.intellij.psi.xml.XmlTag; +import com.intellij.xml.XmlElementDescriptor; +import com.intellij.xml.XmlNSDescriptor; -import java.util.*; +import java.util.HashMap; +import java.util.Map; /** * Created by IntelliJ IDEA. @@ -18,6 +20,8 @@ import java.util.*; * To change this template use File | Settings | File Templates. */ public class HtmlNSDescriptorImpl implements XmlNSDescriptor { + private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.html.dtd.HtmlNSDescriptorImpl"); + private XmlNSDescriptor delegate; private Map myCachedDecls; @@ -26,7 +30,7 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor { } public HtmlNSDescriptorImpl() { - assert false; + LOG.error("Should not be called"); } private Map buildDeclarationMap() {