From 67c4e4bb7a2471bbb2b42ce6fdf6747e892a4950 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 5 Jun 2014 15:33:53 +0400 Subject: [PATCH] calculate default inspection name by trimming Inspection or InspectionBase --- .../codeInspection/InspectionProfileEntry.java | 4 ++-- .../src/com/siyeh/ig/BaseInspection.java | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java index a14c9f47cfcc..0b8d36431d54 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -135,7 +135,7 @@ public abstract class InspectionProfileEntry { @NotNull public static String getShortName(@NotNull String className) { - return StringUtil.trimEnd(className, "Inspection"); + return StringUtil.trimEnd(StringUtil.trimEnd(className, "Inspection"),"InspectionBase"); } /** diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java index bf57d92b044a..d03aabe324e7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java @@ -17,6 +17,7 @@ package com.siyeh.ig; import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.BaseJavaBatchLocalInspectionTool; +import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.codeInspection.ex.InspectionProfileImpl; @@ -55,14 +56,9 @@ public abstract class BaseInspection extends BaseJavaBatchLocalInspectionTool { public String getShortName() { if (m_shortName == null) { final Class aClass = getClass(); - final String name = aClass.getName(); - if (name.endsWith(INSPECTION)) { - m_shortName = name.substring(name.lastIndexOf((int)'.') + 1, name.length() - INSPECTION.length()); - } - else if (name.endsWith(INSPECTION_BASE)) { - m_shortName = name.substring(name.lastIndexOf((int)'.') + 1, name.length() - INSPECTION_BASE.length()); - } - else { + final String name = aClass.getSimpleName(); + m_shortName = InspectionProfileEntry.getShortName(name); + if (m_shortName.equals(name)) { throw new AssertionError("class name must end with 'Inspection' to correctly calculate the short name: " + name); } }